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

Merge-Commit

Browse Source
This commit is contained in:
Lyndon Jetten
2025-10-09 12:56:32 +02:00
parent 66e619adff 599bcdac76
commit eeca1ad7fa
105 changed files with 5560 additions and 2267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/BeWo.csproj
View File

@@ -63,7 +63,7 @@
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>true</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>

11
BeWo/Scheduler/View/NewSchedulerView.xaml.cs
View File

@@ -1578,7 +1578,9 @@ namespace BeWo.Scheduler.View
var mitarbeiterliste = appointment.CF_EmployeeList();
var istErsteller = ersteller?.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ?? false;
if(!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !appointment.CF_CanBeEdited())
bool canBeEdited = appointment.CF_CanBeEdited();
if (!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !canBeEdited)
{
darfTerminDetailsSehen = false;
}
@@ -1946,8 +1948,13 @@ namespace BeWo.Scheduler.View
var customerList = appointment.CF_CustomerList();
var employeeList = employee2SchedulerAppointmentList.Select(employee2SchedulerAppointment => employee2SchedulerAppointment.Employee).ToList();
String notice = appointment.Description;
if (String.IsNullOrEmpty(notice))
{
notice = appointment.Subject;
}
BeWoUtils.CreateZeiterfassung(appointment.Start, appointment.End, customerList, employeeList, appointment.Subject, appointment, serviceRecords =>
BeWoUtils.CreateZeiterfassung(appointment.Start, appointment.End, customerList, employeeList, notice, appointment, serviceRecords =>
{
try
{

4
BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
View File

@@ -141,6 +141,10 @@ namespace BeWo.Scheduler.ViewModel
_AbsenceTimeEnd = pAppointment.AbsenceTimeEnd;
HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
if (Subject.Contains("Flingern"))
{
int test = 0;
}
CanBeEdited = pAppointment.CanBeEdited;
AbsenceTimeOid = pAppointment.AbsenceTimeOid;

9
BeWo/ownChat/ChatDokumentationsView.xaml.cs
View File

@@ -192,8 +192,13 @@ namespace BeWo.ownChat
if(vm.PrototypeVM.SortedCategories != null && vm.PrototypeVM.SortedCategories.Count > 0)
{
var cat1 = vm.PrototypeVM.SortedCategories[0];
dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
if (vm.PrototypeVM.Category2Services.ContainsKey(cat1))
{
if (vm.PrototypeVM.Category2Services[cat1].Count > 0)
{
dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
}
}
}
_ServiceRecord = new ServiceRecordVM(dc, vm.PrototypeVM.Category2Services, vm.PrototypeVM.AllGoalCategories, vm.PrototypeVM.AllGoals)

7
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -24,7 +24,7 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<TargetFrameworkProfile />
<Use64BitIISExpress>false</Use64BitIISExpress>
<Use64BitIISExpress>true</Use64BitIISExpress>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>4.3</TypeScriptToolsVersion>
@@ -74,6 +74,7 @@
<TypeScriptSourceMap>True</TypeScriptSourceMap>
<TypeScriptMapRoot />
<TypeScriptSourceRoot />
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
@@ -316,6 +317,7 @@
<Compile Include="Models\MokSupportConceptListObject.cs" />
<Compile Include="Models\MokMandator.cs" />
<Compile Include="Models\MokServiceRecord.cs" />
<Compile Include="Models\BaseSessionModel.cs" />
<Compile Include="Models\SchedulerSessionModel.cs" />
<Compile Include="Models\MainSessionModel.cs" />
<Compile Include="Models\ReportSessionModel .cs" />
@@ -325,7 +327,6 @@
<Compile Include="Models\DevToolsModel.cs" />
<Compile Include="Models\DevExpressSchedulerModel.cs" />
<Compile Include="Models\ExternalSignatureModel.cs" />
<Compile Include="Models\ISessionModel.cs" />
<Compile Include="Models\ReportModel.cs" />
<Compile Include="Models\ReportViewerModel.cs" />
<Compile Include="Models\SchedulerModel.cs" />
@@ -588,6 +589,7 @@
<Content Include="Scripts\moment\moment.js" />
<Content Include="Scripts\moment\moment.min.js" />
<Content Include="Scripts\ownSoft-Scripts\signature.js" />
<Content Include="Scripts\ownSoft-Scripts\utils\countdown.js" />
<Content Include="Scripts\ownSoft-Scripts\utils\dropdown-search.js" />
<Content Include="Scripts\signature-pad.min.js" />
<Content Include="Scripts\tempusdominus-boostrap-4.min.js" />
@@ -677,6 +679,7 @@
<Content Include="Views\DevTools\DevToolsDataGenerationPartial.cshtml" />
<Content Include="Views\Main\RestoreServiceRecordInputsPartial.cshtml" />
<Content Include="Scripts\bs-custom-file-input.min.js.map" />
<Content Include="Views\Main\Zeiterfassungspartial.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<Use64BitIISExpress>true</Use64BitIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />

2
BeWoPlanerMobil/Controllers/AbstractBaseController.cs
View File

@@ -66,7 +66,7 @@ namespace BeWoPlanerMobil.Controllers
}
else
{
model.SessionModel = (ISessionModel)Session[sessionkey];
model.SessionModel = (BaseSessionModel)Session[sessionkey];
}
}
}

5
BeWoPlanerMobil/Controllers/CustomerController.cs
View File

@@ -983,8 +983,9 @@ namespace BeWoPlanerMobil.Controllers
var zahlung = kassenbuch?.Bargeldtransaktionen.FirstOrDefault(bargeldtransaktion => bargeldtransaktion.BargeldtransaktionOid.Equals(transaktionsOid));
Model.SelectedBargeldtransaktion = zahlung;
Model.SelectedBargeldtransaktionOid = zahlung?.BargeldtransaktionOid;
if(zahlung != null)
if (zahlung != null)
{
Model.SelectedTransaktionsart = (int) zahlung.Zahlungstyp;
}
@@ -1018,6 +1019,7 @@ namespace BeWoPlanerMobil.Controllers
}
Model.SelectedBargeldtransaktion = null;
Model.SelectedBargeldtransaktionOid = null;
Model.SelectedTransaktionsart = 0;
Model.SelectedBargeldkasseOid = bargeldkassenOid;
@@ -1088,6 +1090,7 @@ namespace BeWoPlanerMobil.Controllers
OperationsService.UpdateBargeldkasse(bargeldkasse);
Model.SelectedBargeldkasseOid = null;
Model.SelectedBargeldtransaktionOid = null;
ReloadBargeldkassen();

394
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -87,11 +87,11 @@ namespace BeWoPlanerMobil.Controllers
private static readonly List<ValueListEntryType> _GoalTypes = new List<ValueListEntryType> { ValueListEntryType.SupportConceptGoalCategoryType, ValueListEntryType.SupportConceptIndividualGoalCategoryType };
private static readonly List<ValueListEntryType> _MeasureTypes = new List<ValueListEntryType> { ValueListEntryType.SupportConceptGoalType, ValueListEntryType.SupportConceptIndividualGoalType };
public void InitViewModel()
public void InitViewModel(bool forceReload = false)
{
InitSettings();
CreateModelSupportConceptListObjects(false);
CreateModelSupportConceptListObjects(forceReload);
Model.GroupsOfPeople = EmployeeService.GetAllGroups(LoggedInEmployee.EmployeeOid).OrderBy(gop => gop.Name).ToList();
@@ -289,7 +289,7 @@ namespace BeWoPlanerMobil.Controllers
if(Model.IsInEditingMode && Model.SelectedServiceRecordOid.HasValue)
{
Model.SelectedServiceRecord = Model.ServiceRecords.FirstOrDefault(sr => sr.ServiceRecordOid.Equals(Model.SelectedServiceRecordOid.Value));
Model.SelectedServiceRecord = GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false);
}
}
@@ -313,14 +313,15 @@ namespace BeWoPlanerMobil.Controllers
Model.FilterGroupServiceCategories = UserSettingsUtils.GetSettingValueAsBool(Model.Mandator.Settings, SettingsKeys.FilterGroupServiceCategories);
Model.SetStartTimeToEndTimeAfterSave = UserSettingsUtils.GetSettingValueAsBool(Model.Mandator.Settings, SettingsKeys.SetStartTimeToEndTimeAfterSave);
Model.MokSettings = new MokSettings();
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);
Model.MokSettings = new MokSettings
{
SupportConceptExpirationLimitInMonths = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.HilfeplanAuslaufAuswahl, 3),
AnzTageZeiterfassErfolgt = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.AnzTageZeiterfassErfolgt),
AnzTageUnterschriftErfolgt = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.AnzTageUnterschriftErfolgt),
MaxDaysEditServiceRecordsAllowed = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.MaxDaysEditServiceRecordsAllowed),
TimeUntilUILock = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.TimeUntilUILock),
ServiceRecordAllowChangeHours = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.ServiceRecordAllowChangeHours)
};
Model.ShowServiceRecordInsertedOn = !UserSettingsUtils.GetSettingValueAsBool(Model.Mandator.Settings, SettingsKeys.HideServiceRecordInsertedByAndInsertedOn);
@@ -398,15 +399,15 @@ namespace BeWoPlanerMobil.Controllers
{
Model.SelectedCostBearerSupportConceptOid = cb2ScOid;
bool istEinzelBuchung = !Model.IsInGroupBookingMode && !Model.IsInMultiBookingMode;
var istEinzelBuchung = !Model.IsInGroupBookingMode && !Model.IsInMultiBookingMode;
if (istEinzelBuchung)
if(istEinzelBuchung)
{
Model.SelectedSupportConcept = Model.SupportConcepts.FirstOrDefault(sc => sc.CostBearerRelOids.Any(a => a.Equals(Model.SelectedCostBearerSupportConceptOid)));
}
if (istEinzelBuchung && ((!cb2ScOid.HasValue) || cb2ScOid.Value == -1))
if(istEinzelBuchung && (!cb2ScOid.HasValue || cb2ScOid.Value == -1))
{
// Im Einzelmodus entweder nichts oder "Hilfeplan auswählen" (-1) ausgewählt.
Model.Categories2Descriptions = new Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>();
@@ -416,11 +417,11 @@ namespace BeWoPlanerMobil.Controllers
{
var allC2SOids = new List<long>();
if (!istEinzelBuchung)
if(!istEinzelBuchung)
{
allC2SOids = Model.GroupBookingSelectedCostBearerSupportConceptOids;
}
else if (cb2ScOid.HasValue && cb2ScOid.Value > 0)
else if(cb2ScOid.HasValue && cb2ScOid.Value > 0)
{
allC2SOids.Add(cb2ScOid.Value);
}
@@ -434,31 +435,31 @@ namespace BeWoPlanerMobil.Controllers
LoadGoals(infos);
if (istEinzelBuchung && Model.SelectedSupportConcept != null && infos.Count == 1)
if(istEinzelBuchung && Model.SelectedSupportConcept != null && infos.Count == 1)
{
Model.SelectedSupportConcept.Goals = infos[0].SupportConceptGoals;
}
if (Model.SupportConcepts != null)
if(Model.SupportConcepts != null)
{
foreach (var info in infos)
foreach(var info in infos)
{
var sc = Model.SupportConcepts.FirstOrDefault(s => s.SupportConceptOid == info.SupportConceptOid);
if (sc != null)
if(sc != null)
{
sc.Goals = info.SupportConceptGoals;
}
}
}
}
// Ist der Klient abwesend, wird dies wie im FaC angezeigt
if (Model.SelectedSupportConcept?.Customer?.AbsenceTimes?.Any() ?? false)
{
foreach (var absenceTime in Model.SelectedSupportConcept.Customer.AbsenceTimes)
foreach(var absenceTime in Model.SelectedSupportConcept.Customer.AbsenceTimes)
{
if (absenceTime.Start.HasValue && DateTime.Now > absenceTime.Start.Value && (absenceTime.End is null || DateTime.Now < absenceTime.End.Value))
if(absenceTime.Start.HasValue && DateTime.Now > absenceTime.Start.Value && (absenceTime.End is null || DateTime.Now < absenceTime.End.Value))
{
Model.IsCustomerAbsence = true;
Model.CustomerAbsenceInfo = $"{absenceTime.Reason.Description} von {absenceTime.Start:dd.MM.yyyy} bis {(absenceTime.End.HasValue ? absenceTime.End.Value.ToString("dd.MM.yyyy") : "unbekannt")}";
@@ -476,7 +477,7 @@ namespace BeWoPlanerMobil.Controllers
}
if (loadTextModules)
if(loadTextModules)
{
LoadTextModules();
}
@@ -535,7 +536,7 @@ namespace BeWoPlanerMobil.Controllers
private IList<CompactSupportConceptDC> GetSelectedGroupBookingSupportConcepts()
{
if (Model.SupportConcepts == null || Model.SupportConcepts.Count == 0)
if(Model.SupportConcepts is null || Model.SupportConcepts.Count == 0)
{
CreateModelSupportConceptListObjects(true);
}
@@ -1125,7 +1126,7 @@ namespace BeWoPlanerMobil.Controllers
var date = DateTime.Parse(formCollection[FormCollectionConstants.ServiceRecordSignatureDateKey]);
long.TryParse(formCollection[FormCollectionConstants.ServiceRecordSignatureRecordOidKey], out var serviceRecordOid);
var serviceRecord = Model.ServiceRecords.FirstOrDefault(sr => sr.ServiceRecordOid.HasValue && sr.ServiceRecordOid.Value.Equals(serviceRecordOid));
var serviceRecord = GetServiceRecordDC(serviceRecordOid, false);
if (serviceRecordOid < 1 || serviceRecord is null)
{
@@ -1243,57 +1244,13 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public ActionResult LoadUpToDateTextModules()
{
if (!IsUserLoggedIn())
if(!IsUserLoggedIn())
{
TempData[TempDataConstants.DoLogoutKey] = true;
return PartialView("TextModulePartial");
}
//Wird alles im InitViewModel gemacht:
//Model.TextModules.Clear();
//if(Model.SelectedServiceCategoryOid.HasValue && (Model.LoggedInEmployee?.EmployeeOid.HasValue ?? false))
//{
// var allTextModules = OperationsService.GetTextModules(Model.HasRightToSeeGlobalTextModules, Model.LoggedInEmployee.EmployeeOid.Value, Model.HasRightToSeeGlobalTextModules, false);
// foreach(var tm in allTextModules.Where(textModule => textModule.IsParent == false))
// {
// if(string.IsNullOrWhiteSpace(tm.Text))
// {
// tm.Text = tm.Name;
// }
// }
// Model.AllTextModules = allTextModules.Where(tb => tb.TextModuleOid.HasValue).Select(tb => new TextbausteinDisplayItem(tb.Name, tb.Text, tb.Parent?.TextModuleOid, tb.TextModuleOid.Value, tb.IsExpanded)).ToList();
// var x = allTextModules.Where(
// w => (w.ServiceCategory is null || w.ServiceCategory.ServiceCategoryOid == Model.SelectedServiceCategoryOid.Value)
// && !string.IsNullOrEmpty(w.Text)
// && (w.IsOnlyForEmployee && w.Employee.EmployeeOid.Equals(Model.LoggedInEmployee.EmployeeOid) || !w.IsOnlyForEmployee)).OrderBy(t => t.Text).ToList();
// x.AddRangeIfElementsNotIn(BS.Shared.Core.Utils.GetParentTextModules(x));
// var textModuleDisplayItems = x.Where(tb => tb.TextModuleOid.HasValue).Select(tb => new TextbausteinDisplayItem(tb.Name, tb.Text, tb.Parent?.TextModuleOid, tb.TextModuleOid.Value, tb.IsExpanded)).ToList();
// foreach(var item in textModuleDisplayItems)
// {
// if(item.ParentOid is null)
// {
// continue;
// }
// var parent = textModuleDisplayItems.FirstOrDefault(p => p.Oid == item.ParentOid);
// parent?.Children.AddIfNotIn(item);
// }
// Model.TextModules = textModuleDisplayItems.Where(item => item.ParentOid is null).OrderBy(item => item.Name).ToList();
//}
//Wird alles im InitViewModel gemacht
return PartialView("TextModulePartial", Model);
}
@@ -2104,28 +2061,22 @@ namespace BeWoPlanerMobil.Controllers
{
SkipModelInitialization = true; //Verhindere mehrfache Initialisierung, weil später sowieso zur Main Action geleitet wird
if (Model is null)
if(Model is null)
{
TempData[TempDataConstants.DoLogoutKey] = true;
return Logout();
}
long? cb2ScOid = Convert.ToInt64(formCollection[FormCollectionConstants.CostBearer2SupportConceptOidKey]);
if (Model.SelectedCostBearerSupportConceptOid.HasValue && Model.SelectedCostBearerSupportConceptOid != cb2ScOid)
{
Model.SelectedGoalOids = new List<long>();
Model.SelectedGoals = new List<MokZiel>();
}
Model.SelectedCostBearerSupportConceptOid = cb2ScOid;
Model.CurrentPage = 1;
SelectCb2ScRelation(cb2ScOid);
// Sorgt dafür, dass nach dem Neuladen die Abhängigkeiten vom Hilfeplan erhalten bleiben
TempData[TempDataConstants.SupportConceptRelSelectedKey] = true;
return RedirectToActionPermanent("Main");//ResetEditingMode();
}
catch (Exception e)
catch(Exception e)
{
Log.Error($"ERROR SelectSupportConcept: {e.Message}\n{e.StackTrace}");
@@ -2133,6 +2084,18 @@ namespace BeWoPlanerMobil.Controllers
}
}
private void SelectCb2ScRelation(long? cb2ScOid)
{
if(Model.SelectedCostBearerSupportConceptOid.HasValue && Model.SelectedCostBearerSupportConceptOid != cb2ScOid)
{
Model.SelectedGoalOids = new List<long>();
Model.SelectedGoals = new List<MokZiel>();
}
Model.SelectedCostBearerSupportConceptOid = cb2ScOid;
Model.CurrentPage = 1;
}
private void LoadServiceCategoriesToModel(List<SupportConceptTreeNodeDetailInfoDC> infos)
{
Model.Categories2Descriptions = new Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>();
@@ -2340,7 +2303,7 @@ namespace BeWoPlanerMobil.Controllers
if(Model.ServiceRecordOidToDelete != null && Model.ServiceRecordOidToDelete > 0 && LoggedInUser.UserGroups.Any(a => a.Rights.Any(f => f.Equals(UserRightType.ServiceRecordView_Delete))))
{
var serviceRecordDC = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid != null && f.ServiceRecordOid.Value.Equals(Model.ServiceRecordOidToDelete));
var serviceRecordDC = GetServiceRecordDC(Model.ServiceRecordOidToDelete.Value, false);
var version = serviceRecordDC?.ServiceRecordVersion;
if(version != null && Model.IsAllowedToDeleteServiceRecord(serviceRecordDC))
@@ -2683,7 +2646,7 @@ namespace BeWoPlanerMobil.Controllers
if(Model.SelectedServiceRecordOid.HasValue)
{
result = SerializeObject(Model.ServiceRecords.First(f => f.ServiceRecordOid == Model.SelectedServiceRecordOid));
result = SerializeObject(GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false));
}
return result;
@@ -2698,7 +2661,7 @@ namespace BeWoPlanerMobil.Controllers
return LeerzeichenFuerGetMethoden;
}
var serviceRecord = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid.HasValue && f.ServiceRecordOid.Value.Equals(oid)) ?? OperationsService.GetServiceRecordById(oid);
var serviceRecord = GetServiceRecordDC(oid, false);
if(serviceRecord?.ServiceRecordOid is null)
{
@@ -2772,9 +2735,9 @@ namespace BeWoPlanerMobil.Controllers
}
var checkServiceRecord = new ServiceRecordDC();
if(inEditMode)
if(inEditMode && Model.SelectedServiceRecordOid.HasValue)
{
checkServiceRecord = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid.HasValue && f.ServiceRecordOid.Value.Equals(Model.SelectedServiceRecordOid));
checkServiceRecord = GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false);
}
if(checkServiceRecord is null)
@@ -3640,41 +3603,43 @@ namespace BeWoPlanerMobil.Controllers
}
[Authorize]
public ActionResult AddScCbRelsToGroupBooking(string[] relOids, string[] groupOids)
public ActionResult AddScCbRelsToGroupBooking(string[] relOids, string[] groupOids, bool isGroupTabActive)
{
if(!IsUserLoggedIn())
{
{
TempData[TempDataConstants.DoLogoutKey] = true;
return PartialView("GroupBookingScCbRelList");
}
AddScCbRelsToGroupOrMultiBooking(relOids, groupOids);
TempData[TempDataConstants.IsGroupTabActiveKey] = isGroupTabActive;
return PartialView("GroupBookingScCbRelList", Model);
}
[Authorize]
public ActionResult AddScCbRelsToMultiBooking(string[] relOids, string[] groupOids)
public ActionResult AddScCbRelsToMultiBooking(string[] relOids, string[] groupOids, bool isGroupTabActive)
{
if (!IsUserLoggedIn())
if(!IsUserLoggedIn())
{
TempData[TempDataConstants.DoLogoutKey] = true;
return PartialView("MultiBookingScCbRelList");
}
AddScCbRelsToGroupOrMultiBooking(relOids, groupOids);
TempData[TempDataConstants.IsGroupTabActiveKey] = isGroupTabActive;
return PartialView("MultiBookingScCbRelList", Model);
}
private void AddScCbRelsToGroupOrMultiBooking(string[] relOids, string[] groupOids)
{
SkipModelInitialization = true;
var singleRels = new List<long>();
var groupRels = new List<long>();
var groups = new List<GroupOfPeopleDC>();
if (groupOids is null)
{
@@ -3702,6 +3667,27 @@ namespace BeWoPlanerMobil.Controllers
}
});
AddScCbRelsToBooking(singleRels, groupRels);
// Sorgt dafür, dass nach dem Neuladen die Abhängigkeiten vom Hilfeplan erhalten bleiben
TempData[TempDataConstants.SupportConceptRelSelectedKey] = true;
}
[Authorize]
public void AddScCbRelsToBooking(List<long> singleRels, List<long> groupRels, bool forceReload = false)
{
var groups = new List<GroupOfPeopleDC>();
if(singleRels is null)
{
singleRels = new List<long>();
}
if(groupRels is null)
{
groupRels = new List<long>();
}
Model.GroupsOfPeople = EmployeeService.GetAllGroups(LoggedInEmployee.EmployeeOid).OrderBy(gop => gop.Name).ToList();
Model.GroupBookingSelectedGroupOfPeopleOids.Clear();
@@ -3710,7 +3696,7 @@ namespace BeWoPlanerMobil.Controllers
{
var group = Model.GroupsOfPeople.FirstOrDefault(f => f.GroupOfPeopleOid.HasValue && f.GroupOfPeopleOid.Value.Equals(groupOid));
if (group is null)
if(group is null)
{
return;
}
@@ -3721,45 +3707,33 @@ namespace BeWoPlanerMobil.Controllers
Model.GroupBookingSelectedCostBearerSupportConcepts.Clear();
Model.GroupBookingSelectedCostBearerSupportConceptOids.Clear();
Model.GroupBookingSelectedCostBearerSupportConceptOids.AddRangeIfElementsNotIn(singleRels);
//var selectedSupportConcepts = CustomerService.GetSupportConceptsByCostbearer2SupportConceptRelOids(singleRels);
//var groupCostBearerRelations = CustomerService.GetSupportConceptCostBearerRelationsById(singleRels);
foreach (var gruppe in groups.Where(g => g.GroupOfPeopleOid.HasValue))
foreach(var gruppe in groups.Where(g => g.GroupOfPeopleOid.HasValue))
{
var groupRelOids = new List<long>();
gruppe.SupportConceptList.ForEach(f => groupRelOids.AddRange(f.CostBearerRelOids));
if (!gruppe.GroupOfPeopleOid.HasValue)
if(!gruppe.GroupOfPeopleOid.HasValue)
{
continue;
}
var groupOid = gruppe.GroupOfPeopleOid.Value;
if (singleRels.ContainsItems(groupRelOids))
if(singleRels.ContainsItems(groupRelOids))
{
Model.GroupBookingSelectedGroupOfPeopleOids.AddIfNotIn(groupOid);
}
else if (Model.GroupBookingSelectedGroupOfPeopleOids.Contains(groupOid))
else if(Model.GroupBookingSelectedGroupOfPeopleOids.Contains(groupOid))
{
Model.GroupBookingSelectedGroupOfPeopleOids.Remove(groupOid);
}
}
//Model.SelectedConceptCostBearerRelationOids = Model.SelectedConceptCostBearerRelations.Select(s => s.CostBearer2SupportConceptOid.Value).ToList();
//Model.GroupBookingSelectedSupportConceptOids = Model.GroupBookingSelectedSupportConcepts.Select(s => s.SupportConceptOid.Value).ToList();
CreateModelSupportConceptListObjects(false);
CreateModelSupportConceptListObjects(forceReload);
LoadSupportConceptThings(null, true);
// Sorgt dafür, dass nach dem Neuladen die Abhängigkeiten vom Hilfeplan erhalten bleiben
TempData[TempDataConstants.SupportConceptRelSelectedKey] = true;
}
[Authorize]
@@ -3817,14 +3791,26 @@ namespace BeWoPlanerMobil.Controllers
rawEmployeeOids.DoForEach(s => oids.AddIfNotIn(long.Parse(s)));
var employees = Model.EmployeesForGroupAndMultiBooking.Where(w => oids.Contains(w.EmployeeOid));
AddEmployeesToGroupBookingInternally(oids);
return JsonConvert.SerializeObject(Model.GroupBookingSelectedEmployees.Count);
}
[Authorize]
public void AddEmployeesToGroupBookingInternally(List<long> employeeOids)
{
if(employeeOids == null || employeeOids.Count == 0)
{
Model.GroupBookingSelectedEmployees.Clear();
Model.GroupBookingSelectedEmployeeOids.Clear();
return;
}
var employees = Model.EmployeesForGroupAndMultiBooking.Where(w => employeeOids.Contains(w.EmployeeOid));
Model.GroupBookingSelectedEmployees.Clear();
Model.GroupBookingSelectedEmployees.AddRangeIfElementsNotIn(employees);
Model.GroupBookingSelectedEmployeeOids = Model.GroupBookingSelectedEmployees.Select(e => e.EmployeeOid).ToList();
return JsonConvert.SerializeObject(Model.GroupBookingSelectedEmployees.Count);
}
[Authorize]
@@ -4745,17 +4731,26 @@ namespace BeWoPlanerMobil.Controllers
return JsonConvert.SerializeObject(Model.GroupBookingSelectedEmployees.Count);
}
var rawEmployeeOids = pEmployeeOids.Split(',');
var oids = new List<long>();
var oids = string.IsNullOrWhiteSpace(pEmployeeOids) ? new List<long>() : pEmployeeOids.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Select(long.Parse).ToList();
rawEmployeeOids.DoForEach(s => oids.AddIfNotIn(long.Parse(s)));
AddEmployeesToMultiBookingInternally(oids);
var employees = Model.EmployeesForGroupAndMultiBooking.Where(w => oids.Contains(w.EmployeeOid));
return JsonConvert.SerializeObject(Model.GroupBookingSelectedEmployees.Count);
}
[Authorize]
public void AddEmployeesToMultiBookingInternally(List<long> employeeOids)
{
if(employeeOids is null || employeeOids.Count == 0)
{
Model.GroupBookingSelectedEmployees.Clear();
return;
}
var employees = Model.EmployeesForGroupAndMultiBooking.Where(w => employeeOids.Contains(w.EmployeeOid));
Model.GroupBookingSelectedEmployees.Clear();
Model.GroupBookingSelectedEmployees.AddRangeIfElementsNotIn(employees);
return JsonConvert.SerializeObject(Model.GroupBookingSelectedEmployees.Count);
}
// Veraltet
@@ -5035,7 +5030,7 @@ namespace BeWoPlanerMobil.Controllers
}
[Authorize]
public ActionResult ReloadGoals()
public ActionResult ReloadGoals(bool forceReload = false)
{
SkipModelInitialization = true;
if (!IsUserLoggedIn())
@@ -5045,7 +5040,7 @@ namespace BeWoPlanerMobil.Controllers
//LoadGoals();
CreateModelSupportConceptListObjects(false);
CreateModelSupportConceptListObjects(forceReload);
LoadSupportConceptThings(null, true);
return PartialView("GoalTreePartial", Model);
@@ -5062,14 +5057,19 @@ namespace BeWoPlanerMobil.Controllers
if(long.TryParse(categoryOidStr, out var categoryOid))
{
Model.SelectedServiceCategory = Model.Categories2Descriptions.FirstOrDefault(f => f.Key?.ServiceCategoryOid != null && f.Key.ServiceCategoryOid.Value.Equals(categoryOid)).Key;
Model.SelectedServiceDescription = null;
SelectServiceCategory(categoryOid);
}
if(Model.SelectedServiceCategory is null)
{
return PartialView("Category2ServiceDescriptionPartial", Model);
}
return PartialView("Category2ServiceDescriptionPartial", Model);
}
private void SelectServiceCategory(long categoryOid)
{
Model.SelectedServiceCategory = Model.Categories2Descriptions.FirstOrDefault(f => f.Key?.ServiceCategoryOid != null && f.Key.ServiceCategoryOid.Value.Equals(categoryOid)).Key;
Model.SelectedServiceDescription = null;
if(Model.SelectedServiceCategory != null)
{
var selectedServiceDescription = Model.Categories2Descriptions[Model.SelectedServiceCategory].OrderBy(sd => sd.Position).ThenBy(sd => sd.ServiceDescriptionOid).FirstOrDefault();
Model.SelectedServiceDescription = selectedServiceDescription;
@@ -5077,8 +5077,6 @@ namespace BeWoPlanerMobil.Controllers
Model.SelectedServiceCategoryOid = Model.SelectedServiceCategory?.ServiceCategoryOid;
Model.SelectedServiceDescriptionOid = Model.SelectedServiceDescription?.ServiceDescriptionOid;
}
return PartialView("Category2ServiceDescriptionPartial", Model);
}
[Authorize]
@@ -5115,15 +5113,23 @@ namespace BeWoPlanerMobil.Controllers
[HttpPost]
public ActionResult RestoreServiceRecordForm(FormCollection formCollection)
{
// Neuen ServiceRecord bauen, als wenn der Nutzer das normal gemacht hätte?
// Geht das auch bei Gruppen- und Mehrfachbuchungen? Ja, siehe Bearbeiten!
if(Model is null)
{
return Logout();
}
var bookingModeValue = formCollection[FormCollectionConstants.BookingModeKey];
var bookingModeInt = int.Parse(bookingModeValue);
var bookingMode = (BookingMode) bookingModeInt;
var dateInputValue = formCollection[FormCollectionConstants.DateKey];
var startTimeInputValue = formCollection[FormCollectionConstants.StartKey];
var endDateInputValue = formCollection[FormCollectionConstants.EndDateKey];
var endTimeInputValue = formCollection[FormCollectionConstants.EndKey];
var currentPageValue = formCollection[FormCollectionConstants.CurrentPageKey];
var doku1 = formCollection[FormCollectionConstants.Dokumentation1Key];
var doku2 = formCollection[FormCollectionConstants.Dokumentation2Key];
var doku3 = formCollection[FormCollectionConstants.Dokumentation3Key];
@@ -5131,42 +5137,146 @@ namespace BeWoPlanerMobil.Controllers
var doku5 = formCollection[FormCollectionConstants.Dokumentation5Key];
var doku6 = formCollection[FormCollectionConstants.Dokumentation6Key];
var distanceInputValue = formCollection[FormCollectionConstants.DistanceKey];
var marker = formCollection[FormCollectionConstants.MarkerKey] == "true";
distanceInputValue = distanceInputValue.Replace(".", ",");
var markerRaw = formCollection[FormCollectionConstants.MarkerKey];
var marker = markerRaw == "true" || markerRaw == "on";
var serviceDescriptionOidInputValue = formCollection[FormCollectionConstants.ServiceDescriptionKey];
var durationInputValue = formCollection[FormCollectionConstants.DurationKey];
var durationUnit = formCollection[FormCollectionConstants.DurationUnitKey];
var betragInputValue = formCollection[FormCollectionConstants.BetragKey];
var selectedSingleBookingCb2ScOidInputValue = formCollection[FormCollectionConstants.CostBearer2SupportConceptOidKey];
var selectedGroupBookingCb2ScOidsInputValue = formCollection[FormCollectionConstants.GroupBookingSelectedCb2ScOidsKey];
var selectedMultiBookingCb2ScOidsInputValue = formCollection[FormCollectionConstants.MultiBookingSelectedCb2ScOidsKey];
var selectedSingleBookingEmployeeOidInputValue = formCollection[FormCollectionConstants.SingleBookingEmployeeOidKey];
if(false == long.TryParse(selectedSingleBookingEmployeeOidInputValue, out var sbEmployeeOid))
{
sbEmployeeOid = Model.LoggedInEmployee.EmployeeOid.Value;
}
var selectedGroupBookingEmployeeOidsInputValue = formCollection[FormCollectionConstants.GroupBookingSelectedEmployeeOidsKey];
var selectedMultiBookingEmployeeOidsInputValue = formCollection[FormCollectionConstants.MultiBookingSelectedEmployeeOidsKey];
var selectedGoalOidsInputValue = formCollection[FormCollectionConstants.SelectedGoalOids];
var goalOids = string.IsNullOrWhiteSpace(selectedGoalOidsInputValue) ? new List<long>() : selectedGoalOidsInputValue.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(long.Parse).ToList();
var isStartDateValid = DateTime.TryParse(dateInputValue, out var startDate);
if(false == isStartDateValid)
{
startDate = DateTime.Today;
}
var isEndDateValid = DateTime.TryParse(endDateInputValue, out var endDate);
decimal.TryParse(distanceInputValue, out var distance);
decimal.TryParse(betragInputValue, out var betrag);
var isServiceDescriptionOidValid = long.TryParse(serviceDescriptionOidInputValue, out var serviceDescriptionOid);
var isSbCb2ScOidValid = long.TryParse(selectedSingleBookingCb2ScOidInputValue, out var sbCb2ScOid);
var isCurrentPageValid = int.TryParse(currentPageValue, out var currentPage);
decimal.TryParse(durationInputValue, out var duration);
if(durationUnit == "h")
{
duration *= 60;
}
if(currentPage == 0 || false == isCurrentPageValid)
{
currentPage = 1;
}
TempData[TempDataConstants.AfterRestoreKey] = true;
if(isSbCb2ScOidValid)
{
Model.SelectedCostBearerSupportConceptOid = sbCb2ScOid;
SelectCb2ScRelation(sbCb2ScOid);
InitViewModel(true);
LoadSupportConceptThings(sbCb2ScOid, true);
Model.CurrentPage = currentPage;
}
var serviceRecord = new ServiceRecordDC();
if(Model.SelectedServiceRecord is ServiceRecordDC selectedServiceRecord)
// Gruppen- oder Mehrfachbuchung
if(bookingMode is BookingMode.GroupBookingMode || bookingMode is BookingMode.MultiBookingMode)
{
serviceRecord = selectedServiceRecord;
var relStr = bookingMode == BookingMode.GroupBookingMode ? selectedGroupBookingCb2ScOidsInputValue : selectedMultiBookingCb2ScOidsInputValue;
var empStr = bookingMode == BookingMode.GroupBookingMode ? selectedGroupBookingEmployeeOidsInputValue : selectedMultiBookingEmployeeOidsInputValue;
var cb2ScOids = string.IsNullOrWhiteSpace(relStr) ? new List<long>() : relStr.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(long.Parse).ToList();
var empOids = string.IsNullOrWhiteSpace(empStr) ? new List<long>() : empStr.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(long.Parse).ToList();
AddScCbRelsToBooking(cb2ScOids, new List<long>(), true);
AddEmployeesToGroupBookingInternally(empOids);
InitViewModel(true);
LoadSupportConceptThings(null, true);
}
serviceRecord.ServiceRecordType = marker ? ServiceRecordTypeId.Content : ServiceRecordTypeId.DefaultActivity;
serviceRecord.Start = startDate.MergeDateAndTimeString(startTimeInputValue);
if(isServiceDescriptionOidValid)
{
var selectedServiceDescription = Model.Categories2Descriptions.FirstOrDefault(f => f.Value.Any(a => a.ServiceDescriptionOid.HasValue && a.ServiceDescriptionOid.Value.Equals(serviceDescriptionOid)));
if(selectedServiceDescription is KeyValuePair<ServiceCategoryDC, List<ServiceDescriptionDC>> category2Description && (category2Description.Key?.ServiceCategoryOid.HasValue ?? false))
{
SelectServiceCategory(category2Description.Key.ServiceCategoryOid.Value);
Model.SelectedServiceDescription = category2Description.Value.First(f => f.ServiceDescriptionOid.HasValue && f.ServiceDescriptionOid.Value.Equals(serviceDescriptionOid));
}
}
// ToDo für den 13.10.2025: Ziele noch einbauen
if(isEndDateValid == false)
{
endDate = startDate;
}
serviceRecord.ServiceRecordType = marker ? ServiceRecordTypeId.Content : ServiceRecordTypeId.DefaultActivity;
serviceRecord.Start = startDate.MergeDateAndTimeString(startTimeInputValue);
serviceRecord.End = endDate.MergeDateAndTimeString(endTimeInputValue);
serviceRecord.ServiceDescription = Model.SelectedServiceDescription;
serviceRecord.Betrag = betrag;
return RedirectToActionPermanent("Main", Model);
serviceRecord.RoundedDuration = duration;
if(bookingMode == BookingMode.SingleBookingMode)
{
serviceRecord.Employee = Model.AllEmployees.FirstOrDefault(f => f.EmployeeOid == sbEmployeeOid) ?? Model.LoggedInUser.Employee;
}
if(Model.NumberOfDokuTypes == 0)
{
serviceRecord.Notice = doku6;
}
else
{
serviceRecord.Notice = doku1;
serviceRecord.Notice2 = doku2;
serviceRecord.Notice3 = doku3;
serviceRecord.Notice4 = doku4;
serviceRecord.Notice5 = doku5;
}
serviceRecord.DistanceInMeter = null;
serviceRecord.DistanceInMeterDecimal = distance;
Model.SelectedServiceRecord = serviceRecord;
TempData[TempDataConstants.AfterRestoreKey] = true;
return View("Main", Model);
}
}

3
BeWoPlanerMobil/Global.asax.cs
View File

@@ -31,6 +31,9 @@ namespace BeWoPlanerMobil
protected void Application_BeginRequest(object sender, EventArgs e)
{
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
// ToDo: Könnte Probleme beim Login machen, falls der den Header der Login-Anfrage benutzt.
Response.Headers["Referrer-Policy"] = "no-referrer";
}
protected void Application_PreRequestHandlerExecute(object sender, EventArgs e)

4
BeWoPlanerMobil/Models/AbstractModel.cs
View File

@@ -27,7 +27,7 @@ namespace BeWoPlanerMobil.Models
public bool HasRightToViewEmployeeAppointments => CheckRight(UserRightType.KalenderMitarbeitertermineAnsehen) || CheckRight(UserRightType.ViewAll);
public bool HasRightToViewAllResourceAppointments => CheckRight(UserRightType.KalenderRessourcentermineAnsehen) || CheckRight(UserRightType.ViewAll);
public ISessionModel SessionModel { get; internal set; }
public BaseSessionModel SessionModel { get; internal set; }
public UserDC LoggedInUser { get; set; }
@@ -252,7 +252,7 @@ namespace BeWoPlanerMobil.Models
public List<CompactCustomerDC> Customers { get; set; } = new List<CompactCustomerDC>();
public Dictionary<string, bool> Collapsibles2IsShown { get; set; } = new Dictionary<string, bool>();
public Dictionary<string, bool> Collapsibles2IsShown { get { return SessionModel.Collapsibles2IsShown; } set {SessionModel.Collapsibles2IsShown = value;} }
public bool ShowDifferentQBInterval
{

27
BeWoPlanerMobil/Models/BaseSessionModel.cs Normal file
View File

@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Web.Mvc;
using BeWo.View.Navigation.Filter;
using BeWoPlanerMobil.Controllers;
using BeWoPlanerMobil.Service;
using BeWoPlanerMobil.Util;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public abstract class BaseSessionModel
{
public Dictionary<string, bool> Collapsibles2IsShown { get; set; } = new Dictionary<string, bool>();
public virtual void ResetValues()
{
Collapsibles2IsShown = new Dictionary<string, bool>();
}
}
}

6
BeWoPlanerMobil/Models/CustomerSessionModel.cs
View File

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class CustomerSessionModel : ISessionModel
public class CustomerSessionModel : BaseSessionModel
{
public long? SelectedCustomerOid { get; set; }
@@ -35,8 +35,10 @@ namespace BeWoPlanerMobil.Models
public int SelectedTransaktionsart { get; set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SelectedCustomerOid = null;
//SelectedCustomerFilter = CustomerFilterEnum.All;
//SelectedReportType = CustomerReportType.Medikamentenliste;

9
BeWoPlanerMobil/Models/ISessionModel.cs
View File

@@ -1,9 +0,0 @@
using BeWoPlanerMobil.Service;
namespace BeWoPlanerMobil.Models
{
public interface ISessionModel
{
void ResetValues();
}
}

38
BeWoPlanerMobil/Models/MainModel.cs
View File

@@ -406,7 +406,11 @@ namespace BeWoPlanerMobil.Models
}
public bool IsInEditingMode { get { return MainSessionModel.IsInEditingMode; } set { MainSessionModel.IsInEditingMode = value; } }
public bool IsInEditingMode
{
get => MainSessionModel.IsInEditingMode;
set => MainSessionModel.IsInEditingMode = value;
}
public List<ServiceDescriptionDC> GetServiceDesctiptions()
{
@@ -422,7 +426,11 @@ namespace BeWoPlanerMobil.Models
public bool IsServiceRecordNoticeMandatory { get; set; } = true;
public long? PreviouslySelectedEmployeeOid { get { return MainSessionModel.PreviouslySelectedEmployeeOid; } set { MainSessionModel.PreviouslySelectedEmployeeOid = value; } }
public long? PreviouslySelectedEmployeeOid
{
get => MainSessionModel.PreviouslySelectedEmployeeOid;
set => MainSessionModel.PreviouslySelectedEmployeeOid = value;
}
public CompactEmployeeDC PreviouslySelectedEmployee { get; set; }
@@ -679,11 +687,11 @@ namespace BeWoPlanerMobil.Models
{
get
{
if (SelectedServiceRecord != null && SelectedServiceRecord.DistanceInMeterDecimal.HasValue)
if(SelectedServiceRecord != null && SelectedServiceRecord.DistanceInMeterDecimal.HasValue)
{
var dist = SelectedServiceRecord.DistanceInMeterDecimal.Value;
return Math.Round(dist, 0, MidpointRounding.AwayFromZero).ToString();
return Math.Round(dist, 2, MidpointRounding.AwayFromZero).ToString();
}
return string.Empty;
@@ -876,6 +884,28 @@ namespace BeWoPlanerMobil.Models
return result;
}
}
public string GroupMembers(long groupOid)
{
var group = GroupsOfPeople.FirstOrDefault(f => f.GroupOfPeopleOid.Equals(groupOid));
if(group is null)
{
return string.Empty;
}
var result = string.Empty;
foreach(var item in group.SupportConceptList)
{
foreach(var costBearerRelOid in item.CostBearerRelOids)
{
result += $"{costBearerRelOid},";
}
}
return result.Trim(',');
}
}
public class CustomSelectListItem

8
BeWoPlanerMobil/Models/MainSessionModel.cs
View File

@@ -6,7 +6,7 @@ using BeWoPlanerMobil.Util;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class MainSessionModel : ISessionModel
public class MainSessionModel : BaseSessionModel
{
public bool SessionInitialized { get; internal set; }
public long? SelectedSupportConceptOid { get; internal set; }
@@ -38,9 +38,12 @@ namespace BeWoPlanerMobil.Models
public bool IsInTransferMode { get; internal set; }
public IList<MokZiel> SelectedGoals { get; internal set; }
public List<long> SupportConceptOids { get; set; }
public MokServiceRecord SelectedServiceRecord { get; internal set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SessionInitialized = false;
SelectedSupportConceptOid = null;
SelectedCostBearerSupportConceptOid = null;
@@ -84,6 +87,7 @@ namespace BeWoPlanerMobil.Models
SelectedGoals = new List<MokZiel>();
SupportConceptOids = new List<long>();
SelectedServiceRecord = null;
}
}
}

7
BeWoPlanerMobil/Models/MokServiceRecord.cs
View File

@@ -1,3 +1,4 @@
using BS.Shared;
using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Invoicing;
using System;
@@ -10,7 +11,11 @@ namespace BeWoPlanerMobil.Models
[Serializable]
public class MokServiceRecord
{
public long Oid { get; set; }
public long? Oid { get; set; }
public ServiceRecordTypeId ServiceRecordType { get; set; }
public int? DistanceInMeter { get; set; }
public DateTime? Start { get; set; }

6
BeWoPlanerMobil/Models/ReportSessionModel .cs
View File

@@ -16,7 +16,7 @@ using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class ReportSessionModel : ISessionModel
public class ReportSessionModel : BaseSessionModel
{
public long? SelectedCustomerOid { get; set; }
public long? SelectedEmployeeOid { get; set; }
@@ -37,8 +37,10 @@ namespace BeWoPlanerMobil.Models
public List<ConfirmationReceiptSignatureObject> SelectedConfirmationReceiptSignatures { get; internal set; }
public QbSignatureIntervalSelection SelectedIntervalSelection { get; internal set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SelectedCustomerOid = null;
SelectedEmployeeOid = null;
SelectedTeamOid = null;

6
BeWoPlanerMobil/Models/ReportViewerSessionModel.cs
View File

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class ReportViewerSessionModel : ISessionModel
public class ReportViewerSessionModel : BaseSessionModel
{
public long? SelectedEmployeeOid { get; set; }
public long? SelectedTeamOid { get; set; }
@@ -24,8 +24,10 @@ namespace BeWoPlanerMobil.Models
public ReportType SelectedReportType { get; internal set; }
public long? SelectedQueryOid { get; internal set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SelectedEmployeeOid = null;
SelectedTeamOid = null;
SelectedMonth = null;

6
BeWoPlanerMobil/Models/SchedulerSessionModel.cs
View File

@@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
[Serializable]
public class SchedulerSessionModel : ISessionModel
public class SchedulerSessionModel : BaseSessionModel
{
public DateTime SelectedDate { get; set; }
public long? SelectedAppointmentOid { get; internal set; }
@@ -36,8 +36,10 @@ namespace BeWoPlanerMobil.Models
public DateTime? IntervalEndDate { get; internal set; }
public int? IntervalDuration { get; internal set; }
public void ResetValues()
public override void ResetValues()
{
base.ResetValues();
SelectedDate = DateTime.Today;
SelectedAppointmentOid = null;
SelectedResourceOids = new List<long>();

1
BeWoPlanerMobil/Scripts/bs-custom-file-input.min.js.map Normal file
View File

File diff suppressed because one or more lines are too long

8
BeWoPlanerMobil/Scripts/ownSoft-Scripts/mobileUtils.js
View File

@@ -467,4 +467,12 @@ function firstCharToUpperCase(str) {
}
return str.charAt(0).toUpperCase() + str.slice(1);
}
function commaSeparatedOid2Array(csv) {
if(csv === undefined || csv === null) {
return [];
}
return csv.split(",").map(num => parseInt(num, 10));
}

6
BeWoPlanerMobil/Scripts/ownSoft-Scripts/signature.js
View File

@@ -108,7 +108,7 @@ function resizeCanvas(sketchPadId, canvasRoId) {
// Das Initialisieren der Einzelunterschrift
function initializeSignature(selectedServiceRecordOid) {
$("#main-container, #checkbox-container").hide();
$("#form-container, #checkbox-container").hide();
$("#signature-container").addClass("d-block");
$.get(window.getSelectedRecordInformationUrlWithOid(), { oid: selectedServiceRecordOid }).done(function(jsonServiceRecord2Monatsunterschrift) {
@@ -118,7 +118,7 @@ function initializeSignature(selectedServiceRecordOid) {
}
if(isEmptyOrSpaces(jsonServiceRecord2Monatsunterschrift)) {
$("#main-container, #checkbox-container").show();
$("#form-container, #checkbox-container").show();
$("#signature-container").removeClass("d-block");
showMessagePopupWithHtmlAndCallback("Fehler", "Der zu unterschreibende Zeiterfassungseintrag konnte nicht geladen werden. Bitte wenden Sie sich an den Support.<br/><br/><a href='mailto:support@bewoplaner.de'>support@bewoplaner.de</a>", false,
@@ -248,7 +248,7 @@ function cancelButtonClick(signaturePad) {
function () {
$("#signature-container, #checkbox-container").removeClass("d-block");
$("#signature-alert").addClass("d-none");
$("#main-container").show();
$("#form-container").show();
signaturePad.clear();
}, false);

38
BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/countdown.js Normal file
View File

@@ -0,0 +1,38 @@
class Countdown {
constructor(duration, onTick, onFinish) {
this.duration = duration;
this.timeLeft = duration;
this.onTick = onTick;
this.onFinish = onFinish;
this.timer = null;
}
start() {
this.stop();
this.timeLeft = this.duration;
this.onTick?.(this.timeLeft);
this.timer = setInterval(() => {
this.timeLeft--;
this.onTick?.(this.timeLeft);
if(this.timeLeft <= 0) {
this.stop();
this.onFinish();
}
}, 1000);
}
stop() {
if(this.timer) {
clearInterval(this.timer);
}
this.timer = null;
}
reset() {
this.start();
}
}

26
BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js
View File

@@ -137,6 +137,7 @@ function calcTimeWithDuration(timeAsString, timeElement, start, duration, isForm
}
function beiDaueraenderung(idPrefix) {
logInfo2(`${idPrefix}-Dauer geändert`);
const hoursMinutesDropdown = $(`#${idPrefix}-hours-minutes-dropdown-btn`);
const startTimeInput = $(`#${idPrefix}-start-time-input`);
@@ -215,6 +216,10 @@ function combineDateAndTime(date, time) {
}
function getTimeAsString(date) {
if(date === null || date === undefined) {
return null;
}
const hours = date.getHours().toString().padStart(2, "0");
const minutes = date.getMinutes().toString().padStart(2, "0");
@@ -222,9 +227,30 @@ function getTimeAsString(date) {
}
function getDateAsString(dateObject) {
if(dateObject === null || dateObject === undefined) {
return null;
}
const year = dateObject.getFullYear();
const date = dateObject.getDate().toString().padStart(2, "0");
const month = (dateObject.getMonth() + 1).toString().padStart(2, "0");
return `${year}-${month}-${date}`;
}
function getDateAndTimeAsString(dateObject) {
if(dateObject === null || dateObject === undefined) {
return null;
}
const hours = dateObject.getHours().toString().padStart(2, "0");
const minutes = dateObject.getMinutes().toString().padStart(2, "0");
const seconds = dateObject.getSeconds().toString().padStart(2, "0");
const milliseconds = dateObject.getMilliseconds().toString().padStart(3, "0");
const year = dateObject.getFullYear();
const date = dateObject.getDate().toString().padStart(2, "0");
const month = (dateObject.getMonth() + 1).toString().padStart(2, "0");
return `${year}-${month}-${date} ${hours}:${minutes}:${seconds}.${milliseconds}`;
}

6
BeWoPlanerMobil/Util/DcToMokMapper.cs
View File

@@ -46,6 +46,8 @@ namespace BeWoPlanerMobil.Util
var s = new MokServiceRecord
{
Oid = dc.ServiceRecordOid.Value,
ServiceRecordType = dc.ServiceRecordType,
DistanceInMeter = dc.DistanceInMeter,
Start = dc.Start,
End = dc.End,
EmployeeName = dc.Employee.FirstNameLastName,
@@ -106,7 +108,7 @@ namespace BeWoPlanerMobil.Util
}
#if DEBUG
if (goal.RatingTypeOid.HasValue)
if (model != null && goal.RatingTypeOid.HasValue)
{
var goalRating = model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value));
@@ -123,7 +125,7 @@ namespace BeWoPlanerMobil.Util
}
}
if (model.ServiceRecordOids2GoalHeader.ContainsKey(s.Oid))
if (model != null && model.ServiceRecordOids2GoalHeader.ContainsKey(s.Oid.Value))
{
var ziele = dc.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == ValueListEntryType.SupportConceptGoalCategoryType).ToList();

5
BeWoPlanerMobil/Util/FormCollectionConstants.cs
View File

@@ -39,7 +39,9 @@
public static string SingleBookingEmployeeOidKey => "service-record-single-booking-employee-oid";
public static string SelectedGoalOids => "service-record-selected-goal-oids";
public static string BookingModeKey => "BookingMode";
public static string DurationUnitKey => "DurationUnit";
public static string CurrentPageKey => "CurrentPage";
// Kalender
public static string AppointmentStartDateKey => "StartDate";
@@ -96,5 +98,6 @@
public static string SaveSupportConceptDependenciesKey => "SaveSupportConceptDependencies";
public static string DeleteLocalInputsKey => "DeleteLocalInputsKey";
public static string SupportConceptRelSelectedKey => "SupportConceptRelSelected";
public static string IsGroupTabActiveKey => "IsGroupTabActive";
}
}

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

@@ -25,7 +25,7 @@
Geändert von
</td>
<td class="float-right">
@historyEntry.BargeldtransaktionUdpUser
@historyEntry.InsUser
</td>
</tr>
<tr>

3
BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
View File

@@ -87,12 +87,15 @@
return selectedGoals.substr(0, selectedGoals.length - 1);
} catch(error) {
showErrorPopup(error);
return null;
}
}
function updateSelectedGoals() {
try {
const selectedGoals = getCheckedGoals();
console.log(selectedGoals);
window.updateGoals2Ratings("@Model.BookingModePrefix", new Map(selectedGoals.split(";").map(item => [item, ""])));
$.get("@Url.Action("UpdateGoals")", {pGoalOids: selectedGoals}, function (numberOfSelectedGoals) {
$("#goals-button").html(`Ziele <span class='badge badge-light text-primary'>${numberOfSelectedGoals}</span>`);

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

@@ -1,69 +1,53 @@
@using BeWoPlanerMobil.Util
@using BeWoPlanerMobil.Service
@using BeWoPlanerMobil.Util
@using BS.Shared
@model BeWoPlanerMobil.Models.MainModel
@{
if(TempData[TempDataConstants.DoLogoutKey] is true)
{
<text>
<script type="text/javascript">
$("#second-logout-form").submit();
</script>
</text>
}
if(TempData[TempDataConstants.DoLogoutKey] is true)
{
<text>
<script type="text/javascript">
$("#second-logout-form").submit();
</script>
</text>
}
}
<script type="text/javascript">
function addScCbRelsToGroupBooking() {
var selectedGroups = [];
var selectedSupportConcepts = [];
function removeSupportConceptCostBearerRel(relOid) {
showSpinner();
$("#gb-supportconcepts input:checked").each(function () {
selectedSupportConcepts.push($(this).attr("value"));
});
$("#gb-groups input:checked").each(function () {
selectedGroups.push($(this).attr("value"));
});
$(`#gb-cb2sc-checkbox-${relOid}`).prop("checked", false);
updateLocallyStoredGroupBookingCb2ScRelOids();
$("#gb-sc-cb-rel-tab-content").load("@Url.Action("AddScCbRelsToGroupBooking")", {relOids: selectedSupportConcepts, groupOids: selectedGroups}, function() {
$("#gb-selection-container").load("@Url.Action("ReloadGroupBookingForm")", function () {
$("#gb-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRel")", { relOid: relOid }, function() {
$("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
toggleGroupBookingForm();
$("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
$("#tree").load("@Url.Action("LoadUpToDateTextModules")");
});
$("#tree").load("@Url.Action("LoadUpToDateTextModules")", function() {
hideSpinner();
});
});
});
}
function removeSupportConceptCostBearerRel(relOid) {
$(`#gb-cb2sc-checkbox-${relOid}`).prop("checked", false);
updateLocallyStoredGroupBookingCb2ScRelOids();
$("#gb-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRel")", {relOid: relOid}
, function () {
$("#goals-tree").load("@Url.Action("ReloadGoals")"
, function () {
toggleGroupBookingForm();
$("#tree").load("@Url.Action("LoadUpToDateTextModules")");
});
});
}
function updateLocallyStoredGroupBookingCb2ScRelOids() {
let cb2ScOidString = "";
$("#gb-supportconcepts input:checked").each(function () {
cb2ScOidString += `${$(this).attr("value")},`;
});
let cb2ScOidString = "";
window.updateCbScRelOids("gb-", cb2ScOidString.slice(0, -1));
}
const selectedCb2ScRelOids = $("#gb-supportconcepts input:checked");
selectedCb2ScRelOids.each(function() {
cb2ScOidString += `${$(this).attr("value")},`;
});
if(selectedCb2ScRelOids.length === 0) {
localStorage.removeItem(`@MobileSessionFacade.LocalStorageKey-GbCb2ScRelOids`);
} else {
window.updateCbScRelOids("gb", cb2ScOidString.slice(0, -1));
}
}
</script>
@if(Model != null)
@@ -75,7 +59,7 @@
var startDate = Model.SelectedServiceRecord?.Start?.ToString("yyyy-MM-dd") ?? DateTime.Today.ToString("yyyy-MM-dd");
var endDate = Model.SelectedServiceRecord?.End?.ToString("yyyy-MM-dd") ?? DateTime.Today.ToString("yyyy-MM-dd");
var distance = Model.SelectedServiceRecord?.DistanceInMeter?.ToString() ?? string.Empty;
var distance = Model.DistanceToEdit;
var notice0 = Model.SelectedServiceRecord?.Notice ?? string.Empty;
var noticeList = new[] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty };
@@ -179,7 +163,7 @@
}
</div>
@* Von und Bis *@
@* Von und Bis *@
<div class="form-row">
@{
var startTimeValue = Model.StartTimeToEdit;
@@ -281,7 +265,7 @@
{
<div class="form-group">
<label for="gb-doku-textarea">Dokumentation</label>
<textarea class="form-control" onchange="window.updateDokuText('gb', $(this).val(), 6)" autocomplete="on" name="Dokumentation6" id="gb-doku-textarea">@notice0</textarea>
<textarea class="form-control" onchange="window.updateDokuText('gb', $(this).val(), 5)" autocomplete="on" name="Dokumentation6" id="gb-doku-textarea">@notice0</textarea>
</div>
}
else

23
BeWoPlanerMobil/Views/Main/GroupBookingPartial.cshtml
View File

@@ -13,21 +13,6 @@
}
<script type="text/javascript">
window.addEventListener("load", function() {
@if(TempData[TempDataConstants.SupportConceptRelSelectedKey] is true)
{
<text>
window.updateCategory("@Model.BookingModePrefix", @Model.SelectedServiceCategoryOid);
window.updateServiceDescription("@Model.BookingModePrefix", @Model.SelectedServiceDescriptionOid);
window.updateEmployeeOids("@Model.BookingModePrefix", getGroupBookingEmployeeOids());
window.updateStartDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-date-input`).val());
window.updateStartTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-time-input`).val());
window.updateEndDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-date-input`).val());
window.updateEndTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-time-input`).val());
</text>
}
});
$(document).ready(function() {
const groupBookingHoursMinutesDropdownButton = $("#gb-hours-minutes-dropdown-btn");
@@ -46,7 +31,9 @@
const buttonText = $(this).text();
groupBookingHoursMinutesDropdownButton.text(buttonText);
window.setInputFilter('gb-duration-input', 'distance', 'gb-hours-minutes-dropdown-btn');
window.setInputFilter();
window.updateDurationUnit("gb", (buttonText === "Stunden" ? "h" : "m"));
$.get('@Url.Action("ToggleDurationUnit")', { isInHoursMode: buttonText === "Stunden" });
@@ -64,7 +51,7 @@
}
function addEmployeeToGroupBooking() {
const oidString = getGroupBookingEmployeeOids();
const oidString = getGroupBookingEmployeeOids();
window.updateEmployeeOids("gb", oidString);
@@ -103,7 +90,7 @@
}
<div class="row">
<div class="col col-12" id="group-booking-form-container">
<div class="col col-12">
@if(Model != null)
{
@Html.Partial("GroupBookingFormPartial", Model);

24
BeWoPlanerMobil/Views/Main/GroupBookingScCbRelList.cshtml
View File

@@ -6,14 +6,17 @@
{
<text>
<script type="text/javascript">
$("#second-logout-form").submit();
$("#second-logout-form").submit();
</script>
</text>
}
var isGroupTabPaneActive = TempData[TempDataConstants.IsGroupTabActiveKey] is true ? "active" : string.Empty;
var isSingleTabPaneActive = TempData[TempDataConstants.IsGroupTabActiveKey] is true ? string.Empty : "active";
}
<div class="tab-pane show active" role="tabpanel" id="gb-supportconcepts">
<ul class="list-group">
<div class="tab-pane show @isSingleTabPaneActive" role="tabpanel" id="gb-supportconcepts">
<ul class="list-group" id="gb-cb2sc-list">
@foreach(var cb2Sc in Model.SupportConceptListObjectsForGroupBooking)
{
<li class="list-group-item">
@@ -26,7 +29,7 @@
<div class="custom-control custom-checkbox custom-control-inline">
<input type="checkbox"
@{ if(checkedValue) { @Html.Raw("checked=\"checked\"") } }
class="custom-control-input cb2sc-input" id="gb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" onchange="addScCbRelsToGroupBooking()" name="cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" value="@cb2Sc.CostBearer2SupportConceptOid">
class="custom-control-input cb2sc-input" id="gb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" onchange="window.updateScCbRelOids('gb', false)" name="cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" value="@cb2Sc.CostBearer2SupportConceptOid">
<label for="gb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" class="custom-control-label">
<span class="justify-content-between mb-1 text-dark text-left">
@cb2Sc.NameAndDateOfBirth
@@ -41,8 +44,8 @@
}
</ul>
</div>
<div class="tab-pane show" role="tabpanel" id="gb-groups">
<ul class="list-group">
<div class="tab-pane show @isGroupTabPaneActive" role="tabpanel" id="gb-groups">
<ul class="list-group" id="gb-g-list">
@foreach(var group in Model.GroupOfPeopleListItems)
{
<li class="list-group-item">
@@ -54,10 +57,11 @@
var attribute = shouldBeChecked ? "checked=\"checked\"" : string.Empty;
}
<div class="custom-control custom-checkbox custom-control-inline">
<input type="checkbox" @attribute class="custom-control-input" id="group-checkbox-@group.Value" value="@group.Value" onchange="addScCbRelsToGroupBooking()" />
<label for="group-checkbox-@group.Value" class="custom-control-label">
@group.Text
</label>
<input type="hidden" id="gb-i-@group.Value" value="@Model.GroupMembers(groupOid)" />
<input type="checkbox" @attribute class="custom-control-input" id="gb-group-checkbox-@group.Value" value="@group.Value" onchange="updateGroupOfPeople(this, 'gb')"/>
<label for="gb-group-checkbox-@group.Value" class="custom-control-label">
@group.Text
</label>
</div>
</li>
}

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

@@ -2,7 +2,7 @@
@model BeWoPlanerMobil.Models.MainModel
@{
if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
if(TempData[TempDataConstants.DoLogoutKey] is true)
{
<text>
<script type="text/javascript">

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

@@ -26,8 +26,6 @@
}
<script type="text/javascript">
function loadServiceRecords() {
try {
const selectedOption = $("#timeFrameSelect").val();
@@ -101,11 +99,6 @@
}
}
function getIsZeiterfassungseinheitInMinutes() {
return "@Model.EinheitZeiterfassung" === "0";
}
$(document).ready(function() {
try {
$(".collapse").on("shown.bs.collapse", function () {
@@ -193,6 +186,13 @@
loadServiceRecords();
</text>
}
@if(TempData[TempDataConstants.AfterRestoreKey] is true)
{
<text>
clearLocalBeWoStorage();
</text>
}
} catch(error) {
window.showErrorPopup(error);
}
@@ -325,7 +325,107 @@
function reloadServiceRecordsAfterValidation() {
}
function getSelectedScCbRelOids(prefix) {
const checkedCheckboxes = $(`#${prefix}-cb2sc-list input[type=checkbox]:checked`);
const oids = [];
checkedCheckboxes.each(
(index, item) => {
oids.push(parseInt($(item).val(), 10));
}
);
return oids;
}
function updateScCbRelOids(prefix, isGroupTabActive) {
const oids = getSelectedScCbRelOids(prefix);
const selectedGroups = [];
$(`#${prefix}-g-list input[type=hidden]`).each(
(index, item) => {
const memberOids = commaSeparatedOid2Array($(item).val());
let isSelected = true;
for(let i = 0; i < memberOids.length; i++) {
if(false === oids.includes(memberOids[i])) {
isSelected = false;
break;
}
}
const groupOid = $(item).attr("id").split("-")[2];
if(isSelected) {
selectedGroups.push(groupOid);
}
$(`#${prefix}-group-checkbox-${groupOid}`).prop("checked", isSelected);
}
);
if(prefix === "gb") {
window.updateLocallyStoredGroupBookingCb2ScRelOids();
} else if(prefix === "mb") {
window.updateLocallyStoredMultiBookingCb2ScRelOids();
}
const addScCbRelOidsUrl = prefix === "gb" ? "@Url.Action("AddScCbRelsToGroupBooking")" : "@Url.Action("AddScCbRelsToMultiBooking")";
const reloadBookingFormUrl = prefix === "gb" ? "@Url.Action("ReloadGroupBookingForm")" : "@Url.Action("ReloadMultiBookingForm")";
$(`#${prefix}-sc-cb-rel-tab-content`).load(addScCbRelOidsUrl,
{
relOids: oids,
groupOids: selectedGroups,
isGroupTabActive: isGroupTabActive
},
() => {
$(`#${prefix}-selection-container`).load(reloadBookingFormUrl, () => {
if(prefix === "gb") {
window.updateCategory("@Model.BookingModePrefix", @Model.SelectedServiceCategoryOid);
window.updateServiceDescription("@Model.BookingModePrefix", @Model.SelectedServiceDescriptionOid);
window.updateEmployeeOids("@Model.BookingModePrefix", getGroupBookingEmployeeOids());
window.updateStartDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-date-input`).val());
window.updateStartTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-time-input`).val());
window.updateEndDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-date-input`).val());
window.updateEndTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-time-input`).val());
window.updateDurationUnit("gb", ($("#gb-hours-minutes-dropdown-btn").text().trim() === "Stunden" ? "h" : "m"));
toggleGroupBookingForm();
} else if(prefix === "mb") {
changeMultiBookingFormEnableState($(".mb-cb2sc-input:checkbox:checked").length > 0 ? false : true);
window.updateCategory("@Model.BookingModePrefix", @Model.SelectedServiceCategoryOid);
window.updateServiceDescription("@Model.BookingModePrefix", @Model.SelectedServiceDescriptionOid);
window.updateEmployeeOids("@Model.BookingModePrefix", getMultiBookingEmployeeOids());
window.updateStartDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-date-input`).val());
window.updateStartTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-time-input`).val());
window.updateEndDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-date-input`).val());
window.updateEndTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-time-input`).val());
window.updateDurationUnit("mb", ($("#mb-hours-minutes-dropdown-btn").text().trim() === "Stunden" ? "h" : "m"));
}
$("#goals-tree").load("@Url.Action("ReloadGoals")", () => {
$("#tree").load("@Url.Action("LoadUpToDateTextModules")", () => { logDebug("Textbausteine geladen"); });
});
});
});
}
function updateGroupOfPeople(element, prefix) {
const item = $(element);
const groupOid = item.attr("id").split("-")[3];
const isSelected = item.prop("checked");
const memberOids = commaSeparatedOid2Array($(`#${prefix}-i-${groupOid}`).val());
for(let i = 0; i < memberOids.length; i++) {
$(`#${prefix}-cb2sc-checkbox-${memberOids[i]}`).prop("checked", isSelected);
}
updateScCbRelOids(prefix, true);
}
</script>
<div class="container mt-3 lg-max-width" id="checkbox-container">
@@ -378,30 +478,9 @@
</div>
</div>
@* ----- Einzelbuchung ----- *@
<div class="container-fluid mb-3 lg-max-width" id="main-container">
@if(!Model.IsInGroupBookingMode && !Model.IsInMultiBookingMode)
{
@Html.Partial("SingleBookingPartial", Model)
}
</div>
@* ----- Gruppenbuchung ----- *@
<div class="container mb-3 lg-max-width">
@if(Model.IsInGroupBookingMode && !Model.IsInMultiBookingMode)
{
<div id="group-booking-container">
@Html.Partial("GroupBookingPartial", Model)
</div>
}
</div>
@* ----- Mehrfachbuchung ----- *@
<div class="container mb-3 lg-max-width">
@if(Model.IsInMultiBookingMode && !Model.IsInGroupBookingMode)
{
@Html.Partial("MultiBookingPartial", Model);
}
@* ----- Formularcontainer für Einzel-, Gruppen-, und Mehrfachbuchungen ----- *@
<div class="container-fluid mb-3 lg-max-width" id="form-container">
@Html.Partial("Zeiterfassungspartial", Model)
</div>
@* ----- Textbausteine-Popup ----- *@

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

@@ -1,4 +1,6 @@
@using BeWoPlanerMobil.Util
@using BeWoPlanerMobil.Service
@using BeWoPlanerMobil.Util
@using BS.Shared
@model BeWoPlanerMobil.Models.MainModel
@{
@@ -6,82 +8,64 @@
{
<text>
<script type="text/javascript">
$("#second-logout-form").submit();
$("#second-logout-form").submit();
</script>
</text>
}
}
<script type="text/javascript">
function addScCbRelsToMultiBooking() {
var selectedGroups = [];
var selectedSupportConcepts = [];
function removeSupportConceptCostBearerRel(relOid) {
showSpinner();
$("#mb-supportconcepts input:checked").each(function () {
selectedSupportConcepts.push($(this).attr("value"));
});
$("#mb-groups input:checked").each(function () {
selectedGroups.push($(this).attr("value"));
});
$("#mb-sc-cb-rel-tab-content").load("@Url.Action("AddScCbRelsToMultiBooking")",
{
relOids: selectedSupportConcepts,
groupOids: selectedGroups
},
function() {
updateLocallyStoredMultiBookingCb2ScRelOids();
$("#multibooking-selection-container").load("@Url.Action("ReloadMultiBookingForm")", function () {
changeMultiBookingFormEnableState($(".mb-cb2sc-input:checkbox:checked").length > 0 ? false : true);
$("#tree").load("@Url.Action("LoadUpToDateTextModules")");
});
});
}
function removeSupportConceptCostBearerRel(relOid) {
$(`#mb-cb2sc-checkbox-${relOid}`).prop("checked", false);
updateLocallyStoredMultiBookingCb2ScRelOids();
$("#multibooking-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRelFromMultiBooking")",
{
relOid: relOid
}
,
function() {
$("#goals-tree").load("@Url.Action("ReloadGoals")"
, function () {
changeMultiBookingFormEnableState($(".mb-cb2sc-input:checkbox:checked").length > 0 ? false : true);
$("#mb-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRelFromMultiBooking")", { relOid: relOid }, function() {
$("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
changeMultiBookingFormEnableState($(".mb-cb2sc-input:checkbox:checked").length > 0 ? false : true);
$("#tree").load("@Url.Action("LoadUpToDateTextModules")");
}
);
}
);
$("#tree").load("@Url.Action("LoadUpToDateTextModules")", function() {
hideSpinner();
});
});
});
}
function updateLocallyStoredMultiBookingCb2ScRelOids() {
let cb2ScOidString = "";
let cb2ScOidString = "";
$("#mb-supportconcepts input:checked").each(function () {
const selectedCb2ScRelOids = $("#mb-supportconcepts input:checked");
selectedCb2ScRelOids.each(function () {
cb2ScOidString += `${$(this).attr("value")},`;
});
window.updateCbScRelOids("mb", cb2ScOidString.slice(0, -1));
if(selectedCb2ScRelOids.length === 0) {
localStorage.removeItem(`@MobileSessionFacade.LocalStorageKey-MbCb2ScRelOids`);
} else {
window.updateCbScRelOids("mb", cb2ScOidString.slice(0, -1));
}
}
</script>
@if(Model != null)
{
using(Html.BeginForm("CreateMultiBooking", "Main", FormMethod.Post, new { id = "multiBookingForm" }))
{
var startDate = Model.SelectedServiceRecord?.Start?.ToShortDateString() ?? DateTime.Today.ToString("yyyy-MM-dd");
var endDate = Model.SelectedServiceRecord?.End?.ToShortDateString() ?? DateTime.Today.ToString("yyyy-MM-dd");
var startDate = Model.SelectedServiceRecord?.Start?.ToString("yyyy-MM-dd") ?? DateTime.Today.ToString("yyyy-MM-dd");
var endDate = Model.SelectedServiceRecord?.End?.ToString("yyyy-MM-dd") ?? DateTime.Today.ToString("yyyy-MM-dd");
var distance = Model.SelectedServiceRecord?.DistanceInMeter?.ToString() ?? string.Empty;
var distance = Model.DistanceToEdit;
var notice0 = Model.SelectedServiceRecord?.Notice ?? string.Empty;
var noticeList = new[] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty };
@@ -94,226 +78,228 @@
noticeList[i] = selectedNoticeList[i] ?? string.Empty;
}
}
<div class="mt-3 booking-form-container">
<div id="multibooking-selection-container">
@Html.Partial("MultiBookingSelectionPartial", Model)
</div>
@* Marker *@
@if(Model.ShowMarker)
{
<div class="form-row mt-2">
<div class="col-md">
<div class="custom-control custom-checkbox custom-control-inline">
<input type="checkbox" class="custom-control-input" onchange="window.updateMarker('mb', $(this).prop('checked'));" name="marker-cb" id="mb-marker-cb" />
<label class="custom-control-label" for="mb-marker-cb">Marker</label>
</div>
<div class="mt-3 booking-form-container">
<div id="mb-selection-container">
@Html.Partial("MultiBookingSelectionPartial", Model)
</div>
</div>
}
@* ----- Betrag ----- *@
@if(Model.ShowBetrag)
{
<div class="form-row mt-2">
<div class="col-md">
<div class="form-group my-0">
@* Marker *@
@if(Model.ShowMarker)
{
var markerCheckedValue = Model.SelectedServiceRecord?.ServiceRecordType == ServiceRecordTypeId.Content ? "checked" : string.Empty;
<div class="form-row mt-2">
<div class="col-md">
<div class="custom-control custom-checkbox custom-control-inline">
<input type="checkbox" class="custom-control-input" onchange="window.updateMarker('mb', $(this).val());" name="marker-cb" id="mb-marker-cb" @markerCheckedValue />
<label class="custom-control-label" for="mb-marker-cb">Marker</label>
</div>
</div>
</div>
}
@* ----- Betrag ----- *@
@if(Model.ShowBetrag)
{
<div class="form-row mt-2">
<div class="col-md">
<div class="form-group my-0">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text prepend-input-group-text">
Betrag
</div>
</div>
<input class="form-control" type="text" id="mb-betrag" name="betrag" />
<div class="input-group-append">
<div class="input-group-text">€</div>
</div>
</div>
</div>
</div>
</div>
}
@* Trennstrich *@
<hr class="py-0 mt-2 mb-0" />
@* Start- und Enddatum *@
@{
var columnWidth = Model.IsEndDateVisible ? "col-md-6" : "col";
}
<div class="form-row">
<div class="@columnWidth mt-2">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text prepend-input-group-text">
Betrag
</div>
</div>
<input class="form-control" type="text" id="mb-betrag" name="betrag" />
<div class="input-group-append">
<div class="input-group-text">€</div>
<span class="input-group-text">
Startdatum
</span>
</div>
<input class="form-control" type="date" name="Datum" id="mb-start-date-input" onchange="calcDuration('mb', false, true, false); window.updateStartDate('mb', $(this).val());" value="@startDate" />
</div>
</div>
</div>
</div>
}
@* Trennstrich *@
<hr class="py-0 mt-2 mb-0" />
@* Start- und Enddatum *@
@{
var columnWidth = Model.IsEndDateVisible ? "col-md-6" : "col";
}
<div class="form-row">
<div class="@columnWidth mt-2">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">
Startdatum
</span>
</div>
<input class="form-control" type="date" name="Datum" id="mb-start-date-input" onchange="calcDuration('mb', false, true, false); window.updateStartDate('mb', $(this).val());" value="@startDate" />
</div>
</div>
@if(Model.IsEndDateVisible)
{
<div class="col-md-6 mt-2">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">
Enddatum
</span>
</div>
<input class="form-control" type="date" name="Enddatum" id="mb-end-date-input" onchange="calcDuration('mb', false, false, true); window.updateEndDate('mb', $(this).val());" value="@endDate" />
</div>
</div>
}
</div>
@* Start- und Endzeit *@
<div class="form-row">
@{
var startTimeValue = Model.StartTimeToEdit;
var endTimeValue = Model.EndTimeToEdit;
var divisor = Model.SelectedDurationUnit == "Stunden" ? 60 : 1;
var durationValue = Model.DurationToEdit;
var afterValidationState = TempData[TempDataConstants.AfterValidationStateKey];
if(Model.SetStartTimeToEndTimeAfterSave && !Model.IsInEditingMode && afterValidationState is bool isAfterValidation && isAfterValidation == false)
{
startTimeValue = Model.NewStartTime;
endTimeValue = Model.NewEndTime;
if(Model.NewDuration.HasValue)
@if(Model.IsEndDateVisible)
{
durationValue = (Model.NewDuration / divisor).ToString();
<div class="col-md-6 mt-2">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">
Enddatum
</span>
</div>
<input class="form-control" type="date" name="Enddatum" id="mb-end-date-input" onchange="calcDuration('mb', false, false, true); window.updateEndDate('mb', $(this).val());" value="@endDate" />
</div>
</div>
}
}
}
<div class="col mt-2">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">
Von
</span>
</div>
<input class="form-control" type="time" name="Start" id="mb-start-time-input" onchange="calcDuration('mb', false, true, false); window.updateStartTime('mb', $(this).val());" value="@startTimeValue" />
<span class="input-group-text rounded-0 border-left-0 border-right-0">
Bis
</span>
<input class="form-control" type="time" name="Ende" id="mb-end-time-input" onchange="calcDuration('mb', false, false, true); window.updateEndTime('mb', $(this).val());" value="@endTimeValue" />
</div>
</div>
</div>
</div>
@* Dauer und Stunden/Minuten-Auswahl *@
<div class="form-row">
<div class="col-md">
<div class="form-group my-0">
<div class="input-group mt-2">
<div class="input-group-prepend">
@{
var labelText = Model.EinheitZeiterfassung == 1 ? "Dauer (h)" : "Dauer";
@* Start- und Endzeit *@
<div class="form-row">
@{
var startTimeValue = Model.StartTimeToEdit;
var endTimeValue = Model.EndTimeToEdit;
var divisor = Model.SelectedDurationUnit == "Stunden" ? 60 : 1;
var durationValue = Model.DurationToEdit;
var afterValidationState = TempData[TempDataConstants.AfterValidationStateKey];
if(Model.SetStartTimeToEndTimeAfterSave && !Model.IsInEditingMode && afterValidationState is bool isAfterValidation && isAfterValidation == false)
{
startTimeValue = Model.NewStartTime;
endTimeValue = Model.NewEndTime;
if(Model.NewDuration.HasValue)
{
durationValue = (Model.NewDuration / divisor).ToString();
}
<div class="input-group-text prepend-input-group-text" id="mb-duration-label">
@labelText
</div>
</div>
<input type="text" autocomplete="on" class="form-control" id="mb-duration-input" name="Dauer" onchange="beiDaueraenderung('mb'); window.updateDuration('mb', $(this).val());" value="@durationValue">
@if(Model.IsZeiterfassungInStdMin)
{
<div class="input-group-append">
<button id="mb-hours-minutes-dropdown-btn" class="btn btn-outline-primary dropdown-toggle" type="button" data-toggle="dropdown">
@Model.SelectedDurationUnit
</button>
<div class="dropdown-menu">
<a class="dropdown-item hours-minutes-link" href="#">Minuten</a>
<a class="dropdown-item hours-minutes-link" href="#">Stunden</a>
</div>
</div>
}
</div>
</div>
</div>
</div>
@* Gefahrene Kilometer *@
@if(Model.ShowDistanceField)
{
<div class="form-row">
<div class="col-md">
<div class="form-group my-0">
<div class="input-group mt-2">
}
<div class="col mt-2">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
Gefahrene Kilometer
</div>
<span class="input-group-text">
Von
</span>
</div>
<input type="text" autocomplete="on" class="form-control" id="mb-distance-input" name="Distanz" onchange="validateDistanceInput(); window.updateDistance('mb', $(this).val());" value="@distance">
<input class="form-control" type="time" name="Start" id="mb-start-time-input" onchange="calcDuration('mb', false, true, false); window.updateStartTime('mb', $(this).val());" value="@startTimeValue" />
<span class="input-group-text rounded-0 border-left-0 border-right-0">
Bis
</span>
<input class="form-control" type="time" name="Ende" id="mb-end-time-input" onchange="calcDuration('mb', false, false, true); window.updateEndTime('mb', $(this).val());" value="@endTimeValue" />
</div>
</div>
</div>
</div>
}
@* Textbausteinebutton *@
@if(Model.HasRightToSeeTextModules)
{
<div class="form-row" id="textmodule-container">
<div class="col-md">
<button type="button" class="btn btn-primary form-control mt-2" data-toggle="modal" data-target="#textbausteine-popup" id="mb-textbausteine-btn">Textbausteine</button>
@* Dauer und Stunden/Minuten-Auswahl *@
<div class="form-row">
<div class="col-md">
<div class="form-group my-0">
<div class="input-group mt-2">
<div class="input-group-prepend">
@{
var labelText = Model.EinheitZeiterfassung == 1 ? "Dauer (h)" : "Dauer";
}
<div class="input-group-text prepend-input-group-text" id="mb-duration-label">
@labelText
</div>
</div>
<input type="text" autocomplete="on" class="form-control" id="mb-duration-input" name="Dauer" onchange="beiDaueraenderung('mb'); window.updateDuration('mb', $(this).val());" value="@durationValue">
@if(Model.IsZeiterfassungInStdMin)
{
<div class="input-group-append">
<button id="mb-hours-minutes-dropdown-btn" class="btn btn-outline-primary dropdown-toggle" type="button" data-toggle="dropdown">
@Model.SelectedDurationUnit
</button>
<div class="dropdown-menu">
<a class="dropdown-item hours-minutes-link" href="#">Minuten</a>
<a class="dropdown-item hours-minutes-link" href="#">Stunden</a>
</div>
</div>
}
</div>
</div>
</div>
</div>
@* Gefahrene Kilometer *@
@if(Model.ShowDistanceField)
{
<div class="form-row">
<div class="col-md">
<div class="form-group my-0">
<div class="input-group mt-2">
<div class="input-group-prepend">
<div class="input-group-text">
Gefahrene Kilometer
</div>
</div>
<input type="text" autocomplete="on" class="form-control" id="mb-distance-input" name="Distanz" onchange="validateDistanceInput(); window.updateDistance('mb', $(this).val());" value="@distance">
</div>
</div>
</div>
</div>
}
@* Textbausteinebutton *@
@if(Model.HasRightToSeeTextModules)
{
<div class="form-row" id="textmodule-container">
<div class="col-md">
<button type="button" class="btn btn-primary form-control mt-2" data-toggle="modal" data-target="#textbausteine-popup" id="mb-textbausteine-btn">Textbausteine</button>
</div>
</div>
}
@* Dokumentationsfelder *@
<div class="form-row">
<div class="col-md mt-2">
@if(Model.NumberOfDokuTypes == 0)
{
<div class="form-group mt-2">
<label for="mb-doku-textarea">Dokumentation</label>
<textarea class="form-control" autocomplete="on" name="Dokumentation6" id="mb-doku-textarea" onchange="window.updateDokuText('mb', $(this).val(), 5)">@notice0</textarea>
</div>
}
else
{
<ul class="nav nav-tabs" role="tab-list">
@for(var i = 0; i < Model.Dokutypes.Length; i++)
{
var currentDokuType = Model.Dokutypes[i];
<li class="nav-item">
<a href="#mb-doku_@i" id="mb-doku_@i-tab" data-toggle="tab" role="tab" class="nav-link@(i == 0 ? " active" : string.Empty)">
@currentDokuType.DisplayName
</a>
</li>
}
</ul>
<div class="tab-content" id="mb-dokufelderTab">
@for(var i = 0; i < Model.Dokutypes.Length; i++)
{
var textareaName = i + 1 < 1 ? "Dokumentation" : "Dokumentation" + (i + 1);
<div class="tab-pane show@(i == 0 ? " active" : string.Empty)" id="mb-doku_@i" role="tabpanel">
<textarea class="form-control doku-form-control" onchange="window.updateDokuText('mb', $(this).val(), @i)" autocomplete="on" id="mb-doku-textarea-@i" name="@textareaName">@noticeList[i]</textarea>
</div>
}
</div>
}
</div>
</div>
</div>
}
@* Dokumentationsfelder *@
<div class="form-row">
<div class="col-md mt-2">
@if(Model.NumberOfDokuTypes == 0)
{
<div class="form-group mt-2">
<label for="mb-doku-textarea">Dokumentation</label>
<textarea class="form-control" autocomplete="on" name="Dokumentation6" id="mb-doku-textarea" onchange="window.updateDokuText('mb', $(this).val(), 6)">@notice0</textarea>
</div>
}
else
{
<ul class="nav nav-tabs" role="tab-list">
@for(var i = 0; i < Model.Dokutypes.Length; i++)
{
var currentDokuType = Model.Dokutypes[i];
<div class="w-100 mt-2">
<button type="button" class="btn btn-primary float-right ml-1" id="mb-create-btn" onclick="window.submitMultiBookingForm()">Anlegen</button>
<li class="nav-item">
<a href="#mb-doku_@i" id="mb-doku_@i-tab" data-toggle="tab" role="tab" class="nav-link@(i == 0 ? " active" : string.Empty)">
@currentDokuType.DisplayName
</a>
</li>
}
</ul>
<div class="tab-content" id="mb-dokufelderTab">
@for(var i = 0; i < Model.Dokutypes.Length; i++)
{
var textareaName = i + 1 < 1 ? "Dokumentation" : "Dokumentation" + (i + 1);
@using(Html.BeginForm("ResetMultiBookingForm", "Main", FormMethod.Post))
{
<button type="submit" id="mb-reset-btn" class="btn btn-primary float-right" onclick="showSpinner()">Abbrechen</button>
}
<div class="tab-pane show@(i == 0 ? " active" : string.Empty)" id="mb-doku_@i" role="tabpanel">
<textarea class="form-control doku-form-control" onchange="window.updateDokuText('mb', $(this).val(), @i)" autocomplete="on" id="mb-doku-textarea-@i" name="@textareaName">@noticeList[i]</textarea>
</div>
}
</div>
}
</div>
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
</div>
</div>
}
<div class="w-100 mt-2">
<button type="button" class="btn btn-primary float-right ml-1" id="mb-create-btn" onclick="window.submitMultiBookingForm()">Anlegen</button>
@using(Html.BeginForm("ResetMultiBookingForm", "Main", FormMethod.Post))
{
<button type="submit" id="mb-reset-btn" class="btn btn-primary float-right" onclick="showSpinner()">Abbrechen</button>
}
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
</div>
}

21
BeWoPlanerMobil/Views/Main/MultiBookingPartial.cshtml
View File

@@ -13,22 +13,9 @@
}
<script type="text/javascript">
window.addEventListener("load", function() {
@if(TempData[TempDataConstants.SupportConceptRelSelectedKey] is true)
{
<text>
window.updateCategory("@Model.BookingModePrefix", @Model.SelectedServiceCategoryOid);
window.updateServiceDescription("@Model.BookingModePrefix", @Model.SelectedServiceDescriptionOid);
window.updateEmployeeOids("@Model.BookingModePrefix", getMultiBookingEmployeeOids());
window.updateStartDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-date-input`).val());
window.updateStartTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-time-input`).val());
window.updateEndDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-date-input`).val());
window.updateEndTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-time-input`).val());
</text>
}
});
$(document).ready(function() {
$(document).ready(function () {
$("#mb-hours-minutes-dropdown-btn").on("click",
function() {
$("#mb-hours-minutes-dropdown-btn").data("text", $("#mb-hours-minutes-dropdown-btn").text().replaceAll(/\s/g, ""));
@@ -48,6 +35,8 @@
window.setInputFilter('mb-duration-input', 'mb-distance-input', 'mb-hours-minutes-dropdown-btn');
window.updateDurationUnit("mb", (buttonText === "Stunden" ? "h" : "m"));
$.get('@Url.Action("ToggleDurationUnit")', { isInHoursMode: buttonText === "Stunden" });
calcDuration("mb", true, false, false);
@@ -139,7 +128,7 @@
<div class="modal-dialog modal-dialog-scrollable" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title font-weight-bold">Gruppen und Hilfepläne für Gruppenbuchung</h5>
<h5 class="modal-title font-weight-bold">Gruppen und Hilfepläne für Mehrfachbuchung</h5>
<button type="button" class="close" data-dismiss="modal">
<span>&times;</span>
</button>

20
BeWoPlanerMobil/Views/Main/MultiBookingScCbRelList.cshtml
View File

@@ -6,14 +6,17 @@
{
<text>
<script type="text/javascript">
$("#second-logout-form").submit();
$("#second-logout-form").submit();
</script>
</text>
}
var isGroupTabPaneActive = TempData[TempDataConstants.IsGroupTabActiveKey] is true ? "active" : string.Empty;
var isSingleTabPaneActive = TempData[TempDataConstants.IsGroupTabActiveKey] is true ? string.Empty : "active";
}
<div class="tab-pane show active" role="tabpanel" id="mb-supportconcepts">
<ul class="list-group">
<div class="tab-pane show @isSingleTabPaneActive" role="tabpanel" id="mb-supportconcepts">
<ul class="list-group" id="mb-cb2sc-list">
@foreach(var cb2Sc in Model.SupportConceptListObjectsForGroupBooking)
{
<li class="list-group-item">
@@ -25,8 +28,8 @@
<div class="custom-control custom-checkbox custom-control-inline">
<input type="checkbox"
@{ if(checkedValue) { @Html.Raw("checked=\"checked\"") ; } }
class="custom-control-input mb-cb2sc-input" id="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" onchange="addScCbRelsToMultiBooking()" name="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" value="@cb2Sc.CostBearer2SupportConceptOid">
@{ if(checkedValue) { @Html.Raw("checked=\"checked\"") } }
class="custom-control-input mb-cb2sc-input" id="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" onchange="updateScCbRelOids('mb', false)" name="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" value="@cb2Sc.CostBearer2SupportConceptOid">
<label for="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" class="custom-control-label">
<span class="justify-content-between mb-1 text-dark text-left">
@cb2Sc.NameAndDateOfBirth
@@ -41,8 +44,8 @@
}
</ul>
</div>
<div class="tab-pane show" role="tabpanel" id="mb-groups">
<ul class="list-group">
<div class="tab-pane show @isGroupTabPaneActive" role="tabpanel" id="mb-groups">
<ul class="list-group" id="mb-g-list">
@foreach(var group in Model.GroupOfPeopleListItems)
{
<li class="list-group-item">
@@ -54,7 +57,8 @@
var attribute = shouldBeChecked ? "checked=\"checked\"" : string.Empty;
}
<div class="custom-control custom-checkbox custom-control-inline">
<input type="checkbox" @attribute class="custom-control-input" id="mb-group-checkbox-@group.Value" value="@group.Value" onchange="addScCbRelsToMultiBooking()" />
<input type="hidden" id="mb-i-@group.Value" value="@Model.GroupMembers(groupOid)" />
<input type="checkbox" @attribute class="custom-control-input" id="mb-group-checkbox-@group.Value" value="@group.Value" onchange="updateGroupOfPeople(this, 'mb')" />
<label for="mb-group-checkbox-@group.Value" class="custom-control-label">
@group.Text
</label>

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

@@ -6,12 +6,14 @@
{
<text>
<script type="text/javascript">
$("#second-logout-form").submit();
$("#second-logout-form").submit();
</script>
</text>
}
}
@* (Mehrfachbuchung) Hilfeplanauswahl-Button *@
<div class="form-row">
<div class="col-md">
@@ -25,7 +27,7 @@
<div class="form-group my-0">
@if(Model.GroupBookingSelectionObject.SelectedRelations.Any())
{
<div class="list-group mt-2" id="mb-selected-cb2sc-list">
<div class="list-group mt-2" id="selected-cb2sc-list">
@foreach(var selectedCb2ScRelation in Model.GroupBookingSelectionObject.SelectedRelations)
{
<div class="list-group-item bg-bewo-task-red" id="mb-relation-item-@selectedCb2ScRelation.Value">

220
BeWoPlanerMobil/Views/Main/RestoreServiceRecordInputsPartial.cshtml
View File

@@ -17,81 +17,189 @@
</text>
}
var keyMap = new Map(
[
[`${getLocalStorageKey()}-SbCb2ScRelOid`, "Hilfeplan"],
[`${getLocalStorageKey()}-SbEmployeeOids`, "Mitarbeiter"],
[`${getLocalStorageKey()}-SbCategory`, "Kategorie"],
[`${getLocalStorageKey()}-SbServiceDescription`, "Leistung"],
[`${getLocalStorageKey()}-SbStartDate`, "Start"],
[`${getLocalStorageKey()}-SbEndDate`, "Enddatum"],
[`${getLocalStorageKey()}-SbStartTime`, "Von"],
[`${getLocalStorageKey()}-SbEndTime`, "Bis"],
[`${getLocalStorageKey()}-SbDuration`, "Dauer"],
[`${getLocalStorageKey()}-SbDurationUnit`, "Einheit der Dauer"],
[`${getLocalStorageKey()}-SbDistance`, "Gefahrene Kilometer"],
[`${getLocalStorageKey()}-SbMarker`, "Marker"],
[`${getLocalStorageKey()}-SbBetrag`, "Betrag"],
[`${getLocalStorageKey()}-SbDoku1`, "Doku 1"],
[`${getLocalStorageKey()}-SbDoku2`, "Doku 2"],
[`${getLocalStorageKey()}-SbDoku3`, "Doku 3"],
[`${getLocalStorageKey()}-SbDoku4`, "Doku 4"],
[`${getLocalStorageKey()}-SbDoku5`, "Doku 5"],
[`${getLocalStorageKey()}-SbDoku6`, "Doku 6"],
[`${getLocalStorageKey()}-SbGoals2Ratings`, "Ziele & Maßnahmen"],
[`${getLocalStorageKey()}-SbCurrentPage`, "Ausgewählte Seite"],
[`${getLocalStorageKey()}-GbCb2ScRelOids`, "Hilfepläne"],
[`${getLocalStorageKey()}-GbEmployeeOids`, "Mitarbeiter"],
[`${getLocalStorageKey()}-GbCategory`, "Kategorie"],
[`${getLocalStorageKey()}-GbServiceDescription`, "Leistung"],
[`${getLocalStorageKey()}-GbStartDate`, "Start"],
[`${getLocalStorageKey()}-GbEndDate`, "Enddatum"],
[`${getLocalStorageKey()}-GbStartTime`, "Von"],
[`${getLocalStorageKey()}-GbEndTime`, "Bis"],
[`${getLocalStorageKey()}-GbDuration`, "Dauer"],
[`${getLocalStorageKey()}-GbDurationUnit`, "Einheit der Dauer"],
[`${getLocalStorageKey()}-GbDistance`, "Gefahrene Kilometer"],
[`${getLocalStorageKey()}-GbMarker`, "Marker"],
[`${getLocalStorageKey()}-GbBetrag`, "Betrag"],
[`${getLocalStorageKey()}-GbDoku1`, "Doku 1"],
[`${getLocalStorageKey()}-GbDoku2`, "Doku 2"],
[`${getLocalStorageKey()}-GbDoku3`, "Doku 3"],
[`${getLocalStorageKey()}-GbDoku4`, "Doku 4"],
[`${getLocalStorageKey()}-GbDoku5`, "Doku 5"],
[`${getLocalStorageKey()}-GbDoku6`, "Doku 6"],
[`${getLocalStorageKey()}-GbGoals2Ratings`, "Ziele & Maßnahmen"],
[`${getLocalStorageKey()}-MbCb2ScRelOids`, "Hilfepläne"],
[`${getLocalStorageKey()}-MbEmployeeOids`, "Mitarbeiter"],
[`${getLocalStorageKey()}-MbCategory`, "Kategorie"],
[`${getLocalStorageKey()}-MbServiceDescription`, "Leistung"],
[`${getLocalStorageKey()}-MbStartDate`, "Start"],
[`${getLocalStorageKey()}-MbEndDate`, "Enddatum"],
[`${getLocalStorageKey()}-MbStartTime`, "Von"],
[`${getLocalStorageKey()}-MbEndTime`, "Bis"],
[`${getLocalStorageKey()}-MbDuration`, "Dauer"],
[`${getLocalStorageKey()}-MbDurationUnit`, "Einheit der Dauer"],
[`${getLocalStorageKey()}-MbDistance`, "Gefahrene Kilometer"],
[`${getLocalStorageKey()}-MbMarker`, "Marker"],
[`${getLocalStorageKey()}-MbBetrag`, "Betrag"],
[`${getLocalStorageKey()}-MbDoku1`, "Doku 1"],
[`${getLocalStorageKey()}-MbDoku2`, "Doku 2"],
[`${getLocalStorageKey()}-MbDoku3`, "Doku 3"],
[`${getLocalStorageKey()}-MbDoku4`, "Doku 4"],
[`${getLocalStorageKey()}-MbDoku5`, "Doku 5"],
[`${getLocalStorageKey()}-MbDoku6`, "Doku 6"],
[`${getLocalStorageKey()}-MbGoals2Ratings`, "Ziele & Maßnahmen"]
]
);
var timeRegex = /^(?:[01]\d|2[0-3]):[0-5]\d$/;
function saveLocally(key, value) {
if(value === undefined || value === null || value.length === 0) {
logWarning(`Der Wert "${value}" bei Schlüssel "${key}" ist ungültig!`);
return;
}
localStorage.setItem(key, value);
}
function getLocalStorageKey() {
return "@MobileSessionFacade.LocalStorageKey";
}
function updateGoals2Ratings(prefix, map) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}`, [...map]);
if(map === null || map === undefined || map.length === 0) {
localStorage.removeItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Goals2Ratings`);
}
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Goals2Ratings`, [...map]);
}
function updateCbScRelOids(prefix, csv) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Cb2ScRelOid${(prefix === "sb" ? "" : "s")}`, csv);
if(csv === null || csv === undefined || csv.toString().length === 0) {
localStorage.removeItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Cb2ScRelOid${(prefix === "sb" ? "" : "s")}`);
return;
}
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Cb2ScRelOid${(prefix === "sb" ? "" : "s")}`, csv);
}
function updateEmployeeOids(prefix, csv) {
logInfo3(`Speichere die MitarbeiterOids: "${csv}"`);
if(csv === null || csv === undefined || csv.toString().length === 0) {
localStorage.removeItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}EmployeeOids`);
return;
}
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}EmployeeOids`, csv);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}EmployeeOids`, csv);
}
function updateCategory(prefix, categoryOid) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Category`, categoryOid);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Category`, categoryOid);
}
function updateServiceDescription(prefix, serviceDescriptionOid) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}ServiceDescription`, serviceDescriptionOid);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}ServiceDescription`, serviceDescriptionOid);
}
function updateStartDate(prefix, startDate) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}StartDate`, startDate);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}StartDate`, startDate);
}
function updateStartTime(prefix, startTime) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}StartTime`, startTime);
if(false === timeRegex.test(startTime)) {
return;
}
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}StartTime`, startTime);
}
function updateEndDate(prefix, endDate) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}EndDate`, endDate);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}EndDate`, endDate);
}
function updateEndTime(prefix, endTime) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}EndTime`, endTime);
if(false === timeRegex.test(endTime)) {
return;
}
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}EndTime`, endTime);
}
function updateDuration(prefix, duration) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Duration`, duration);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Duration`, duration);
}
function updateDistance(prefix, distance) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Distance`, distance);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Distance`, distance);
}
function updateMarker(prefix, marker) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Marker`, marker);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Marker`, marker);
}
function updateBetrag(prefix, betrag) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Betrag`, betrag);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Betrag`, betrag);
}
function updateDokuText(prefix, text, nr) {
localStorage.setItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Doku${(nr + 1)}`, text);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Doku${(nr + 1)}`, text);
}
function removeGoals2Ratings(prefix) {
localStorage.removeItem(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Goals2Ratings`);
}
function updateDurationUnit(prefix, durationUnit) {
logInfo(`Speichere die ${prefix}-Dauereinheit ${durationUnit} lokal.`);
saveLocally(`@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}DurationUnit`, durationUnit);
}
function updateCurrentPage(currentPage) {
saveLocally(`@MobileSessionFacade.LocalStorageKey-SbCurrentPage`, currentPage);
}
function clearLocalBeWoStorage() {
for(let i = 0; i < localStorage.length; i++) {
const key = localStorage.key(i);
if(!key.startsWith(`@MobileSessionFacade.LocalStorageKey`)) {
continue;
if(key.startsWith(`@MobileSessionFacade.LocalStorageKey`)) {
localStorage.removeItem(key);
}
localStorage.removeItem(key);
}
}
@@ -99,16 +207,16 @@
const localStorageKey = `@MobileSessionFacade.LocalStorageKey-${firstCharToUpperCase(prefix)}Goals2Ratings`;
const stored = localStorage.getItem(localStorageKey);
console.log(stored);
const map = stored ? new Map(JSON.parse(stored)) : new Map();
map.set(goalOid, ratingTypeOid);
localStorage.setItem(localStorageKey, JSON.stringify([...map]));
saveLocally(localStorageKey, JSON.stringify([...map]));
}
function printLocalStorage() {
$("#dev-popup-body").html("");
$("#local-storage-popup-body").html("");
let output = "";
let singleBookingOutput = "<h2>Einzelbuchung</h2><table class='table table-sm table-striped'>" +
@@ -116,6 +224,8 @@
"<tr>" +
"<th scope='col'>Id</th>" +
"<th scope='col'>Wert</th>" +
"<th scope='col'>Feld</th>" +
"<th scope='col'></th>" +
"</tr>" +
"</thead>";
@@ -123,7 +233,9 @@
"<thead>" +
"<tr>" +
"<th scope='col'>Id</th>" +
"<th scope='col'>Wert</th>" +
"<th scope='col'>Wert</th>" +
"<th scope='col'>Feld</th>" +
"<th scope='col'></th>" +
"</tr>" +
"</thead>";
@@ -132,6 +244,8 @@
"<tr>" +
"<th scope='col'>Id</th>" +
"<th scope='col'>Wert</th>" +
"<th scope='col'>Feld</th>" +
"<th scope='col'></th>" +
"</tr>" +
"</thead>";
@@ -145,11 +259,11 @@
const value = localStorage.getItem(key);
if(key.startsWith(`@MobileSessionFacade.LocalStorageKey-Sb`)) {
singleBookingOutput += `<tr><td>${key}</td><td>${value}</td></tr>`;
singleBookingOutput += `<tr><td>${key}</td><td>${keyMap.get(key)}</td><td>${value}</td><td><button type="button" class="btn btn-sm btn-danger" onclick="localStorage.removeItem('${key}');printLocalStorage();"><i class="fas fa-trash"></i></button></td></tr>`;
} else if(key.startsWith(`@MobileSessionFacade.LocalStorageKey-Gb`)) {
groupBookingOutput += `<tr><td>${key}</td><td>${value}</td></tr>`;
groupBookingOutput += `<tr><td>${key}</td><td>${keyMap.get(key)}</td><td>${value}</td><td><button type="button" class="btn btn-sm btn-danger" onclick="localStorage.removeItem('${key}');printLocalStorage();"><i class="fas fa-trash"></i></button></td></tr>`;
} else if(key.startsWith(`@MobileSessionFacade.LocalStorageKey-Mb`)) {
multiBookingOutput += `<tr><td>${key}</td><td>${value}</td></tr>`;
multiBookingOutput += `<tr><td>${key}</td><td>${keyMap.get(key)}</td><td>${value}</td><td><button type="button" class="btn btn-sm btn-danger" onclick="localStorage.removeItem('${key}');printLocalStorage();"><i class="fas fa-trash"></i></button></td></tr>`;
}
}
@@ -158,12 +272,13 @@
multiBookingOutput += "</table>";
output += singleBookingOutput + "<hr>" + groupBookingOutput + "<hr>" + multiBookingOutput;
$("#dev-local-storage-body").html(`<div class='btn-group my-3' role='group'><button type='button' class='btn btn-outline-danger' onclick=''><span class='fas fa-trash-alt'></span></button></div><hr>${
output}`);
$("#dev-local-storage").modal("show");
$("#local-storage-popup-body").html(`<div class='btn-group my-1' role='group'><button type='button' class='btn btn-outline-danger' onclick='clearLocalBeWoStorage();printLocalStorage();'><span class='fas fa-trash-alt'></span>Leeren</button></div><hr>${output}`);
$("#local-storage-popup").modal("show");
}
function restoreAllFields() {
showSpinner();
const bookingMode = @((int) Model.CurrentBookingMode);
const prefix = bookingMode === 0 ? "Sb" : bookingMode === 1 ? "Gb" : "Mb";
@@ -174,37 +289,44 @@
$("#srr-mb-cb2sc-oids").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-MbCb2ScRelOids`));
$("#srr-mb-emp-oids").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-MbEmployeeOids`));
$("#srr-start-date-input").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}StartDate`));
$("#srr-start-time-input").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}StartTime`));
$("#srr-end-date-input").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}EndDate`));
$("#srr-end-time-input").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}EndTime`));
//$("#srr-marker-cb").val();
//$("#srr-betrag").val();
$("#srr-marker-cb").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Marker`));
$("#srr-betrag").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Betrag`));
//$("#srr-duration-input").val();
$("#srr-duration-input").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Duration`));
$("#srr-duration-unit").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}DurationUnit`));
//$("#srr-distance-input").val();
$("#srr-distance-input").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Distance`));
//$("#srr-doku-textarea-1").val(beWoStorage.getItemValueById(`${prefix}doku-textarea-0`));
//$("#srr-doku-textarea-2").val(beWoStorage.getItemValueById(`${prefix}doku-textarea-1`));
//$("#srr-doku-textarea-3").val(beWoStorage.getItemValueById(`${prefix}doku-textarea-2`));
//$("#srr-doku-textarea-4").val(beWoStorage.getItemValueById(`${prefix}doku-textarea-3`));
//$("#srr-doku-textarea-5").val(beWoStorage.getItemValueById(`${prefix}doku-textarea-4`));
//$("#srr-doku-textarea-6").val(beWoStorage.getItemValueById(`${prefix}doku-textarea`));
$("#srr-doku-textarea-1").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Doku1`));
$("#srr-doku-textarea-2").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Doku2`));
$("#srr-doku-textarea-3").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Doku3`));
$("#srr-doku-textarea-4").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Doku4`));
$("#srr-doku-textarea-5").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Doku5`));
$("#srr-doku-textarea-6").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}Doku6`));
$("#srr-leistung-select").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-${prefix}ServiceDescription`));
$("#srr-booking-mode").val(bookingMode);
//$("#restore-service-record-form").submit();
$("#srr-sb-cb2sc-oid").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-SbCb2ScRelOid`));
$("#srr-current-page").val(localStorage.getItem(`@MobileSessionFacade.LocalStorageKey-SbCurrentPage`));
$("#restore-service-record-form").submit();
}
</script>
@using(Html.BeginForm("RestoreServiceRecordForm", "Main", FormMethod.Post, new { id = "restore-service-record-form" }))
{
<input type="hidden" id="srr-leistung-select" name="@FormCollectionConstants.ServiceDescriptionKey" />
<input type="hidden" id="srr-current-page" name="@FormCollectionConstants.CurrentPageKey" />
<input type="hidden" id="srr-leistung-select" name="@FormCollectionConstants.ServiceDescriptionKey" />
<input type="hidden" id="srr-start-date-input" name="@FormCollectionConstants.DateKey" />
<input type="hidden" id="srr-end-time-input" name="@FormCollectionConstants.EndKey" />
<input type="hidden" id="srr-start-time-input" name="@FormCollectionConstants.StartKey" />
@@ -215,6 +337,7 @@
<input type="hidden" id="srr-betrag" name="@FormCollectionConstants.BetragKey" />
<input type="hidden" id="srr-duration-input" name="@FormCollectionConstants.DurationKey" />
<input type="hidden" id="srr-duration-unit" name="@FormCollectionConstants.DurationUnitKey" />
<input type="hidden" id="srr-distance-input" name="@FormCollectionConstants.DistanceKey" />
@@ -225,6 +348,7 @@
<input type="hidden" id="srr-doku-textarea-5" name="@FormCollectionConstants.Dokumentation5Key" />
<input type="hidden" id="srr-doku-textarea-6" name="@FormCollectionConstants.Dokumentation6Key" />
<input type="hidden" id="srr-sb-cb2sc-oid" name="@FormCollectionConstants.CostBearer2SupportConceptOidKey" />
<input type="hidden" id="srr-sb-emp-oid" name="@FormCollectionConstants.SingleBookingEmployeeOidKey" />
<input type="hidden" id="srr-gb-cb2sc-oids" name="@FormCollectionConstants.GroupBookingSelectedCb2ScOidsKey" />
@@ -245,7 +369,7 @@
@if(Html.IsInDebugMode())
{
<div class="modal" tabindex="-1" role="dialog" id="local-storage-popup">
<div class="modal-dialog modal-xl" role="document">
<div class="modal-dialog modal-xl modal-dialog-scrollable" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title font-weight-bold">Lokaler Speicher</h5>
@@ -253,9 +377,9 @@
<span>&times;</span>
</button>
</div>
<div class="modal-body" id="local-storage-popup-body">
</div>
<div class="modal-body" id="local-storage-popup-body">
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="button" data-dismiss="modal">Schlie&szlig;en</button>
</div>

8
BeWoPlanerMobil/Views/Main/ServiceRecordListPartial.cshtml
View File

@@ -32,6 +32,8 @@
}
function goToFirstServiceRecordListPage() {
window.updateCurrentPage(1);
showSpinner();
$("#service-record-list-container").load("@Url.Action("GoToFirstPage")", function () {
hideSpinner();
@@ -39,6 +41,8 @@
}
function goToLastServiceRecordListPage() {
window.updateCurrentPage($("#page-count").val());
showSpinner();
$("#service-record-list-container").load("@Url.Action("GoToLastPage")", function () {
hideSpinner();
@@ -46,6 +50,8 @@
}
function goToServiceRecordListPage(selectedPage) {
window.updateCurrentPage(selectedPage);
showSpinner();
$("#service-record-list-container").load("@Url.Action("LoadServiceRecordPage")", { selectedPage: selectedPage }, function() {
hideSpinner();
@@ -93,7 +99,7 @@
{
lastPage1 = Model.ServiceRecordPageCount;
}
<input type="hidden" id="page-count" value="@Model.ServiceRecordPageCount" />
<nav>
<ul class="pagination justify-content-center">
@{

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

@@ -22,14 +22,12 @@
<text>
window.updateCategory("@Model.BookingModePrefix", @Model.SelectedServiceCategoryOid);
window.updateServiceDescription("@Model.BookingModePrefix", @Model.SelectedServiceDescriptionOid);
// ToDo: 08.09.2025: $("#sb-employee-input") ist bei der HP-Auswahl nicht gesetzt!
const employeeOid = $("#sb-employee-input").val();
window.updateEmployeeOids("@Model.BookingModePrefix", $("#sb-employee-input").val());
window.updateEmployeeOids("@Model.BookingModePrefix", $("#sb-employee-input").val());
window.updateStartDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-date-input`).val());
window.updateStartTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-start-time-input`).val());
window.updateEndDate("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-date-input`).val());
window.updateEndTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-time-input`).val());
window.updateEndTime("@Model.BookingModePrefix", $(`#@Model.BookingModePrefix-end-time-input`).val());
window.updateDurationUnit("sb", ($("#sb-hours-minutes-dropdown-btn").text().trim() === "Stunden" ? "h" : "m"));
</text>
}
});
@@ -54,6 +52,8 @@
window.setInputFilter();
window.updateDurationUnit("sb", (buttonText === "Stunden" ? "h" : "m"));
$.get('@Url.Action("ToggleDurationUnit")', { isInHoursMode: buttonText === "Stunden" });
calcDuration("sb", true, false, false);
@@ -172,7 +172,7 @@
<div class="row">
@* ----- Einzelbuchungsformular ----- *@
<div class="col col-12 col-md-5 booking-form-container">
<div class="col col-12 col-md-5 booking-form-container">
@if (Model != null)
{
using (Html.BeginForm("SelectSupportConcept", "Main", FormMethod.Post, new { Id = "selectSupportConceptForm", onreset = "resetSingleBookingForm()" }))
@@ -288,9 +288,9 @@
@{
var sbEmployeeInputValue = string.Empty;
if(Model.SelectedEmployeeOid.HasValue)
if(Model.SelectedEmployee?.EmployeeOid is not null)
{
sbEmployeeInputValue = $"value=\"{Model.SelectedEmployeeOid.Value}\"";
sbEmployeeInputValue = $"value=\"{Model.SelectedEmployee.EmployeeOid}\"";
}
}
@@ -329,7 +329,7 @@
<div class="form-row">
<div class="col-md mt-1">
<div class=" custom-control custom-checkbox custom-control-inline my-0">
<input type="checkbox" class="custom-control-input" onchange="window.updateMarker('sb', $(this).prop('checked'));" name="@FormCollectionConstants.MarkerKey" id="sb-marker-cb" @markerCheckedValue />
<input type="checkbox" class="custom-control-input" onchange="window.updateMarker('sb', $(this).val());" name="@FormCollectionConstants.MarkerKey" id="sb-marker-cb" @markerCheckedValue />
<label class="custom-control-label" for="sb-marker-cb">Marker</label>
</div>
</div>
@@ -383,6 +383,9 @@
}
var columnWidth = Model.IsEndDateVisible ? "col-md-6" : "col";
var x = Model.StartTimeToEdit;
}
<div class="form-row">
@@ -498,8 +501,8 @@
@if(Model.NumberOfDokuTypes == 0)
{
<div class="form-group my-0">
<label for="sb-doku-textarea">Dokumentation</label>
<textarea class="form-control" autocomplete="on" style="overflow: scroll;" onchange="window.updateDokuText('sb', $(this).text(), 6)" name="Dokumentation6" id="sb-doku-textarea">@Model.NoticeToEdit</textarea>
<label for="sb-doku-textarea-6">Dokumentation</label>
<textarea class="form-control" autocomplete="on" style="overflow: scroll;" onchange="window.updateDokuText('sb', $(this).val(), 5)" name="Dokumentation6" id="sb-doku-textarea-5">@Model.NoticeToEdit</textarea>
</div>
}
else
@@ -555,7 +558,6 @@
}
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
</div>
}
</div>

10
BeWoPlanerMobil/Views/Main/TextModulePartial.cshtml
View File

@@ -2,7 +2,7 @@
@model BeWoPlanerMobil.Models.MainModel
@{
if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
if (TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
{
<text>
<script type="text/javascript">
@@ -84,14 +84,14 @@
@helper BuildTextModuleTree(TextbausteinDisplayItem textModule)
{
if(textModule.IsParent)
if (textModule.IsParent)
{
<a href="#" class="list-group-item list-group-item-action mx-0 px-1" onclick="textCategoryOnClick('@textModule.Oid')">
<span id="@textModule.Oid-icon-span" class="fas fa-angle-down mr-1"></span>
@textModule.Name
</a>
<div id="@textModule.Oid-children-container" style="display: none;" class="list-group list-group-item mx-0 px-1">
@foreach(var childTextModule in textModule.Children)
@foreach (var childTextModule in textModule.Children)
{
@BuildTextModuleTree(childTextModule)
}
@@ -105,14 +105,14 @@
}
}
@if(Model?.TextModules?.Any() ?? false)
@if (Model?.TextModules?.Any() ?? false)
{
<script type="text/javascript">
$("#textmodule-container").show();
</script>
<div class="list-group">
@foreach(var textModule in Model.TextModules)
@foreach (var textModule in Model.TextModules)
{
@BuildTextModuleTree(textModule)
}

17
BeWoPlanerMobil/Views/Main/Zeiterfassungspartial.cshtml Normal file
View File

@@ -0,0 +1,17 @@
@using BeWoPlanerMobil.Models;
@using BS.Shared
@model MainModel
@switch(Model.CurrentBookingMode)
{
case BookingMode.GroupBookingMode:
Html.RenderPartial("GroupBookingPartial", Model);
break;
case BookingMode.MultiBookingMode:
Html.RenderPartial("MultiBookingPartial", Model);
break;
default:
Html.RenderPartial("SingleBookingPartial", Model);
break;
}

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

@@ -48,10 +48,12 @@
<link type="text/css" rel="stylesheet" href="@Url.Content("~/Content/style.css")" />
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/dateUtils.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/countdown.js?v=1.0")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/moment/moment.min.js")"></script>
<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.5")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/mobileUtils.js?v=1.6")"></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>
@@ -67,7 +69,7 @@
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/trimCanvas.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/resources-list-utils.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/list-utils.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js?v=1.6")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js?v=1.7")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/js-helper.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/logging.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/MoKPasswordSecurity.js?v=1.4")"></script>
@@ -180,7 +182,28 @@
}
}
$(document).ready(function() {
const countdown = new Countdown(parseInt("@AbstractBaseController.TimeoutLimit", 10) * 60,
(remainingSeconds) => {
const remainingMilliseconds = remainingSeconds * 1000;
const minutes = Math.floor((remainingMilliseconds % (1000 * 60 * 60)) / (1000 * 60));
const seconds = Math.floor((remainingMilliseconds % (1000 * 60)) / 1000);
var m = minutes.toString().padStart(2, "0");
var s = seconds.toString().padStart(2, "0");
const timePart = minutes <= 5 ? ` class="text-danger"` : "";
$("#countdown").html(`<span${timePart}>Abmeldung in ${m}:${s}<span class="fas fa-unlock-alt pl-1"></span></span>`);
},
() => {
$("#countdown").html("00:00");
$("#logout-form").submit();
}
);
$(document).ready(function() {
countdown?.start();
$.each($("canvas"), function(index, canvasElement) {
updateCanvasSize($(canvasElement));
});
@@ -198,47 +221,6 @@
this.style.height = (this.scrollHeight) + "px";
});
const timeoutInMilliseconds = parseInt("@AbstractBaseController.TimeoutLimit", 10) * 60 * 1000;
const timeOfLogin = "@AbstractModel.TimeOfLastAction";
if(timeOfLogin.length > 0) {
var countDownDate = new Date().getTime() + timeoutInMilliseconds;
var interval = setInterval(function() {
const now = new Date().getTime();
const distance = countDownDate - now;
if (distance <= 0) {
clearInterval(interval);
$("#countdown").html("00:00");
$("#logout-form").submit();
return;
}
const minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
const seconds = Math.floor((distance % (1000 * 60)) / 1000);
var m = minutes.toString();
var s = seconds.toString();
if(minutes < 10) {
m = `0${m}`;
}
if(seconds < 10) {
s = `0${s}`;
}
const timePart = minutes <= 5 ? ` class="text-danger"` : "";
$("#countdown").html(`<span${timePart}>Abmeldung in ${m}:${s}<span class="fas fa-unlock-alt pl-1"></span></span>`);
}, 1000);
}
calcPrependWidth();
@{
@@ -358,8 +340,7 @@
}
</script>
</head>
<body>
<body onclick="countdown?.reset();">
@if(MobileSessionFacade.IsUserLoggedIn())
{
using(Html.BeginForm("LogOutAfterSessionTimeout", "Main", FormMethod.Post, new { id = "logout-form", css = "display:none;" }))
@@ -378,16 +359,17 @@
<span class="logoff-countdown m-0 p-0" id="countdown" onclick="countdownClick()">&nbsp;</span>
</p>
</a>
<span class="logoff-countdown m-0 p-0" >Version 3.27</span>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto">
@if(Html.IsInDebugMode())
@if (Html.IsInDebugMode())
{
using(Html.BeginForm("RedirectToDevExpressScheduler", "Main", FormMethod.Post))
using (Html.BeginForm("RedirectToDevExpressScheduler", "Main", FormMethod.Post))
{
<li class="nav-item">
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -398,33 +380,26 @@
}
<li class="nav-item">
<button class="btn btn-link text-light no-underline" type="button" onclick="printLocalStorage()">
<i class="fas fa-eye text-bewo-dev"></i>
Speicher auslesen
</button>
<button class="btn btn-link text-light no-underline" type="button" onclick="printLocalStorage()">
<i class="fab fa-firefox-browser text-bewo-dev"></i>
Speicher auslesen
</button>
</li>
<li class="nav-item">
<button class="btn btn-link text-light no-underline" type="button" onclick="clearLocalBeWoStorage(); logInfo2(`Der lokale Speicher wurde geleert`);">
<i class="fas fa-trash text-danger"></i>
Speicher leeren
</button>
</li>
using(Html.BeginForm("RedirectToDevTools", "Main", FormMethod.Post))
{
<li class="nav-item">
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
<i class="fas fa-bug text-success"></i>
using (Html.BeginForm("RedirectToDevTools", "Main", FormMethod.Post))
{
<li class="nav-item">
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
<i class="fas fa-bug text-success"></i>
DevTools
</button>
</li>
}
</button>
</li>
}
}
@if(Model.IsAllowedToSeeCustomers)
@if (Model.IsAllowedToSeeCustomers)
{
using(Html.BeginForm("RedirectToCustomer", "Main", FormMethod.Post))
using (Html.BeginForm("RedirectToCustomer", "Main", FormMethod.Post))
{
<li class="nav-item">
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -435,7 +410,7 @@
}
}
@using(Html.BeginForm("RedirectToMain", "Main", FormMethod.Post))
@using (Html.BeginForm("RedirectToMain", "Main", FormMethod.Post))
{
<li class="nav-item">
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -445,9 +420,9 @@
</li>
}
@if(Model.IsAllowedToSeeScheduler)
@if (Model.IsAllowedToSeeScheduler)
{
using(Html.BeginForm("RedirectToScheduler", "Main", FormMethod.Post))
using (Html.BeginForm("RedirectToScheduler", "Main", FormMethod.Post))
{
<li class="nav-item">
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -459,9 +434,9 @@
}
@if(Model.HasRightToViewQuittierungsbelege)
@if (Model.HasRightToViewQuittierungsbelege)
{
using(Html.BeginForm("RedirectToReportView", "Main", FormMethod.Post))
using (Html.BeginForm("RedirectToReportView", "Main", FormMethod.Post))
{
<li class="nav-item">
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -474,9 +449,9 @@
}
}
@if(Model.HasRightToViewReports && Model.HasRightToViewMitarbeiterstundenkonto)
@if (Model.HasRightToViewReports && Model.HasRightToViewMitarbeiterstundenkonto)
{
using(Html.BeginForm("RedirectToReportViewer", "Main", FormMethod.Post))
using (Html.BeginForm("RedirectToReportViewer", "Main", FormMethod.Post))
{
<li class="nav-item">
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
@@ -502,7 +477,7 @@
</li>
<li class="nav-item">
@using(Html.BeginForm("Logout", "Main", FormMethod.Post, new { id = "normal-logout-form" }))
@using (Html.BeginForm("Logout", "Main", FormMethod.Post, new { id = "normal-logout-form" }))
{
<button class="btn btn-link text-light no-underline" onclick="showSpinner()">
<i class="fas fa-sign-out-alt text-primary"></i>

2
Dakota/Dakota.csproj
View File

@@ -22,6 +22,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>CS0168</NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

29
Data/Access/SearchDAO.cs
View File

@@ -79,6 +79,26 @@ namespace BeWo.Data.Access
return x.Count > 0 ? DAOFactory.GenericDAO.GetByID<Wohnheim>(x.First()) : null;
}
public virtual IList<WohneinheitBelegung> FindWohneinheitBelegungForCustomer(long customerOid, DateTime datum)
{
var criteria = CreateCriteriaIsActive<WohneinheitBelegung>()
.Add(Restrictions.Eq(WohneinheitBelegung.PropertyName_Customer, customerOid))
.Add(
Restrictions.Or(
Restrictions.And(
Restrictions.Le(WohneinheitBelegung.PropertyName_StartDate, datum.Date),
Restrictions.Ge(WohneinheitBelegung.PropertyName_EndDate, datum.Date)
),
Restrictions.And(
Restrictions.Le(WohneinheitBelegung.PropertyName_StartDate, datum.Date),
Restrictions.IsNull(WohneinheitBelegung.PropertyName_EndDate)
)
)
);
return criteria.List<WohneinheitBelegung>();
}
public virtual IEnumerable<Customer> FindCustomer(string pFirstName, string pLastName, string pReferenceNumber)
{
return CreateCriteria<Customer>()
@@ -6357,7 +6377,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
SignatureType = bargeldtransaktion is null ? SignatureTable.SingleSignature : SignatureTable.BargeldkasseneinzahlungsSignature,
TimeSpanStart = signatureTimeSpanStart,
TimeSpanEnd = signatureTimeSpanEnd,
SignatureEventType = signatureEventType
SignatureEventType = signatureEventType,
DataBild = signature.DataBild
};
if(serviceRecord?.Oid is object)
@@ -6433,7 +6454,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
SignatureInsTs = sig.InsTs,
SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature,
TimeSpanStart = transaktion.Zahlungsdatum,
TimeSpanEnd = transaktion.Zahlungsdatum
TimeSpanEnd = transaktion.Zahlungsdatum,
DataBild = sig.DataBild
});
});
@@ -6465,7 +6487,8 @@ WHERE sc.Billable = 1 and sr.StartDate >= '{0:yyyy-MM-dd}' and sr.StartDate < '{
SignatureOid = signature.Oid,
TimeSpanStart = transaktion.Zahlungsdatum,
TimeSpanEnd = transaktion.Zahlungsdatum,
SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature
SignatureType = SignatureTable.BargeldkasseneinzahlungsSignature,
DataBild = signature.DataBild
};
}

2
Data/Data.csproj
View File

@@ -47,6 +47,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>CS0659, CS0162, CS0168, CS0169</NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -57,6 +58,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
<DebugSymbols>true</DebugSymbols>

2
Data/Entities/CustomerVermittlungArbeit.cs
View File

@@ -13,7 +13,7 @@ namespace BeWo.Data.Entities
{
_Tid = TableID.CustomerGemeinnutzigeArbeit;
}
public virtual VgaTypeEnum VgaType { get; set; }
public virtual Customer Customer { get; set; }
public virtual Organisation Auftraggeber { get; set; }
public virtual Person AuftraggeberAnsprechpartner { get; set; }

3
Data/Entities/SignatureHistory.cs
View File

@@ -17,7 +17,6 @@ namespace BeWo.Data.Entities
private DateTime? _SignatureInsTs;
private SignatureEventType _SignatureEventType;
public SignatureHistory()
{
_Tid = TableID.SignatureHistory;
@@ -142,5 +141,7 @@ namespace BeWo.Data.Entities
}
}
}
public virtual string DataBild { get; set; }
}
}

1
Data/Mappings/CustomerVermittlungArbeit.hbm.xml
View File

@@ -13,6 +13,7 @@
<property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
<property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" />
<property name="Notice"/>
<property name="VgaType" type="BS.Shared.VgaTypeEnum, BS.Shared" />
<many-to-one name="Customer" column="CustomerOid" class="BeWo.Data.Entities.Customer, BeWo.Data" cascade="none"/>
<property name="AktenzeichenGericht"/>
<property name="EigenesAktenzeichen"/>

3
Data/Mappings/SignatureHistory.hbm.xml
View File

@@ -22,7 +22,8 @@
<property column="SignatureTimeSpanEnd" type="DateTime" name="TimeSpanEnd" />
<property column="SignatureInsTs" type="DateTime" name="SignatureInsTs" />
<property column="SignatureEventType" type="BS.Shared.SignatureEventType, BS.Shared" name="SignatureEventType"/>
<property name="DataBild" type="String" />
<bag name="ServiceRecordOidList" table="servicerecord2signaturehistory" generic="true" cascade="none" batch-size="250">
<key column="SignatureHistoryOid" />
<element column="ServiceRecordOid" type="Int64" />

1
Host/Host.csproj
View File

@@ -54,6 +54,7 @@
<PublishDatabases>false</PublishDatabases>
<FilesToIncludeForPublish>OnlyFilesToRunTheApp</FilesToIncludeForPublish>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />

2
Host/Host.csproj.user
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>

6
Model/Changes_2025-09-04_VgaType_SignatureHistory.txt Normal file
View File

@@ -0,0 +1,6 @@
ALTER TABLE `CustomerVermittlungArbeit`
ADD COLUMN `VgaType` int DEFAULT NULL;
ALTER TABLE `SignatureHistory`
ADD COLUMN `DataBild` longtext DEFAULT NULL;

6
Model/Changes_alle_fuer_neue_db.txt
View File

@@ -1667,4 +1667,8 @@ ALTER TABLE `Employee`
ADD COLUMN `GradDerBehinderung` VARCHAR(20) DEFAULT NULL;
ALTER TABLE `Employee`
ADD COLUMN `AusweisBemerkung` VARCHAR(512) DEFAULT NULL;
ADD COLUMN `AusweisBemerkung` VARCHAR(512) DEFAULT NULL;
ALTER TABLE `CustomerVermittlungArbeit`
ADD COLUMN `VgaType` int DEFAULT NULL;

4
Report/Report.csproj
View File

@@ -44,7 +44,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>CS0659, CS0162, CS0168, CS0649, CS0219</NoWarn>
@@ -56,7 +56,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>

2
ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj
View File

@@ -22,7 +22,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>

2
ReportImp/IntegraHeinsbergReports/IntegraHeinsbergReports.csproj
View File

@@ -41,7 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>

2
ReportImp/KoelnRingReports/KoelnRingReports.csproj
View File

@@ -41,7 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>

45
ReportImp/LebenshilfeBadKreuznach/Quittierungsbeleg.cs
View File

@@ -77,7 +77,50 @@ namespace LebenshilfeBadKreuznach
lblGruppe.Text = String.Format("{0:0.00}", gruppe);
ErstelleAbwesenheitenTabelle(pRO);
//Einmal getätigte Unterschriften sollen nicht verfallen, auch wenn es anschließend Ergänzungen gab
var serviceRecordOids = pRO.Services.Select(service => service.ServiceRecordOid).ToList();
if (serviceRecordOids.Count > 0 && (pRO.EmployeeSignature == null || pRO.CustomerSignature == null))
{
var sql = @"
select distinct crs.SignatureImage, crs.SignatureType, crs.InsTs from
confirmationreceiptsignature crs
inner join confirmationreceiptsignature2servicerecord c2s on c2s.ConfirmationReceiptSignatureOid = crs.Oid
where c2s.ServiceRecordOid in (:LISTE)
order by crs.oid desc
";
sql = sql.Replace(":LISTE", String.Join(",", serviceRecordOids));
var sqlResult = DAOFactory.SearchDAO.GetSqlResult(sql);
foreach (object[] item in sqlResult)
{
var sig = item[0] as String;
var t = (sbyte)item[1];
var dt = (DateTime)item[2];
if (t == 0)
{
if (pRO.EmployeeSignature == null)
{
pRO.EmployeeSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.EmployeeSignatureDate = dt;
}
}
else if (t == 1)
{
if (pRO.CustomerSignature == null)
{
pRO.CustomerSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.CustomerSignatureDate = dt;
}
}
}
}
bindingSource1.DataSource = pRO;
}

40
ReportImp/LebenshilfeBadKreuznach/Quittierungsbeleg_old.cs
View File

@@ -78,7 +78,45 @@ namespace LebenshilfeBadKreuznach
lblGruppe.Text = String.Format("{0:0.00}", gruppe);
ErstelleAbwesenheitenTabelle(pRO);
//Einmal getätigte Unterschriften sollen nicht verfallen, auch wenn es anschließend Ergänzungen gab
var serviceRecordOids = pRO.Services.Select(service => service.ServiceRecordOid).ToList();
if (serviceRecordOids.Count > 0 && (pRO.EmployeeSignature == null || pRO.CustomerSignature == null))
{
var sql = @"
select distinct crs.SignatureImage, crs.SignatureType, crs.InsTs from
confirmationreceiptsignature crs
inner join confirmationreceiptsignature2servicerecord c2s on c2s.ConfirmationReceiptSignatureOid = crs.Oid
where c2s.ServiceRecordOid in (:LISTE)
order by crs.oid desc
";
sql = sql.Replace(":LISTE", String.Join(",", serviceRecordOids));
var sqlResult = DAOFactory.SearchDAO.GetSqlResult(sql);
foreach (object[] item in sqlResult)
{
var sig = item[0] as String;
var t = (sbyte)item[1];
var dt = (DateTime)item[2];
if (t == 0)
{
if (pRO.EmployeeSignature == null)
{
pRO.EmployeeSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.EmployeeSignatureDate = dt;
}
}
else if (t == 1)
{
if (pRO.CustomerSignature == null)
{
pRO.CustomerSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.CustomerSignatureDate = dt;
}
}
}
}
bindingSource1.DataSource = pRO;
}

40
ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/LeistungsnachweisAmbDienst.cs
View File

@@ -68,6 +68,46 @@ namespace LebenshilfeBadKreuznachFUD.Reporting.Reports
//}
}
//Einmal getätigte Unterschriften sollen nicht verfallen, auch wenn es anschließend Ergänzungen gab
var serviceRecordOids = pRO.Services.Select(service => service.ServiceRecordOid).ToList();
if (serviceRecordOids.Count > 0 && (pRO.EmployeeSignature == null || pRO.CustomerSignature == null))
{
var sql = @"
select distinct crs.SignatureImage, crs.SignatureType, crs.InsTs from
confirmationreceiptsignature crs
inner join confirmationreceiptsignature2servicerecord c2s on c2s.ConfirmationReceiptSignatureOid = crs.Oid
where c2s.ServiceRecordOid in (:LISTE)
order by crs.oid desc
";
sql = sql.Replace(":LISTE", String.Join(",", serviceRecordOids));
var sqlResult = DAOFactory.SearchDAO.GetSqlResult(sql);
foreach (object[] item in sqlResult)
{
var sig = item[0] as String;
var t = (sbyte)item[1];
var dt = (DateTime)item[2];
if (t == 0)
{
if (pRO.EmployeeSignature == null)
{
pRO.EmployeeSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.EmployeeSignatureDate = dt;
}
}
else if (t == 1)
{
if (pRO.CustomerSignature == null)
{
pRO.CustomerSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.CustomerSignatureDate = dt;
}
}
}
}
bindingSource1.DataSource = pRO;
}

40
ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/LeistungsnachweisEntlastungsbeitrag.cs
View File

@@ -34,6 +34,46 @@ namespace LebenshilfeBadKreuznachFUD.Reporting.Reports
}
}
//Einmal getätigte Unterschriften sollen nicht verfallen, auch wenn es anschließend Ergänzungen gab
var serviceRecordOids = pRO.Services.Select(service => service.ServiceRecordOid).ToList();
if (serviceRecordOids.Count > 0 && (pRO.EmployeeSignature == null || pRO.CustomerSignature == null))
{
var sql = @"
select distinct crs.SignatureImage, crs.SignatureType, crs.InsTs from
confirmationreceiptsignature crs
inner join confirmationreceiptsignature2servicerecord c2s on c2s.ConfirmationReceiptSignatureOid = crs.Oid
where c2s.ServiceRecordOid in (:LISTE)
order by crs.oid desc
";
sql = sql.Replace(":LISTE", String.Join(",", serviceRecordOids));
var sqlResult = DAOFactory.SearchDAO.GetSqlResult(sql);
foreach (object[] item in sqlResult)
{
var sig = item[0] as String;
var t = (sbyte)item[1];
var dt = (DateTime)item[2];
if (t == 0)
{
if (pRO.EmployeeSignature == null)
{
pRO.EmployeeSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.EmployeeSignatureDate = dt;
}
}
else if (t == 1)
{
if (pRO.CustomerSignature == null)
{
pRO.CustomerSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.CustomerSignatureDate = dt;
}
}
}
}
bindingSource1.DataSource = pRO;
}
}

41
ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/QuittierungsbelegMainzBingen.cs
View File

@@ -105,7 +105,46 @@ namespace LebenshilfeBadKreuznachFUD.Reporting.Reports
ErstelleAbwesenheitenTabelle(pRO);
//Einmal getätigte Unterschriften sollen nicht verfallen, auch wenn es anschließend Ergänzungen gab
var serviceRecordOids = pRO.Services.Select(service => service.ServiceRecordOid).ToList();
if (serviceRecordOids.Count > 0 && (pRO.EmployeeSignature == null || pRO.CustomerSignature == null))
{
var sql = @"
select distinct crs.SignatureImage, crs.SignatureType, crs.InsTs from
confirmationreceiptsignature crs
inner join confirmationreceiptsignature2servicerecord c2s on c2s.ConfirmationReceiptSignatureOid = crs.Oid
where c2s.ServiceRecordOid in (:LISTE)
order by crs.oid desc
";
sql = sql.Replace(":LISTE", String.Join(",", serviceRecordOids));
var sqlResult = DAOFactory.SearchDAO.GetSqlResult(sql);
foreach (object[] item in sqlResult)
{
var sig = item[0] as String;
var t = (sbyte)item[1];
var dt = (DateTime)item[2];
if (t == 0)
{
if (pRO.EmployeeSignature == null)
{
pRO.EmployeeSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.EmployeeSignatureDate = dt;
}
}
else if (t == 1)
{
if (pRO.CustomerSignature == null)
{
pRO.CustomerSignature = ImageUtils.ConvertBase64StringToBitmap(sig);
pRO.CustomerSignatureDate = dt;
}
}
}
}
bindingSource1.DataSource = pRO;
}

2
ReportImp/MezMenzelReports/MezMenzelReports.csproj
View File

@@ -41,7 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>

18
ReportImp/SHKService/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -9,8 +9,26 @@ namespace SHKService
{
public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
{
private DateTime _BerichtsAnfang = DateTime.MinValue;
public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro)
{
base.CreateEmployeeDetails(ro);
foreach (var ed in ro.EmployeeDetailList)
{
var c = ed.Employee.GetValidContractForDate(_BerichtsAnfang);
if (c != null)
{
ed.Custom14 = c.HourlyRate ?? 0;
ed.Custom15 = ed.Custom14 * Math.Round(ed.UeberstundenGesamt ?? 0, 2, MidpointRounding.AwayFromZero);
}
}
}
protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
{
_BerichtsAnfang = berichtsAnfang;
this.vacationService.Bundesland = "Hessen";
AktuellBearbeitetesEmployeeDetail = empDetail;
}

4
ReportImp/SHKService/Mitarbeiterstundenkonto.cs
View File

@@ -3,12 +3,13 @@ using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
namespace SHKService
{
[IDSpecificClass(Identifier = "Mitarbeiterstundenkonto")]
public partial class Mitarbeiterstundenkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
{
public Mitarbeiterstundenkonto()
{
InitializeComponent();
@@ -21,5 +22,6 @@ namespace SHKService
this.bindingSource1.DataSource = pRO;
}
}
}

739
ReportImp/SHKService/Mitarbeiterstundenkonto.designer.cs generated
View File

@@ -32,18 +32,43 @@ namespace SHKService
this.components = new System.ComponentModel.Container();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
@@ -56,44 +81,14 @@ namespace SHKService
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -107,11 +102,138 @@ namespace SHKService
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1041.597F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowDetail
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell6,
this.xrTableCell3,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell26,
this.xrTableCell17,
this.xrTableCell18});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Employee.PersonnelNumber")});
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 0.069244203420234754D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.18715637007607383D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ArbeitstageImBerichtszeitraum")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.TextFormatString = "{0:0.#}";
this.xrTableCell19.Weight = 0.077981777014602974D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.077981823922301532D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.077981818258001268D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.077981850427716409D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.077982008609549708D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.10397576813052302D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.083180616096650978D;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.083180560331310244D;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -131,24 +253,137 @@ namespace SHKService
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1041.597F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
this.xrTableHeader.StylePriority.UseTextAlignment = false;
this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowHeader
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell5,
this.xrTableCell4,
this.xrTableCell2,
this.xrTableCell9,
this.xrTableCell8,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell15,
this.xrTableCell10,
this.xrTableCell14});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 2.8D;
//
// xrTableCell1
//
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Pers. Nr.";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.069244200458654342D;
//
// xrTableCell5
//
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.18715636675650416D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Arbeitstage \r\nim Monat";
this.xrTableCell4.Weight = 0.077981817659390093D;
//
// xrTableCell2
//
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Fehlzeiten\r\nin diesem Monat";
this.xrTableCell2.Weight = 0.077981819278888642D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Überstunden\r\nvom Vormonat";
this.xrTableCell9.Weight = 0.077981821538103679D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "Sollzeit";
this.xrTableCell8.Weight = 0.077981818467320885D;
//
// xrTableCell11
//
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "Ist Zeit";
this.xrTableCell11.Weight = 0.077981818037207259D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Stand Über- und Unterstunden aktueller Monat";
this.xrTableCell12.Weight = 0.10397576172268516D;
//
// xrTableCell13
//
this.xrTableCell13.Multiline = true;
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Ausbezahlte\r\nÜberstunden in diesem Monat";
this.xrTableCell13.Weight = 0.08318060953135295D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Übertrag im nächsten Monat";
this.xrTableCell15.Weight = 0.0831806331303198D;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.GroupFooter1.HeightF = 48.95833F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTable1.SizeF = new System.Drawing.SizeF(1041.597F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -161,12 +396,7 @@ namespace SHKService
this.xrTableCell35,
this.xrTableCell37,
this.xrTableCell39,
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
this.cellRelationGesamt,
this.xrTableCell7,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell51});
@@ -180,57 +410,43 @@ namespace SHKService
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.15329126714047708D;
this.xrTableCell35.Weight = 0.22235931589111113D;
//
// cellSollGesamt
// xrTableCell37
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
this.cellSollGesamt.Name = "cellSollGesamt";
this.cellSollGesamt.Text = "cellSollGesamt";
this.cellSollGesamt.Weight = 0.0721370604147881D;
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.067628480379811479D;
//
// cellFLSSollGesamt
// xrTableCell39
//
this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.067628494138863779D;
//
// cellFLSIstGesamt
// xrTableCell7
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
this.xrTableCell7.Multiline = true;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Weight = 0.0676284666207591D;
//
// cellFLSPlusMinusGesamt
// xrTableCell47
//
this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.067628521656968588D;
//
// cellGesamtGesamt
// xrTableCell48
//
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
this.cellGesamtGesamt.Text = "cellGesamtGesamt";
this.cellGesamtGesamt.Weight = 0.063119927862939573D;
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.067628714283701652D;
//
// cellRelationGesamt
// xrTableCell51
//
this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
this.cellRelationGesamt.Name = "cellRelationGesamt";
this.cellRelationGesamt.Text = "cellRelationGesamt";
this.cellRelationGesamt.Weight = 0.0631199278629396D;
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.37871953965953276D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// ReportHeader
//
@@ -243,7 +459,7 @@ namespace SHKService
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yyyy}")});
this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
@@ -261,22 +477,22 @@ namespace SHKService
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(864.9999F, 25F);
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(881.5967F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F);
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(160F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(260.0001F, 23F);
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(294.8596F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
@@ -286,7 +502,7 @@ namespace SHKService
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
@@ -296,7 +512,7 @@ namespace SHKService
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
@@ -306,7 +522,7 @@ namespace SHKService
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
@@ -316,7 +532,7 @@ namespace SHKService
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
@@ -337,287 +553,37 @@ namespace SHKService
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// bindingSource1
// xrTableCell10
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.081154151689479551D;
//
// xrTableCell39
//
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.094679919312514085D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.063119927862939587D;
//
// xrTableCell51
//
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.063119927862939573D;
//
// xrTableCell47
//
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.063119927862939587D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Überstd. Gesamt";
this.xrTableCell15.Weight = 0.0631199213956443D;
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Text = "Stundensatz";
this.xrTableCell10.Weight = 0.0831806331303198D;
//
// xrTableCell14
//
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBackColor = false;
this.xrTableCell14.Text = "Überstd. Vormonat";
this.xrTableCell14.Weight = 0.063119928275170531D;
this.xrTableCell14.Text = "Auszahlung";
this.xrTableCell14.Weight = 0.0831806331303198D;
//
// xrTableCell13
// xrTableCell17
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Überstd. neu";
this.xrTableCell13.Weight = 0.063119928687401447D;
this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")});
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.TextFormatString = "{0:0.00}";
this.xrTableCell17.Weight = 0.083180560331310244D;
//
// xrTableCell12
// xrTableCell18
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
this.xrTableCell12.Weight = 0.063119929511863376D;
//
// xrTableCell11
//
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
this.xrTableCell11.Weight = 0.063119927721024011D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
this.xrTableCell7.Weight = 0.06311992757910842D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.Text = "FLS IST lfd. Monat";
this.xrTableCell10.Weight = 0.063119927721024D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "FLS Stunden SOLL";
this.xrTableCell8.Weight = 0.063119927721024038D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
this.xrTableCell9.Weight = 0.072137063712635591D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
this.xrTableCell2.Weight = 0.094679896646570338D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Reguläre SOLL Stunden";
this.xrTableCell4.Weight = 0.081154192324637608D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.15329125016467182D;
//
// xrTableRowHeader
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell4,
this.xrTableCell2,
this.xrTableCell9,
this.xrTableCell8,
this.xrTableCell10,
this.xrTableCell7,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 2.8D;
//
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
this.xrTableHeader.StylePriority.UseTextAlignment = false;
this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.063119927862939573D;
//
// xrTableCell24
//
this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.0631199278629396D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.063119927862939587D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.063119927862939615D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.063119927862939559D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.063119927862939587D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.063119927862939615D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.063119927862939587D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.0721370604147881D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.094679933071566441D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.081154151689479551D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125338142471D;
//
// xrTableRowDetail
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
this.xrTableCell26});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")});
this.xrTableCell18.Multiline = true;
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.TextFormatString = "{0:0.00}";
this.xrTableCell18.Weight = 0.083180560331310244D;
//
// Mitarbeiterstundenkonto
//
@@ -632,7 +598,7 @@ namespace SHKService
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30);
this.Margins = new DevExpress.Drawing.DXMargins(60F, 60F, 50F, 30F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -641,11 +607,11 @@ namespace SHKService
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -672,13 +638,6 @@ namespace SHKService
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
@@ -686,12 +645,9 @@ namespace SHKService
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTable xrTableHeader;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
@@ -700,17 +656,22 @@ namespace SHKService
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
}
}

3
ReportImp/SHKService/Mitarbeiterstundenkonto.resx
View File

@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

25
ReportImp/SHKService/MitarbeiterstundenkontoAlt.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
namespace SHKService
{
[IDSpecificClass(Identifier = "MitarbeiterstundenkontoAlt")]
public partial class MitarbeiterstundenkontoAlt : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
{
public MitarbeiterstundenkontoAlt()
{
InitializeComponent();
}
public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
{
var msb = new CustomMitarbeiterstundenkontoBerechnung();
msb.CreateReport(pRO);
this.bindingSource1.DataSource = pRO;
}
}
}

716
ReportImp/SHKService/MitarbeiterstundenkontoAlt.designer.cs generated Normal file
View File

@@ -0,0 +1,716 @@
using BeWo.Report.ReportObjects;
namespace SHKService
{
partial class MitarbeiterstundenkontoAlt
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.GroupHeader1,
this.GroupFooter1});
this.DetailReport.DataMember = "EmployeeDetailList";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableHeader});
this.GroupHeader1.HeightF = 70F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.GroupFooter1.HeightF = 48.95833F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell35,
this.xrTableCell37,
this.xrTableCell39,
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell51});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.15329126714047708D;
//
// cellSollGesamt
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
this.cellSollGesamt.Name = "cellSollGesamt";
this.cellSollGesamt.Text = "cellSollGesamt";
this.cellSollGesamt.Weight = 0.0721370604147881D;
//
// cellFLSSollGesamt
//
this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
//
// cellFLSIstGesamt
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
//
// cellFLSPlusMinusGesamt
//
this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
//
// cellGesamtGesamt
//
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
this.cellGesamtGesamt.Text = "cellGesamtGesamt";
this.cellGesamtGesamt.Weight = 0.063119927862939573D;
//
// cellRelationGesamt
//
this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
this.cellRelationGesamt.Name = "cellRelationGesamt";
this.cellRelationGesamt.Text = "cellRelationGesamt";
this.cellRelationGesamt.Weight = 0.0631199278629396D;
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblMonat});
this.ReportHeader.HeightF = 35F;
this.ReportHeader.Name = "ReportHeader";
//
// lblMonat
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yyyy}")});
this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.lblMonat.StyleName = "Title";
this.lblMonat.StylePriority.UseFont = false;
//
// pageFooterBand1
//
this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2,
this.xrPageInfo1});
this.pageFooterBand1.HeightF = 48F;
this.pageFooterBand1.Name = "pageFooterBand1";
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(864.9999F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(260.0001F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
// FieldCaption
//
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
// PageInfo
//
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
// DataField
//
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
// fieldFLS
//
this.fieldFLS.DataMember = "FLSReportGroups";
this.fieldFLS.Expression = "[TotalFLM] / 60";
this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLS.Name = "fieldFLS";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.081154151689479551D;
//
// xrTableCell39
//
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.094679919312514085D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.063119927862939587D;
//
// xrTableCell51
//
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.063119927862939573D;
//
// xrTableCell47
//
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.063119927862939587D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Überstd. Gesamt";
this.xrTableCell15.Weight = 0.0631199213956443D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBackColor = false;
this.xrTableCell14.Text = "Überstd. Vormonat";
this.xrTableCell14.Weight = 0.063119928275170531D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Überstd. neu";
this.xrTableCell13.Weight = 0.063119928687401447D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
this.xrTableCell12.Weight = 0.063119929511863376D;
//
// xrTableCell11
//
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
this.xrTableCell11.Weight = 0.063119927721024011D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
this.xrTableCell7.Weight = 0.06311992757910842D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.Text = "FLS IST lfd. Monat";
this.xrTableCell10.Weight = 0.063119927721024D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "FLS Stunden SOLL";
this.xrTableCell8.Weight = 0.063119927721024038D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
this.xrTableCell9.Weight = 0.072137063712635591D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
this.xrTableCell2.Weight = 0.094679896646570338D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Reguläre SOLL Stunden";
this.xrTableCell4.Weight = 0.081154192324637608D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.15329125016467182D;
//
// xrTableRowHeader
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell4,
this.xrTableCell2,
this.xrTableCell9,
this.xrTableCell8,
this.xrTableCell10,
this.xrTableCell7,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 2.8D;
//
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
this.xrTableHeader.StylePriority.UseTextAlignment = false;
this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.063119927862939573D;
//
// xrTableCell24
//
this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.0631199278629396D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.063119927862939587D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.063119927862939615D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.063119927862939559D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.063119927862939587D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.063119927862939615D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.063119927862939587D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.0721370604147881D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.094679933071566441D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.081154151689479551D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125338142471D;
//
// xrTableRowDetail
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
this.xrTableCell26});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// Mitarbeiterstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.ReportHeader,
this.pageFooterBand1,
this.topMarginBand1,
this.bottomMarginBand1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
private DevExpress.XtraReports.UI.XRControlStyle Title;
private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
private DevExpress.XtraReports.UI.XRControlStyle DataField;
private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTable xrTableHeader;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
}
}

123
ReportImp/SHKService/MitarbeiterstundenkontoAlt.resx Normal file
View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

10
ReportImp/SHKService/SHKService.csproj
View File

@@ -118,6 +118,12 @@
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="MitarbeiterstundenkontoAlt.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MitarbeiterstundenkontoAlt.designer.cs">
<DependentUpon>MitarbeiterstundenkontoAlt.cs</DependentUpon>
</Compile>
<Compile Include="MitarbeiterstundenkontoJahr.cs">
<SubType>Component</SubType>
</Compile>
@@ -194,6 +200,10 @@
</EmbeddedResource>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="MitarbeiterstundenkontoAlt.resx">
<DependentUpon>MitarbeiterstundenkontoAlt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MitarbeiterstundenkontoJahr.resx">
<DependentUpon>MitarbeiterstundenkontoJahr.cs</DependentUpon>

125
ReportImp/SHKServiceSBD/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -13,9 +13,26 @@ namespace SHKServiceSBD
{
private Dictionary<string, decimal> _SollStundenProTagDict = new Dictionary<string, decimal>(); //Speicher die Sollstunden aus den Betreuungszeiten des Kindes pro EmployeeOid und Tag (Key = {employee oid}_{datum])
private Organisation _Martinsschule = null;
private DateTime _BerichtsAnfang = DateTime.MinValue;
public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro)
{
base.CreateEmployeeDetails(ro);
foreach (var ed in ro.EmployeeDetailList)
{
var c = ed.Employee.GetValidContractForDate(_BerichtsAnfang);
if (c != null)
{
ed.Custom14 = c.HourlyRate ?? 0;
ed.Custom15 = ed.Custom14 * Math.Round(ed.UeberstundenGesamt ?? 0, 2, MidpointRounding.AwayFromZero);
}
}
}
protected override void StarteBerechnung(DateTime berichtsAnfang, DateTime berichtsEnde, MitarbeiterstundenkontoRO.EmployeeDetail empDetail)
{
_BerichtsAnfang = berichtsAnfang;
SucheMartinsschule();
SetzeBundesland(empDetail);
BerechneBewilligteSollZeitProWoche(empDetail, berichtsAnfang);
@@ -115,35 +132,66 @@ namespace SHKServiceSBD
ersterVertragsStart = c.EntryDate.Value;
}
}
bool istTeamMartinsschule = IstTeamMartinsschule(empDetail, berichtsAnfang);
if (istTeamMartinsschule && _Martinsschule != null)
{
BerechneSollZeitenDictionary(_Martinsschule.Arbeitszeiten, empDetail, ersterVertragsStart, letzerVertragsEnde, false);
}
foreach (var e2c in empDetail.Employee.Employee2CustomerList)
{
var start = ersterVertragsStart;
var ende = letzerVertragsEnde;
if (e2c.StartDate.HasValue && e2c.StartDate > start)
DateTime vertragsStart = ersterVertragsStart;
DateTime vertragsEnde = letzerVertragsEnde;
var contract = empDetail.Employee.GetValidContractForDate(vertragsStart);
while (contract != null)
{
vertragsEnde = berichtsEnde;
if (contract.ContractEndDate.HasValue && contract.ContractEndDate < vertragsEnde)
{
start = e2c.StartDate.Value;
vertragsEnde = contract.ContractEndDate.Value;
}
if (e2c.EndDate.HasValue && e2c.EndDate < ende)
bool istTeamMartinsschule = IstTeamMartinsschule(empDetail, vertragsStart);
if (istTeamMartinsschule && _Martinsschule != null)
{
ende = e2c.EndDate.Value;
BerechneSollZeitenDictionary(_Martinsschule.Arbeitszeiten, empDetail, vertragsStart, vertragsEnde, false);
}
foreach (var e2c in empDetail.Employee.Employee2CustomerList)
{
var start = vertragsStart;
var ende = vertragsEnde;
if (e2c.StartDate.HasValue && e2c.StartDate > start)
{
start = e2c.StartDate.Value;
}
if (e2c.EndDate.HasValue && e2c.EndDate < ende)
{
ende = e2c.EndDate.Value;
}
if (start <= ende)
{
var kind = e2c.Customer;
BerechneSollZeitenDictionary(kind.Arbeitszeiten, empDetail, start, ende, false);
}
}
if (start <= ende)
{
var kind = e2c.Customer;
//Füge Soll für Kinder, die bei den Mitarbeiterarbeitszeiten eingetragen wurden hinzu:
BerechneSollZeitenDictionary(empDetail.Employee.Arbeitszeiten, empDetail, vertragsStart, vertragsEnde, true);
BerechneSollZeitenDictionary(kind.Arbeitszeiten, empDetail, start, ende, false);
var ctemp = GetNextValidContractForDate(vertragsEnde.AddDays(1), empDetail.Employee);
if (ctemp != null && ctemp.Oid != contract.Oid)
{
contract = ctemp;
}
else
{
contract = null;
}
if (contract != null && contract.EntryDate.HasValue && contract.EntryDate >= vertragsStart)
{
vertragsStart = contract.EntryDate.Value;
}
}
//Füge Soll für Kinder, die bei den Mitarbeiterarbeitszeiten eingetragen wurden hinzu:
BerechneSollZeitenDictionary(empDetail.Employee.Arbeitszeiten, empDetail, ersterVertragsStart, letzerVertragsEnde, true);
}
@@ -183,6 +231,7 @@ namespace SHKServiceSBD
}
}
return soll;
}
@@ -248,6 +297,31 @@ namespace SHKServiceSBD
}
}
protected override decimal? GetSollNachArbeitszeiten(Employee emp, DateTime start, DateTime ende)
{
var soll = base.GetSollNachArbeitszeiten(emp, start, ende);
if (soll == null)
{
DateTime startTemp = start;
while (startTemp < ende)
{
String key = String.Format("{0}_{1:yyyyMMdd}", emp.Oid, startTemp);
if (_SollStundenProTagDict.ContainsKey(key))
{
if (soll == null)
{
soll = 0;
}
soll += _SollStundenProTagDict[key];
}
startTemp = startTemp.AddDays(1);
}
}
return soll;
}
public virtual bool IstSchule(String name)
{
@@ -397,6 +471,10 @@ namespace SHKServiceSBD
bool feiertagAnrechnen = true;
if (dd.AbsenceTimes != null)
{
if (dd.Date.Year == 2024 && dd.Date.Month == 12 && dd.Date.Day == 24)
{
int test = 0;
}
foreach (var at in dd.AbsenceTimes)
{
if (IstAnrechenbareAbsenceTime(at))
@@ -438,6 +516,11 @@ namespace SHKServiceSBD
else if (IsUrlaubAbsenceTime(at))
{
dd.HoursInVacation = sollProTag;
if (faktor > 0)
{
dd.HoursInVacation *= faktor;
}
}
else
{
@@ -502,7 +585,7 @@ namespace SHKServiceSBD
public override decimal BerechneSollStundenFuerTag(MitarbeiterstundenkontoRO.EmployeeDetail ed, DateTime date)
{
if (date == new DateTime(2024, 5, 1))
if (date == new DateTime(2024, 12, 24))
{
int test = 0;
}

175
ReportImp/SHKServiceSBD/Mitarbeiterstundenkonto.designer.cs generated
View File

@@ -34,6 +34,7 @@ namespace SHKServiceSBD
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -47,6 +48,7 @@ namespace SHKServiceSBD
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -59,8 +61,10 @@ namespace SHKServiceSBD
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -77,10 +81,10 @@ namespace SHKServiceSBD
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -115,7 +119,7 @@ namespace SHKServiceSBD
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(969.8596F, 25F);
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1041.597F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
@@ -134,10 +138,25 @@ namespace SHKServiceSBD
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell26});
this.xrTableCell26,
this.xrTableCell17,
this.xrTableCell18});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell6
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Employee.PersonnelNumber")});
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 0.069244203420234754D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -149,7 +168,7 @@ namespace SHKServiceSBD
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.23733830334261469D;
this.xrTableCell3.Weight = 0.18715637007607383D;
//
// xrTableCell19
//
@@ -157,7 +176,7 @@ namespace SHKServiceSBD
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ArbeitstageImBerichtszeitraum")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.TextFormatString = "{0:0.#}";
this.xrTableCell19.Weight = 0.077981824610929285D;
this.xrTableCell19.Weight = 0.077981777014602974D;
//
// xrTableCell20
//
@@ -173,7 +192,7 @@ namespace SHKServiceSBD
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.077981826190722331D;
this.xrTableCell28.Weight = 0.077981818258001268D;
//
// xrTableCell16
//
@@ -181,7 +200,7 @@ namespace SHKServiceSBD
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.077981818696832211D;
this.xrTableCell16.Weight = 0.077981850427716409D;
//
// xrTableCell23
//
@@ -189,7 +208,7 @@ namespace SHKServiceSBD
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.0779818182242445D;
this.xrTableCell23.Weight = 0.077982008609549708D;
//
// xrTableCell21
//
@@ -197,7 +216,7 @@ namespace SHKServiceSBD
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.10397576019780197D;
this.xrTableCell21.Weight = 0.10397576813052302D;
//
// xrTableCell25
//
@@ -205,7 +224,7 @@ namespace SHKServiceSBD
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.10397576836681735D;
this.xrTableCell25.Weight = 0.083180616096650978D;
//
// xrTableCell26
//
@@ -213,7 +232,7 @@ namespace SHKServiceSBD
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.10397577606324504D;
this.xrTableCell26.Weight = 0.083180560331310244D;
//
// DetailReport
//
@@ -245,7 +264,7 @@ namespace SHKServiceSBD
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(969.8596F, 70F);
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1041.597F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
@@ -264,40 +283,54 @@ namespace SHKServiceSBD
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell15});
this.xrTableCell15,
this.xrTableCell10,
this.xrTableCell14});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 2.8D;
//
// xrTableCell1
//
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Pers. Nr.";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.069244200458654342D;
//
// xrTableCell5
//
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.2373382998706893D;
this.xrTableCell5.Weight = 0.18715636675650416D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Arbeitstage \r\nim Monat";
this.xrTableCell4.Weight = 0.077981825592111115D;
this.xrTableCell4.Weight = 0.077981817659390093D;
//
// xrTableCell2
//
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Fehlzeiten\r\nin diesem Monat";
this.xrTableCell2.Weight = 0.077981827211609636D;
this.xrTableCell2.Weight = 0.077981819278888642D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Überstunden\r\nvom Vormonat";
this.xrTableCell9.Weight = 0.077981829470824729D;
this.xrTableCell9.Weight = 0.077981821538103679D;
//
// xrTableCell8
//
@@ -311,26 +344,26 @@ namespace SHKServiceSBD
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "Ist Zeit";
this.xrTableCell11.Weight = 0.077981818037207246D;
this.xrTableCell11.Weight = 0.077981818037207259D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Stand Über- und Unterstunden aktueller Monat";
this.xrTableCell12.Weight = 0.1039757696554062D;
this.xrTableCell12.Weight = 0.10397576172268516D;
//
// xrTableCell13
//
this.xrTableCell13.Multiline = true;
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Ausbezahlte\r\nÜberstunden in diesem Monat";
this.xrTableCell13.Weight = 0.10397576173838387D;
this.xrTableCell13.Weight = 0.08318060953135295D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Übertrag im nächsten Monat";
this.xrTableCell15.Weight = 0.10397576947190867D;
this.xrTableCell15.Weight = 0.0831806331303198D;
//
// GroupFooter1
//
@@ -350,7 +383,7 @@ namespace SHKServiceSBD
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(969.8596F, 25F);
this.xrTable1.SizeF = new System.Drawing.SizeF(1041.597F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -370,30 +403,46 @@ namespace SHKServiceSBD
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.22235931589111113D;
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.06762850789791619D;
this.xrTableCell37.Weight = 0.067628480379811479D;
//
// xrTableCell39
//
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.067628494138863793D;
this.xrTableCell39.Weight = 0.067628494138863779D;
//
// xrTableCell7
//
this.xrTableCell7.Multiline = true;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Weight = 0.0676284666207591D;
//
// xrTableCell47
//
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.067628494138863876D;
this.xrTableCell47.Weight = 0.067628521656968588D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.067628494138863959D;
this.xrTableCell48.Weight = 0.067628714283701652D;
//
// xrTableCell51
//
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.2705139490373506D;
this.xrTableCell51.Weight = 0.37871953965953276D;
//
// bindingSource1
//
@@ -429,9 +478,9 @@ namespace SHKServiceSBD
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(869.8596F, 25F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(881.5967F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(100F, 23F);
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(160F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
@@ -504,45 +553,37 @@ namespace SHKServiceSBD
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrTableCell1
// xrTableCell10
//
this.xrTableCell1.Multiline = true;
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Pers. Nr.";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.069244200458654342D;
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Text = "Stundensatz";
this.xrTableCell10.Weight = 0.0831806331303198D;
//
// xrTableCell6
// xrTableCell14
//
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Employee.PersonnelNumber")});
this.xrTableCell6.Multiline = true;
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 0.069244203420234754D;
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Text = "Auszahlung";
this.xrTableCell14.Weight = 0.0831806331303198D;
//
// xrTableCell35
// xrTableCell17
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.26587882699785848D;
this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")});
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.TextFormatString = "{0:0.00}";
this.xrTableCell17.Weight = 0.083180560331310244D;
//
// xrTableCell7
// xrTableCell18
//
this.xrTableCell7.Multiline = true;
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Weight = 0.067628507897916162D;
this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")});
this.xrTableCell18.Multiline = true;
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.TextFormatString = "{0:0.00}";
this.xrTableCell18.Weight = 0.083180560331310244D;
//
// Mitarbeiterstundenkonto
//
@@ -557,7 +598,7 @@ namespace SHKServiceSBD
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F);
this.Margins = new DevExpress.Drawing.DXMargins(60F, 60F, 50F, 30F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -628,5 +669,9 @@ namespace SHKServiceSBD
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
}
}

9
ReportImp/SHKServiceSBD/SHKServiceSBD.csproj
View File

@@ -169,6 +169,12 @@
<Compile Include="Service\CustomOperationService.cs" />
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="Service\CustomVertretungsManager.cs" />
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
@@ -251,6 +257,9 @@
<DependentUpon>SBDEmployeeReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Calculations\" />

14
ReportImp/SHKServiceSBD/Service/CustomVacationService.cs
View File

@@ -26,5 +26,19 @@ namespace SHKServiceSBD.Service
return list;
}
public override decimal GetFeiertagsFaktor(DateTime start)
{
if (start.Month == 12)
{
if (start.Day == 24 || start.Day == 31)
{
return 0.5m;
}
}
return base.GetFeiertagsFaktor(start);
}
}
}

29
ReportImp/SHKServiceSBD/Teamstundenkonto.cs Normal file
View File

@@ -0,0 +1,29 @@
using System;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.Plugins;
using BS.Shared.Core;
namespace SHKServiceSBD
{
[IDSpecificClass(Identifier = "Teamstundenkonto")]
public partial class Teamstundenkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
{
public Teamstundenkonto()
{
InitializeComponent();
}
public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
{
var msb = new CustomMitarbeiterstundenkontoBerechnung();
msb.CreateReport(pRO);
bindingSource1.DataSource = pRO;
}
}
}

956
ReportImp/SHKServiceSBD/Teamstundenkonto.designer.cs generated Normal file
View File

@@ -0,0 +1,956 @@
using BeWo.Report.ReportObjects;
namespace SHKServiceSBD
{
partial class Teamstundenkonto
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary11 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary12 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary13 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary14 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary15 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary16 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail3 = new DevExpress.XtraReports.UI.DetailBand();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1041.597F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowDetail
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell54,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
this.xrTableCell26});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Employee.PersonnelNumber")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.060050923078311683D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.ArbeitstageImBerichtszeitraum")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.TextFormatString = "{0:0.#}";
this.xrTableCell19.Weight = 0.067628480379811493D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.067628494138863848D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.06762850789791619D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.06762852165696856D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.0901713255184851D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenAusbezahlt", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.072137060414788123D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.0721370604147881D;
//
// xrTableCell24
//
this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom14", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.072137060414788123D;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom15", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.0721370604147881D;
//
// xrTable1
//
this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1041.597F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell35,
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell51});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.29010056238684556D;
//
// cellSollGesamt
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UrlaubUndKrankheit")});
this.cellSollGesamt.Name = "cellSollGesamt";
xrSummary1.FormatString = "{0:0.00}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.cellSollGesamt.Summary = xrSummary1;
this.cellSollGesamt.Weight = 0.067654746402521823D;
//
// cellFLSSollGesamt
//
this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenVormonat")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
xrSummary2.FormatString = "{0:0.00}";
xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.cellFLSSollGesamt.Summary = xrSummary2;
this.cellFLSSollGesamt.Weight = 0.067654746152775821D;
//
// cellFLSIstGesamt
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenSollOhneUrlaubKrankheit")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
xrSummary3.FormatString = "{0:0.00}";
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.cellFLSIstGesamt.Summary = xrSummary3;
this.cellFLSIstGesamt.Weight = 0.067654742825869044D;
//
// cellFLSPlusMinusGesamt
//
this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenGesamtIst")});
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
xrSummary4.FormatString = "{0:0.00}";
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.cellFLSPlusMinusGesamt.Summary = xrSummary4;
this.cellFLSPlusMinusGesamt.Weight = 0.067654746338432617D;
//
// cellGesamtGesamt
//
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Ueberstunden")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
xrSummary5.FormatString = "{0:0.00}";
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.cellGesamtGesamt.Summary = xrSummary5;
this.cellGesamtGesamt.Weight = 0.090206323707718375D;
//
// cellRelationGesamt
//
this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenAusbezahlt")});
this.cellRelationGesamt.Name = "cellRelationGesamt";
xrSummary6.FormatString = "{0:0.00}";
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.cellRelationGesamt.Summary = xrSummary6;
this.cellRelationGesamt.Weight = 0.0721650616718284D;
//
// xrTableCell47
//
this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenGesamt")});
this.xrTableCell47.Name = "xrTableCell47";
xrSummary7.FormatString = "{0:0.00}";
xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell47.Summary = xrSummary7;
this.xrTableCell47.Weight = 0.07216506068767993D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.072165064072598067D;
//
// xrTableCell51
//
this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom15")});
this.xrTableCell51.Name = "xrTableCell51";
xrSummary8.FormatString = "{0:0.00}";
xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
this.xrTableCell51.Summary = xrSummary8;
this.xrTableCell51.Weight = 0.072165050308204928D;
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblMonat});
this.ReportHeader.HeightF = 70F;
this.ReportHeader.Name = "ReportHeader";
//
// lblMonat
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")});
this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.lblMonat.StyleName = "Title";
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.Text = "lblMonat";
//
// pageFooterBand1
//
this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2,
this.xrPageInfo1});
this.pageFooterBand1.HeightF = 48F;
this.pageFooterBand1.Name = "pageFooterBand1";
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(881.5967F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(160F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8.000081F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(313.5964F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
// FieldCaption
//
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
// PageInfo
//
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
// DataField
//
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
// fieldFLS
//
this.fieldFLS.DataMember = "FLSReportGroups";
this.fieldFLS.Expression = "[TotalFLM] / 60";
this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLS.Name = "fieldFLS";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// DetailReport1
//
this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2,
this.DetailReport2});
this.DetailReport1.DataMember = "TeamDetailList";
this.DetailReport1.DataSource = this.bindingSource1;
this.DetailReport1.Level = 0;
this.DetailReport1.Name = "DetailReport1";
//
// Detail2
//
this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel1});
this.Detail2.HeightF = 46.875F;
this.Detail2.Name = "Detail2";
//
// xrLabel1
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.TeamName")});
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.xrLabel1.StyleName = "Title";
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "xrLabel1";
//
// DetailReport2
//
this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail3,
this.GroupHeader2,
this.GroupFooter2});
this.DetailReport2.DataMember = "TeamDetailList.EmployeeDetailList";
this.DetailReport2.DataSource = this.bindingSource1;
this.DetailReport2.Level = 0;
this.DetailReport2.Name = "DetailReport2";
//
// Detail3
//
this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
this.Detail3.HeightF = 25F;
this.Detail3.Name = "Detail3";
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableHeader});
this.GroupHeader2.HeightF = 70F;
this.GroupHeader2.Name = "GroupHeader2";
//
// GroupFooter2
//
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.GroupFooter2.HeightF = 52.08333F;
this.GroupFooter2.Name = "GroupFooter2";
//
// xrTable3
//
this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable3.SizeF = new System.Drawing.SizeF(1041.597F, 25F);
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UsePadding = false;
this.xrTable3.StylePriority.UseTextAlignment = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell7,
this.xrTableCell8,
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 1D;
//
// xrTableCell1
//
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Gesamt [TeamDetailList.TeamName]";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.28998779627092264D;
//
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UrlaubUndKrankheit")});
this.xrTableCell7.Name = "xrTableCell7";
xrSummary9.FormatString = "{0:0.00}";
xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell7.Summary = xrSummary9;
this.xrTableCell7.Weight = 0.067628494138863793D;
//
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenVormonat")});
this.xrTableCell8.Name = "xrTableCell8";
xrSummary10.FormatString = "{0:0.00}";
xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell8.Summary = xrSummary10;
this.xrTableCell8.Weight = 0.067628494138863848D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenSollOhneUrlaubKrankheit")});
this.xrTableCell9.Name = "xrTableCell9";
xrSummary11.FormatString = "{0:0.00}";
xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell9.Summary = xrSummary11;
this.xrTableCell9.Weight = 0.067628521656968588D;
//
// xrTableCell10
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenGesamtIst")});
this.xrTableCell10.Name = "xrTableCell10";
xrSummary12.FormatString = "{0:0.00}";
xrSummary12.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell10.Summary = xrSummary12;
this.xrTableCell10.Weight = 0.0676286592474921D;
//
// xrTableCell11
//
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Ueberstunden")});
this.xrTableCell11.Name = "xrTableCell11";
xrSummary13.FormatString = "{0:0.00}";
xrSummary13.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell11.Summary = xrSummary13;
this.xrTableCell11.Weight = 0.090171325518485126D;
//
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenAusbezahlt")});
this.xrTableCell12.Name = "xrTableCell12";
xrSummary14.FormatString = "{0:0.00}";
xrSummary14.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell12.Summary = xrSummary14;
this.xrTableCell12.Weight = 0.072137060414788109D;
//
// xrTableCell13
//
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UeberstundenGesamt")});
this.xrTableCell13.Name = "xrTableCell13";
xrSummary15.FormatString = "{0:0.00}";
xrSummary15.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell13.Summary = xrSummary15;
this.xrTableCell13.TextFormatString = "{0:0.00}";
this.xrTableCell13.Weight = 0.0721370604147881D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Weight = 0.072137060414788109D;
//
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom15")});
this.xrTableCell15.Name = "xrTableCell15";
xrSummary16.FormatString = "{0:0.00}";
xrSummary16.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell15.Summary = xrSummary16;
this.xrTableCell15.TextFormatString = "{0:0.00}";
this.xrTableCell15.Weight = 0.0721370604147881D;
//
// ReportFooter1
//
this.ReportFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.ReportFooter1.HeightF = 60F;
this.ReportFooter1.Name = "ReportFooter1";
//
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1041.597F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
this.xrTableHeader.StylePriority.UseTextAlignment = false;
this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowHeader
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell2,
this.xrTableCell5,
this.xrTableCell4,
this.xrTableCell17,
this.xrTableCell29,
this.xrTableCell44,
this.xrTableCell45,
this.xrTableCell46,
this.xrTableCell49,
this.xrTableCell50,
this.xrTableCell52,
this.xrTableCell53});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 2.8D;
//
// xrTableCell2
//
this.xrTableCell2.Multiline = true;
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Pers. Nr.";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell2.Weight = 0.069244200458654342D;
//
// xrTableCell5
//
this.xrTableCell5.Multiline = true;
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.18715636675650416D;
//
// xrTableCell4
//
this.xrTableCell4.Multiline = true;
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Arbeitstage \r\nim Monat";
this.xrTableCell4.Weight = 0.077981817659390093D;
//
// xrTableCell17
//
this.xrTableCell17.Multiline = true;
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Text = "Fehlzeiten\r\nin diesem Monat";
this.xrTableCell17.Weight = 0.077981819278888642D;
//
// xrTableCell29
//
this.xrTableCell29.Multiline = true;
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Text = "Überstunden\r\nvom Vormonat";
this.xrTableCell29.Weight = 0.077981821538103679D;
//
// xrTableCell44
//
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.Text = "Sollzeit";
this.xrTableCell44.Weight = 0.077981818467320885D;
//
// xrTableCell45
//
this.xrTableCell45.Multiline = true;
this.xrTableCell45.Name = "xrTableCell45";
this.xrTableCell45.StylePriority.UseBackColor = false;
this.xrTableCell45.Text = "Ist Zeit";
this.xrTableCell45.Weight = 0.077981818037207259D;
//
// xrTableCell46
//
this.xrTableCell46.Name = "xrTableCell46";
this.xrTableCell46.Text = "Stand Über- und Unterstunden aktueller Monat";
this.xrTableCell46.Weight = 0.10397576172268516D;
//
// xrTableCell49
//
this.xrTableCell49.Multiline = true;
this.xrTableCell49.Name = "xrTableCell49";
this.xrTableCell49.Text = "Ausbezahlte\r\nÜberstunden in diesem Monat";
this.xrTableCell49.Weight = 0.08318060953135295D;
//
// xrTableCell50
//
this.xrTableCell50.Name = "xrTableCell50";
this.xrTableCell50.Text = "Übertrag im nächsten Monat";
this.xrTableCell50.Weight = 0.0831806331303198D;
//
// xrTableCell52
//
this.xrTableCell52.Multiline = true;
this.xrTableCell52.Name = "xrTableCell52";
this.xrTableCell52.Text = "Stundensatz";
this.xrTableCell52.Weight = 0.0831806331303198D;
//
// xrTableCell53
//
this.xrTableCell53.Multiline = true;
this.xrTableCell53.Name = "xrTableCell53";
this.xrTableCell53.Text = "Auszahlung";
this.xrTableCell53.Weight = 0.0831806331303198D;
//
// xrTableCell54
//
this.xrTableCell54.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.FullName")});
this.xrTableCell54.Multiline = true;
this.xrTableCell54.Name = "xrTableCell54";
this.xrTableCell54.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell54.StylePriority.UseFont = false;
this.xrTableCell54.StylePriority.UsePadding = false;
this.xrTableCell54.StylePriority.UseTextAlignment = false;
this.xrTableCell54.Text = "xrTableCell54";
this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell54.Weight = 0.16230837905374707D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.067628659247492118D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Teamstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.ReportHeader,
this.pageFooterBand1,
this.topMarginBand1,
this.bottomMarginBand1,
this.DetailReport1,
this.ReportFooter1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(60F, 60F, 50F, 30F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
private DevExpress.XtraReports.UI.XRControlStyle Title;
private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
private DevExpress.XtraReports.UI.XRControlStyle DataField;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
private DevExpress.XtraReports.UI.DetailBand Detail2;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport2;
private DevExpress.XtraReports.UI.DetailBand Detail3;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter1;
private DevExpress.XtraReports.UI.XRTable xrTableHeader;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell52;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell53;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell54;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
}
}

120
ReportImp/SHKServiceSBD/Teamstundenkonto.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

2
ReportImp/SchoengeistReports/SchoengeistReports.csproj
View File

@@ -41,7 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>

1862
ReportImp/demo_reports/SettlementReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

3
ReportImp/demo_reports/SettlementReport.resx
View File

@@ -121,7 +121,4 @@
<value>anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus:
</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

10
ReportImp/demo_reports/demo_reports.csproj
View File

@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>demo_reports</RootNamespace>
<AssemblyName>demo_reports</AssemblyName>
<AssemblyName>demo_Reports</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
@@ -41,7 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
@@ -113,6 +113,7 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="CustomMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="Export\QlikCsvExporter.cs" />
<Compile Include="Export\CustomDataExporter.cs" />
<Compile Include="InvoiceCustomerReport.cs">
@@ -140,6 +141,7 @@
<Compile Include="ServicesOverviewReport.Designer.cs">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -217,9 +219,7 @@
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Service\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

2
ReportService/ReportingService.csproj
View File

@@ -26,6 +26,7 @@
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>CS0659, CS0162, CS0168, CS0649</NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -35,6 +36,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

2
Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs
View File

@@ -18,6 +18,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.Oid = pEntity.Oid;
pDataContract.Version = pEntity.Version;
pDataContract.Notice = pEntity.Notice;
pDataContract.VgaType = pEntity.VgaType;
pDataContract.AktenzeichenGericht = pEntity.AktenzeichenGericht;
pDataContract.EigenesAktenzeichen = pEntity.EigenesAktenzeichen;
pDataContract.Auftragseingang = pEntity.Auftragseingang;
@@ -91,6 +92,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Oid = pDataContract.Oid;
pEntity.Version = pDataContract.Version;
pEntity.Notice = pDataContract.Notice;
pEntity.VgaType = pDataContract.VgaType;
pEntity.AktenzeichenGericht = pDataContract.AktenzeichenGericht;
pEntity.EigenesAktenzeichen = pDataContract.EigenesAktenzeichen;
pEntity.Auftragseingang = pDataContract.Auftragseingang;

111
Service/Dokumentverwaltung/CustomerPlaceholderManager.cs
View File

@@ -61,76 +61,14 @@ namespace BeWo.Service.Dokumentverwaltung
personendaten.Children.Add(adressdatenKlient);
PlatzhalterDC vga = new PlatzhalterDC()
{
Bezeichnung = "Vermittlung gemeinnütziger Arbeit",
Children = new List<PlatzhalterDC>(),
IconType = "BoyAndGirl"
};
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "AZ der Staatsanwaltschaft/des Gerichts", Platzhalter = "AktenzeichenGericht", FieldName = "Person.CustomerVermittlungArbeit.AktenzeichenGericht", IconType = "AB"});
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Eigenes Aktenzeichen", Platzhalter = "EigenesAktenzeichen", FieldName = "Person.CustomerVermittlungArbeit.EigenesAktenzeichen", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragseingang", Platzhalter = "Auftragseingang", FieldName = "Person.CustomerVermittlungArbeit.Auftragseingang", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragsherkunft", Platzhalter = "Auftragsherkunft", FieldName = "Person.CustomerVermittlungArbeit.Auftragsherkunft", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Vermittlungsgrundlage", Platzhalter = "Vermittlungsgrundlage", FieldName = "Person.CustomerVermittlungArbeit.Vermittlungsgrundlage", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Tagessätze", Platzhalter = "Tagessatze", FieldName = "Person.CustomerVermittlungArbeit.Tagessatze", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Tagessatzhöhe", Platzhalter = "Tagessatzhohe", FieldName = "Person.CustomerVermittlungArbeit.Tagessatzhohe", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Höhe der Geldstrafe", Platzhalter = "HoheDerGeldstrafe", FieldName = "Person.CustomerVermittlungArbeit.HoheDerGeldstrafe", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Zu leistende Arbeitsstunden", Platzhalter = "ZuLeistendeArbeitsstunden", FieldName = "Person.CustomerVermittlungArbeit.ZuLeistendeArbeitsstunden", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Hinweis", Platzhalter = "Hinweis", FieldName = "Person.CustomerVermittlungArbeit.Hinweis", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Termin", Platzhalter = "Termin", FieldName = "Person.CustomerVermittlungArbeit.Termin", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Bearbeitungsstatus", Platzhalter = "CustomerVermittlungBearbeitungsstatus", FieldName = "Person.CustomerVermittlungArbeit.CustomerVermittlungBearbeitungsstatus", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragsrückgabe", Platzhalter = "Auftragsruckgabe", FieldName = "Person.CustomerVermittlungArbeit.Auftragsruckgabe", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Verlauf", Platzhalter = "Verlauf", FieldName = "Person.CustomerVermittlungArbeit.Verlauf", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Abgeleistete Stunden", Platzhalter = "AbgeleisteteStunden", FieldName = "Person.CustomerVermittlungArbeit.AbgeleisteteStunden", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ersparte Hafttage", Platzhalter = "ErsparteHafttage", FieldName = "Person.CustomerVermittlungArbeit.ErsparteHafttage", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Geleistete Ratenzahlung", Platzhalter = "GeleisteteRatenzahlung", FieldName = "Person.CustomerVermittlungArbeit.GeleisteteRatenzahlung", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Geleistete Einmalzahlung", Platzhalter = "GeleisteteEinmalzahlung", FieldName = "Person.CustomerVermittlungArbeit.GeleisteteEinmalzahlung", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Bemerkung", Platzhalter = "Bemerkung", FieldName = "Person.CustomerVermittlungArbeit.Bemerkung", IconType = "AB" });
//if (AppSettings.Show....)
//{
var pm = new VgaPlaceholderManager();
personendaten.Children.AddRange(pm.GetPlatzhalter());
//}
personendaten.Children.Add(vga);
PlatzhalterDC auftraggeber = new PlatzhalterDC()
{
Bezeichnung = "Auftraggeber",
Children = new List<PlatzhalterDC>(),
IconType = "BoyAndGirl"
};
auftraggeber.Children.Add(new PlatzhalterDC { Bezeichnung = "Institution", Platzhalter = "AGInstitution", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC { Bezeichnung = "Anrede", Platzhalter = "AGAnrede", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC { Bezeichnung = "Briefanrede", Platzhalter = "AGBriefanrede", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Vorname", Platzhalter = "AGVorname", FieldName = "Person.FirstName", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Nachname", Platzhalter = "AGNachname", FieldName = "Person.LastName", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "AGStrasse", IconType = "AB", FieldName = "Person.Address.Street" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "AGPLZ", IconType = "AB", FieldName = "Person.Address.PostalCode" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "AGOrt", IconType = "AB", FieldName = "Person.Address.Town" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Telefon", Platzhalter = "AGTelefon", FieldName = "Person.Contacts", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Handy", Platzhalter = "AGHandy", FieldName = "Person.Contacts", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "E-Mail", Platzhalter = "AGEmail", FieldName = "Person.Contacts", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Fax", Platzhalter = "AGFax", FieldName = "Person.Contacts", IconType = "AB" });
vga.Children.Add(auftraggeber);
PlatzhalterDC einsatzstelle = new PlatzhalterDC()
{
Bezeichnung = "Einsatzstelle",
Children = new List<PlatzhalterDC>(),
IconType = "BoyAndGirl"
};
einsatzstelle.Children.Add(new PlatzhalterDC { Bezeichnung = "Institution", Platzhalter = "ESInstitution", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC { Bezeichnung = "Anrede", Platzhalter = "ESAnrede", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC { Bezeichnung = "Briefanrede", Platzhalter = "ESBriefanrede", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Vorname", Platzhalter = "ESVorname", FieldName = "Person.FirstName", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Nachname", Platzhalter = "ESNachname", FieldName = "Person.LastName", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "ESStrasse", IconType = "AB", FieldName = "Person.Address.Street" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "ESPLZ", IconType = "AB", FieldName = "Person.Address.PostalCode" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "ESOrt", IconType = "AB", FieldName = "Person.Address.Town" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Telefon", Platzhalter = "ESTelefon", FieldName = "Person.Contacts", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Handy", Platzhalter = "ESHandy", FieldName = "Person.Contacts", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "E-Mail", Platzhalter = "ESEmail", FieldName = "Person.Contacts", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Fax", Platzhalter = "ESFax", FieldName = "Person.Contacts", IconType = "AB" });
vga.Children.Add(einsatzstelle);
PlatzhalterDC betreuung = new PlatzhalterDC()
{
@@ -192,28 +130,13 @@ namespace BeWo.Service.Dokumentverwaltung
personendaten.Children.Add(versicherung);
PlatzhalterDC wohnung = new PlatzhalterDC()
{
Bezeichnung = "Wohnung",
Children = new List<PlatzhalterDC>(),
IconType = "OfficeBulidingBlackDisabled"
};
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Einzugsdatum", Platzhalter = "WVEinzugsdatum", FieldName = "Person.WohneinheitBelegung.StartDate", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auszugsdatum", Platzhalter = "WVAuszugsdatum", FieldName = "Person.WohneinheitBelegung.EndDate", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Einheit", Platzhalter = "WVEinheit", FieldName = "Person.Wohneinheit.Zimmername", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "WVStrasse", FieldName = "Person.Wohneinheit.Address.Street", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "WVPLZ", FieldName = "Person.Wohneinheit.Address.PostalCode", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "WVOrt", FieldName = "Person.Wohneinheit.Address.Town", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Stockwerk", Platzhalter = "WVStock", FieldName = "Person.Wohneinheit.Stock", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Miete", Platzhalter = "WVMiete", FieldName = "Person.Wohneinheit.Miete", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Heizung", Platzhalter = "WVHeizung", FieldName = "Person.Wohneinheit.Heizung", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Strom", Platzhalter = "WVStrom", FieldName = "Person.Wohneinheit.Strom", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Betriebskosten", Platzhalter = "WVBetriebskosten", FieldName = "Person.Wohneinheit.Betriebskosten", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Sonstige Kosten", Platzhalter = "WVSonstigeKosten", FieldName = "Person.Wohneinheit.SonstigeKosten", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Kaution", Platzhalter = "WVKaution", FieldName = "Person.Wohneinheit.Kaution", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Zusatz", Platzhalter = "WVZusatz", FieldName = "Person.Wohneinheit.Zusatznotiz", IconType = "AB" });
personendaten.Children.Add(wohnung);
//if (AppSettings.Show....)
//{
var wpm = new WohnheinPlaceholderManager();
personendaten.Children.AddRange(wpm.GetPlatzhalter());
//}
PlatzhalterDC sonstiges = new PlatzhalterDC()
{
@@ -226,9 +149,7 @@ namespace BeWo.Service.Dokumentverwaltung
sonstiges.Children.Add(datum);
#endregion
var em = new EmployeePlaceholderManager();
liste.AddRange(em.GetPlatzhalter());
liste.Add(personendaten);
//liste.Add(adressdatenOrganisation);
@@ -245,7 +166,7 @@ namespace BeWo.Service.Dokumentverwaltung
public override String GetPlaceholderValue(PlatzhalterDC ph, Object obj)
{
return GetPlaceholderValueForCustomer(ph, obj as Customer);
return GetPlaceholderValueForCustomer(ph, obj as Customer) ?? String.Empty;
}
public String GetPlaceholderValueForCustomer(PlatzhalterDC ph, Customer customer)
@@ -255,6 +176,12 @@ namespace BeWo.Service.Dokumentverwaltung
return String.Empty;
}
if (ph.FieldName != null && ph.FieldName.Contains("CustomerVermittlungArbeit"))
{
var pm = new VgaPlaceholderManager();
return pm.GetPlaceholderValue(ph, customer);
}
if (ph.Platzhalter == "MaVorname" ||
ph.Platzhalter == "MaNachname" ||
ph.Platzhalter == "MaTelefon" ||

20
Service/Dokumentverwaltung/PlaceholderManager.cs
View File

@@ -40,7 +40,10 @@ namespace BeWo.Service.Dokumentverwaltung
//var doc = rtfServer.Document as DevExpress.XtraRichEdit.API.Native.Implementation.NativeDocument;
//var list = rtfServer.Document.FindAll("blablubb", DevExpress.XtraRichEdit.API.Native.SearchOptions.None);
if (platzhalterWert == null)
{
platzhalterWert = String.Empty;
}
foreach (var shape in rtfServer.Document.Shapes)
{
var subdoc = shape.ShapeFormat?.TextBox?.Document;
@@ -69,17 +72,22 @@ namespace BeWo.Service.Dokumentverwaltung
public virtual String GetPlaceholderValue(PlatzhalterDC ph, Object obj)
{
return GetPlaceholderValue(ph.FieldName, obj);
var returnObj = GetPlaceholderValue(ph.FieldName, obj);
if (returnObj != null)
return obj.ToString();
return "";
}
public virtual String GetPlaceholderValue(String fieldName, Object obj)
public virtual Object GetPlaceholderValue(String fieldName, Object obj)
{
var names = fieldName.Split('.');
if (names.Length > 0)
{
var prop = obj.GetType().GetProperty(names[0]);
var name = names[0];
var prop = obj.GetType().GetProperty(names[0]);
if (prop != null)
{
Object newObj = prop.GetValue(obj);
@@ -102,7 +110,7 @@ namespace BeWo.Service.Dokumentverwaltung
}
if (newObj != null)
{
return newObj.ToString();
return newObj;
}
}
@@ -110,7 +118,7 @@ namespace BeWo.Service.Dokumentverwaltung
return "";
return null;
}
public virtual Object GetEntityObject(long oid)

150
Service/Dokumentverwaltung/VgaPlaceholderManager.cs Normal file
View File

@@ -0,0 +1,150 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.DataContracts;
using DevExpress.XtraRichEdit;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media.Imaging;
namespace BeWo.Service.Dokumentverwaltung
{
public class VgaPlaceholderManager : PlaceholderManager
{
public override List<PlatzhalterDC> GetPlatzhalter()
{
List<PlatzhalterDC> liste = new List<PlatzhalterDC>();
PlatzhalterDC vga = new PlatzhalterDC()
{
Bezeichnung = "Vermittlung gemeinnütziger Arbeit",
Children = new List<PlatzhalterDC>(),
IconType = "BoyAndGirl"
};
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "AZ der Staatsanwaltschaft/des Gerichts", Platzhalter = "AktenzeichenGericht", FieldName = "CustomerVermittlungArbeit.AktenzeichenGericht", IconType = "AB"});
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Eigenes Aktenzeichen", Platzhalter = "EigenesAktenzeichen", FieldName = "CustomerVermittlungArbeit.EigenesAktenzeichen", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragseingang", Platzhalter = "Auftragseingang", FieldName = "CustomerVermittlungArbeit.Auftragseingang", IconType = "AB", Format = "dd.MM.yyyy" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragsherkunft", Platzhalter = "Auftragsherkunft", FieldName = "CustomerVermittlungArbeit.Auftragsherkunft.Value", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Vermittlungsgrundlage", Platzhalter = "Vermittlungsgrundlage", FieldName = "CustomerVermittlungArbeit.Vermittlungsgrundlage.Value", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Tagessätze", Platzhalter = "Tagessatze", FieldName = "CustomerVermittlungArbeit.Tagessatze", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Tagessatzhöhe", Platzhalter = "Tagessatzhohe", FieldName = "CustomerVermittlungArbeit.Tagessatzhohe", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Höhe der Geldstrafe", Platzhalter = "HoheDerGeldstrafe", FieldName = "CustomerVermittlungArbeit.HoheDerGeldstrafe", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Zu leistende Arbeitsstunden", Platzhalter = "ZuLeistendeArbeitsstunden", FieldName = "CustomerVermittlungArbeit.ZuLeistendeArbeitsstunden", IconType = "AB", Format = "0.0#" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Hinweis", Platzhalter = "Hinweis", FieldName = "CustomerVermittlungArbeit.Hinweis", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Termin", Platzhalter = "Termin", FieldName = "CustomerVermittlungArbeit.Termin", IconType = "AB", Format = "dd.MM.yyyy" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Bearbeitungsstatus", Platzhalter = "CustomerVermittlungBearbeitungsstatus", FieldName = "CustomerVermittlungArbeit.CustomerVermittlungBearbeitungsstatus", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragsrückgabe", Platzhalter = "Auftragsruckgabe", FieldName = "CustomerVermittlungArbeit.Auftragsruckgabe", IconType = "AB", Format = "dd.MM.yyyy" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Verlauf", Platzhalter = "Verlauf", FieldName = "CustomerVermittlungArbeit.Verlauf.Value", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Abgeleistete Stunden", Platzhalter = "AbgeleisteteStunden", FieldName = "CustomerVermittlungArbeit.AbgeleisteteStunden", IconType = "AB", Format = "0.0#" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ersparte Hafttage", Platzhalter = "ErsparteHafttage", FieldName = "CustomerVermittlungArbeit.ErsparteHafttage", IconType = "AB", Format = "0.##" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Geleistete Ratenzahlung", Platzhalter = "GeleisteteRatenzahlung", FieldName = "CustomerVermittlungArbeit.GeleisteteRatenzahlung", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Geleistete Einmalzahlung", Platzhalter = "GeleisteteEinmalzahlung", FieldName = "CustomerVermittlungArbeit.GeleisteteEinmalzahlung", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Bemerkung", Platzhalter = "Bemerkung", FieldName = "CustomerVermittlungArbeit.Bemerkung", IconType = "AB" });
PlatzhalterDC auftraggeber = new PlatzhalterDC()
{
Bezeichnung = "Auftraggeber",
Children = new List<PlatzhalterDC>(),
IconType = "BoyAndGirl"
};
auftraggeber.Children.Add(new PlatzhalterDC { Bezeichnung = "Institution", Platzhalter = "AGInstitution", FieldName = "CustomerVermittlungArbeit.Auftraggeber.Name", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC { Bezeichnung = "Anrede", Platzhalter = "AGAnrede", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Anrede", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC { Bezeichnung = "Briefanrede", Platzhalter = "AGBriefanrede", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Briefanrede", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Vorname", Platzhalter = "AGVorname", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.FirstName", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Nachname", Platzhalter = "AGNachname", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.LastName", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "AGStrasse", IconType = "AB", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Address.Street" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "AGPLZ", IconType = "AB", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Address.PostalCode" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "AGOrt", IconType = "AB", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Address.Town" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Telefon", Platzhalter = "AGTelefon", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Contacts", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Handy", Platzhalter = "AGHandy", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Contacts", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "E-Mail", Platzhalter = "AGEmail", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Contacts", IconType = "AB" });
auftraggeber.Children.Add(new PlatzhalterDC() { Bezeichnung = "Fax", Platzhalter = "AGFax", FieldName = "CustomerVermittlungArbeit.AuftraggeberAnsprechpartner.Contacts", IconType = "AB" });
vga.Children.Add(auftraggeber);
PlatzhalterDC einsatzstelle = new PlatzhalterDC()
{
Bezeichnung = "Einsatzstelle",
Children = new List<PlatzhalterDC>(),
IconType = "BoyAndGirl"
};
einsatzstelle.Children.Add(new PlatzhalterDC { Bezeichnung = "Institution", Platzhalter = "ESInstitution", FieldName = "CustomerVermittlungArbeit.Einsatzstelle.Name", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC { Bezeichnung = "Anrede", Platzhalter = "ESAnrede", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Anrede", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC { Bezeichnung = "Briefanrede", Platzhalter = "ESBriefanrede", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Briefanrede", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Vorname", Platzhalter = "ESVorname", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.FirstName", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Nachname", Platzhalter = "ESNachname", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.LastName", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "ESStrasse", IconType = "AB", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Address.Street" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "ESPLZ", IconType = "AB", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Address.PostalCode" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "ESOrt", IconType = "AB", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Address.Town" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Telefon", Platzhalter = "ESTelefon", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Contacts", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Handy", Platzhalter = "ESHandy", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Contacts", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "E-Mail", Platzhalter = "ESEmail", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Contacts", IconType = "AB" });
einsatzstelle.Children.Add(new PlatzhalterDC() { Bezeichnung = "Fax", Platzhalter = "ESFax", FieldName = "CustomerVermittlungArbeit.EinsatzstelleAnsprechpartner.Contacts", IconType = "AB" });
vga.Children.Add(einsatzstelle);
liste.Add(vga);
return liste;
}
public override String GetPlaceholderValue(PlatzhalterDC ph, Object obj)
{
return GetPlaceholderValueForCustomer(ph, obj as Customer);
}
public String GetPlaceholderValueForCustomer(PlatzhalterDC ph, Customer customer)
{
if (customer == null)
{
return String.Empty;
}
if (ph.FieldName.Contains("CustomerVermittlungArbeit"))
{
var cva = GetCurrentCustomerVermittlungArbeit(customer);
if (cva != null)
{
return GetPlaceholderValueForCustomerVermittlungArbeit(ph, cva);
}
}
return String.Empty;
}
public String GetPlaceholderValueForCustomerVermittlungArbeit(PlatzhalterDC ph, CustomerVermittlungArbeit cva)
{
if (cva == null)
{
return String.Empty;
}
var value = base.GetPlaceholderValue(ph.FieldName, cva);
if (value != null)
{
return value.ToString();
}
return String.Empty;
}
private CustomerVermittlungArbeit GetCurrentCustomerVermittlungArbeit(Customer customer)
{
return customer.CustomerVermittlungArbeiten.OrderByDescending(a => a.Auftragseingang).FirstOrDefault(a => a.VgaType == VgaTypeEnum.Vga);
}
}
}

207
Service/Dokumentverwaltung/WohnheimPlaceholderManager.cs Normal file
View File

@@ -0,0 +1,207 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.DataContracts;
using DevExpress.XtraRichEdit;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media.Imaging;
namespace BeWo.Service.Dokumentverwaltung
{
public class WohnheinPlaceholderManager : PlaceholderManager
{
public override List<PlatzhalterDC> GetPlatzhalter()
{
List<PlatzhalterDC> liste = new List<PlatzhalterDC>();
PlatzhalterDC wohnung = new PlatzhalterDC()
{
Bezeichnung = "Wohnung",
Children = new List<PlatzhalterDC>(),
IconType = "OfficeBulidingBlackDisabled"
};
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Einzugsdatum", Platzhalter = "WVEinzugsdatum", FieldName = "Person.WohneinheitBelegung.StartDate", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auszugsdatum", Platzhalter = "WVAuszugsdatum", FieldName = "Person.WohneinheitBelegung.EndDate", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Einheit", Platzhalter = "WVEinheit", FieldName = "Person.Wohneinheit.Zimmername", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "WVStrasse", FieldName = "Person.Wohneinheit.Address.Street", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "WVPLZ", FieldName = "Person.Wohneinheit.Address.PostalCode", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "WVOrt", FieldName = "Person.Wohneinheit.Address.Town", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Stockwerk", Platzhalter = "WVStock", FieldName = "Person.Wohneinheit.Stock", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Miete", Platzhalter = "WVMiete", FieldName = "Person.Wohneinheit.Miete", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Heizung", Platzhalter = "WVHeizung", FieldName = "Person.Wohneinheit.Heizung", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Strom", Platzhalter = "WVStrom", FieldName = "Person.Wohneinheit.Strom", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Betriebskosten", Platzhalter = "WVBetriebskosten", FieldName = "Person.Wohneinheit.Betriebskosten", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Sonstige Kosten", Platzhalter = "WVSonstigeKosten", FieldName = "Person.Wohneinheit.SonstigeKosten", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Kaution", Platzhalter = "WVKaution", FieldName = "Person.Wohneinheit.Kaution", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Zusatz", Platzhalter = "WVZusatz", FieldName = "Person.Wohneinheit.Zusatznotiz", IconType = "AB" });
liste.Add(wohnung);
return liste;
}
public override String GetPlaceholderValue(PlatzhalterDC ph, Object obj)
{
return GetPlaceholderValueForCustomer(ph, obj as Customer);
}
public String GetPlaceholderValueForCustomer(PlatzhalterDC ph, Customer customer)
{
if (customer == null)
{
return String.Empty;
}
if (ph.FieldName.Contains("CustomerVermittlungArbeit"))
{
var cva = GetCurrentWohneinheit(customer);
if (cva != null)
{
return GetPlaceholderValue(ph, cva);
}
}
if (ph.Platzhalter == "MaVorname" ||
ph.Platzhalter == "MaNachname" ||
ph.Platzhalter == "MaTelefon" ||
ph.Platzhalter == "MaFax" ||
ph.Platzhalter == "MaEmail" ||
ph.Platzhalter == "MaHandy")
{
var em = new EmployeePlaceholderManager();
return em.GetPlaceholderValueForEmployee(ph, Data.Security.UserRightHelper.GetLoggedInUser().Employee);
}
if (ph.Platzhalter == "KlBriefanrede")
{
if (customer.Person.Sex == Sex.Male)
return "Sehr geehrter Herr";
else if (customer.Person.Sex == Sex.Female)
return "Sehr geehrte Frau";
}
if (ph.Platzhalter == "KlAnrede")
{
if (customer.Person.Sex == Sex.Male)
return "Herr";
else if (customer.Person.Sex == Sex.Female)
return "Frau";
}
if (ph.Platzhalter == "KlVorname")
{
return base.GetPlaceholderValue(ph, customer);
//return customer.Person.FirstName;
}
if (ph.Platzhalter == "KlNachname")
{
return customer.Person.LastName;
}
if (ph.Platzhalter == "KlGeburtsdatum")
{
return String.Format("{0:dd.MM.yyyy}", customer.Person.DateOfBirth);
}
if (ph.Platzhalter == "KlTelefon")
{
foreach (Contact c in customer.Person.Contacts)
{
if (c.Type == ContactType.business_Phone)
{
return c.Value;
}
}
}
if (ph.Platzhalter == "KlHandy")
{
foreach (Contact c in customer.Person.Contacts)
{
if (c.Type == ContactType.business_MobilePhone)
{
return c.Value;
}
}
}
if (ph.Platzhalter == "KlEmail")
{
foreach (Contact c in customer.Person.Contacts)
{
if (c.Type == ContactType.business_Mail)
{
return c.Value;
}
}
}
if (ph.Platzhalter == "KlFax")
{
foreach (Contact c in customer.Person.Contacts)
{
if (c.Type == ContactType.business_Fax)
{
return c.Value;
}
}
}
if (ph.Platzhalter == "KlBeruf")
{
return customer.Person.Profession;
}
//Adressdaten
if (customer.Person.Address != null)
{
if (ph.Platzhalter == "KlStrasse")
{
return customer.Person.Address.Street;
}
if (ph.Platzhalter == "KlPLZ")
{
return customer.Person.Address.PostalCode;
}
if (ph.Platzhalter == "KlOrt")
{
return customer.Person.Address.Town;
}
}
//Betreuung
if (ph.Platzhalter == "KlAnsprechpartner")
{
string anrede = (customer.Ansprechpartner.Sex == 0) ? "Herr " : "Frau ";
return anrede + customer.Ansprechpartner.FirstNameLastName;
}
if (ph.Platzhalter == "Kostenstelle")
{
return customer.CostCenter;
}
//Sonstiges
if (ph.Platzhalter == "Tagesdatum")
{
return String.Format("{0:dd.MM.yyyy}", DateTime.Now);
}
return String.Empty;
}
private WohneinheitBelegung GetCurrentWohneinheit(Customer customer)
{
return DAOFactory.SearchDAO.FindWohneinheitBelegungForCustomer(customer.Oid.Value, DateTime.Now).FirstOrDefault();
}
}
}

2
Service/Import/AvisImport/LvrAvisTextReader.cs
View File

@@ -72,7 +72,7 @@ namespace BeWo.Service.Import.AvisImport
//Die Bereiche werden immer mit dem Aktenzeichen abgeschlossen. Nimm also alle Zeilen bis obiges Aktenzeichen erneut gefunden wird.
if (line.Contains(aktenzeichen))
if (line.Contains(aktenzeichen) && !line.Contains("Endabr")) //CB, 08.09.2025: Wurde in einem neuen Fall fälschlicherweise als Ende gefunden, weil das Aktenzeichen in der Endabrechnungs Postition mit aufgeführt war. In diesem Fall von Frau Behrend: "SL 35/2025 Endabr. Behrend 2100444891"
{
endeBereich = true;
bereich.GesamtText = textBereich.ToString();

4
Service/Plugins/PluginLoader.cs
View File

@@ -120,7 +120,7 @@ namespace BeWo.Service.Plugins
//t = "3536719736"; // BeWo Stefanie Schäfer (BeWoKerpen)
//t = "7739670213"; // SPZ Leverkusen
//t = "3341456098"; // Hilfe Daheim (früher BeWo Schillinger)
//t = "4271389563"; // Komm Mit
t = "4271389563"; // Komm Mit
//t = "5430005891"; // Marienhospital Eickel
//t = "3265049248"; // Gerdas Pflegedienst
//t = "1549622397"; // Kontakt und Krisenhilfe
@@ -232,7 +232,7 @@ namespace BeWo.Service.Plugins
//t = "6782533512"; // LH Dorsten
//t = "5890882255"; // Fortis Nova
//t = "2422863972"; // Diakonisches Werk Mülheim (Therapeutische Wohngemeinschaft)
//t = "2141858509"; // INKOMM GmbH
t = "2141858509"; // INKOMM GmbH
//t = "8975059766"; // Quer-Fällt-Ein
//t = "8928179244"; // ASB Ruhr e.V. Regionalverband
//t = "4423043131"; // Die Perspektive e.V.

5
Service/Service.csproj
View File

@@ -44,7 +44,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>CS0659, CS0162, CS0168, CS0649, CS0219</NoWarn>
@@ -58,6 +58,7 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
@@ -402,6 +403,8 @@
<Compile Include="Dienstplanung\DienstplanungsManager.cs" />
<Compile Include="Dienstplanung\MitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="Dienstplanung\Mitarbeiterstundenkonto.cs" />
<Compile Include="Dokumentverwaltung\WohnheimPlaceholderManager.cs" />
<Compile Include="Dokumentverwaltung\VgaPlaceholderManager.cs" />
<Compile Include="Dokumentverwaltung\EmployeePlaceholderManager.cs" />
<Compile Include="Dokumentverwaltung\PlaceholderManager.cs" />
<Compile Include="Dokumentverwaltung\DokumentManager.cs" />

4
Service/ServiceContracts/ICustomerService.cs
View File

@@ -768,5 +768,9 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactCustomerDC> GetAllActiveCustomersForEmployee(bool fetchReferenceNumbers = false);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
SupportConceptCostBearerRelDC GetSupportConceptCostBearerRelationById(long oid);
}
}

14
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -4147,6 +4147,20 @@ namespace BeWo.Service.ServiceImplementations
return GetAllActiveCustomersCompact(fetchReferenceNumbers, employeeOid).OrderBy(d => d.LastNameFirstName).Where(c => c.IsRelatedToEmployee || !employeeOid.HasValue).ToList();
}
public SupportConceptCostBearerRelDC GetSupportConceptCostBearerRelationById(long oid)
{
try
{
var relation = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(oid);
return MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(relation);
}
catch(Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
private static ApplicationUser GetLoggedInUser()
{
return LoggedInUserOperationContextExt.Current?.User ?? SessionFacade.LoggedInUser;

69
Service/ServiceImplementations/QueryServiceImp.cs
View File

@@ -8,12 +8,14 @@ using System.ServiceModel;
using BeWo.Data;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Data.Security;
using BeWo.Service.Plugins;
using BeWo.Service.ServiceContracts;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using Newtonsoft.Json;
using Utils = BeWo.Service.Core.Utils;
@@ -57,9 +59,76 @@ namespace BeWo.Service.ServiceImplementations
private string CheckAndModifySqlByUserRights(Query lQuery, string sql)
{
var user = UserRightHelper.GetLoggedInUser();
if (sql.Contains(":AllTeamOids"))
{
var liste = GetAllEmployeeTeams(user.Employee);
sql = sql.Replace(":AllTeamOids", string.Join(",", liste.Select(t => t.Oid.Value)));
}
if (sql.Contains(":AllCustomerOids"))
{
var liste = GetEmployeeCustomerOids(user.Employee);
sql = sql.Replace(":AllCustomerOids", string.Join(",", liste));
}
if (sql.Contains(":AllTeamCustomerOids"))
{
var liste = GetTeamRelatedCustomerOids(user.Employee);
sql = sql.Replace(":AllTeamCustomerOids", string.Join(",", liste));
}
return sql;
}
public List<long> GetTeamRelatedCustomerOids(Employee emp)
{
var result = new List<long>();
var teams = GetAllEmployeeTeams(emp);
teams.DoForEach(team =>
{
team.MemberList.Where(member => member.Oid.HasValue && member.Oid != emp.Oid.Value).DoForEach(member =>
{
// Nur, wo der Klient auch vom Team betreut wird
result.AddRangeIfElementsNotIn(
member.Employee2CustomerList.Where(
employee2Customer => employee2Customer.CustomerOid.HasValue &&
employee2Customer.Customer.Team2CustomerList.Any(team2Customer => team2Customer.TeamOid.HasValue)
).Select(employee2Customer => employee2Customer.CustomerOid.Value)
);
});
});
return result;
}
public List<long> GetEmployeeCustomerOids(Employee emp)
{
var result = new List<long>();
result.AddRangeIfElementsNotIn(
emp.Employee2CustomerList.Where(
employee2Customer => employee2Customer.CustomerOid.HasValue &&
employee2Customer.Customer.Team2CustomerList.Any(team2Customer => team2Customer.TeamOid.HasValue)
).Select(employee2Customer => employee2Customer.CustomerOid.Value)
);
return result;
}
private List<Team> GetAllEmployeeTeams(Employee emp)
{
var teams = new List<Team>();
teams.AddRange(DAOFactory.SearchDAO.FindLeadingTeams(emp.Oid.Value));
teams.AddRange(DAOFactory.SearchDAO.FindTeamsOfEmployee(emp.Oid.Value));
return teams;
}
public List<QueryDC> GetAllQueriesOfType(QueryType pType)
{
try

2
Shared/Core/Utils.cs
View File

@@ -950,7 +950,7 @@ namespace BS.Shared.Core
public static string GetSexAbbrevation(Sex? sex)
{
switch (sex)
switch(sex)
{
case Sex.Male:
return "m";

2
Shared/DataContracts/PlatzhalterDC.cs
View File

@@ -15,6 +15,8 @@ namespace BS.Shared.DataContracts
public string IconType { get; set; } // Typ, der über das geladene Bild ausgesucht wird
public List<PlatzhalterDC> Children { get; set; }
public string Format { get; set; } // z.B. "dd.MM.yyyy" bei Datumsfeldern
public override string ToString()
{
return Bezeichnung;

4
Shared/Extensions/DateTimeExtensions.cs
View File

@@ -741,11 +741,11 @@ namespace BS.Shared.Extensions
var hour = int.Parse(hour2Minute[0]);
var minute = int.Parse(hour2Minute[1]);
date.MergeDateWithHoursMinutesSeconds(hour, minute, 0);
date = date.MergeDateWithHoursMinutesSeconds(hour, minute, 0);
}
else if(useSecond1IfNoValidTimeString)
{
date.MergeDateWithHoursMinutesSeconds(0, 0, 1);
date = date.MergeDateWithHoursMinutesSeconds(0, 0, 1);
}
return date;

5
Shared/Extensions/StringExtensions.cs
View File

@@ -34,10 +34,7 @@ namespace BS.Shared.Extensions
public static List<string> Split(this string pString, string pSeparator)
{
if(pString == null)
return new List<string>();
return pString.Split(new[] { pSeparator }, StringSplitOptions.RemoveEmptyEntries).ToList();
return pString is null ? new List<string>() : pString.Split(new[] { pSeparator }, StringSplitOptions.RemoveEmptyEntries).ToList();
}
public static IEnumerable<KeyValuePair<string, string>> SplitToKeyValuePairList(this string pString, string pSeparator1, string pSeperator2)

Some files were not shown because too many files have changed in this diff Show More