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

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Christian
2023-11-08 00:34:23 +01:00
parent 5206ae0cf1 d6720faa2d
commit e9b57fe4c6
55 changed files with 13846 additions and 12917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -5090,6 +5090,9 @@
<ItemGroup>
<Content Include="Views\Customer\CustomerBargeldkassen.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Customer\CustomerAbsenceTimeFormPartial.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

2
BeWoPlanerMobil/Controllers/CustomerController.cs
View File

@@ -94,6 +94,8 @@ namespace BeWoPlanerMobil.Controllers
{
Model.ReportTypes = new List<CustomerReportType> { CustomerReportType.Medikamentenliste, CustomerReportType.Bedarfsmedikation, CustomerReportType.Historie };
}
Model.AllAbsenceReasons = AbstractModel.HasRightToViewCustomerAbsenceTimes ? CustomerService.GetAllAbsenceReasons() : new List<AbsenceReasonDC>();
}
[Authorize]

9
BeWoPlanerMobil/Controllers/ReportViewerController.cs
View File

@@ -8,6 +8,7 @@ using BeWoPlanerMobil.Models;
using BeWoPlanerMobil.Service;
using BeWoPlanerMobil.Util;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWoPlanerMobil.Controllers
@@ -99,7 +100,6 @@ namespace BeWoPlanerMobil.Controllers
Model.Queries = QueryService.GetAllQueriesOfType(QueryType.Public);
return View(Model);
}
@@ -121,6 +121,8 @@ namespace BeWoPlanerMobil.Controllers
var selectedQuery = Model.Queries.FirstOrDefault(query => query.Oid.Equals(reportOid.Value));
var queryParameter = selectedQuery?.Parameter ?? new List<QueryParamDC>();
if (selectedQuery is null)
{
Model.Report = null;
@@ -137,12 +139,13 @@ namespace BeWoPlanerMobil.Controllers
}
QueryService.PrepareQueryReport(test, dcid);
Model.Report = Model.ReportCreator.CreateQueryReport(selectedQuery.Oid, dcid);
var queryReport = Model.ReportCreator.CreateQueryReport(selectedQuery.Oid, dcid);
Model.Report = queryReport;
}
catch (Exception e)
{
Log.Error(e);
TempData["ErrorMessage"] = e.Message;
}
return PartialView("DocumentWebViewerPartial", Model);

29
BeWoPlanerMobil/Models/CustomerModel.cs
View File

@@ -133,5 +133,34 @@ namespace BeWoPlanerMobil.Models
public string ReportName { get; set; }
public List<BargeldkassenDC> Bargeldkassen { get; set; }
[Display(Name = "Kategorie")]
public long? SelectedAbsenceReason { get; set; }
public List<AbsenceReasonDC> AllAbsenceReasons { get; set; }
public List<SelectListItem> AbsenceReasonItems
{
get
{
var result = new List<SelectListItem>();
foreach(var absenceReason in AllAbsenceReasons)
{
if(absenceReason.AbsenceReasonOid is null)
{
continue;
}
result.Add(new SelectListItem
{
Value = absenceReason.AbsenceReasonOid.Value.ToString(),
Text = absenceReason.Description
});
}
return result;
}
}
}
}

29
BeWoPlanerMobil/Views/Customer/Customer.cshtml
View File

@@ -977,7 +977,7 @@
@if(Html.IsInDebugMode() && AbstractModel.HasRightToViewCustomerAbsenceTimes)
{
<div class="col-12 my-3">
<div class="card w-100 h-100">
<div class="card w-100 h-100 bg-bewo-dev">
<div class="card-header" onclick="cardHeaderClick('#chevron-customer-absencetimes', '#collapse-customer-absencetimes')">
<div class="d-inline-flex">
<i class="fas fa-chevron-down h-100 text-bewo-customer-card-header" id="chevron-customer-absencetimes"></i>
@@ -988,8 +988,11 @@
</button>
</div>
</div>
<!-- ToDo: Formular-Partial anlegen! -->
<div class="collapse" id="collapse-customer-absencetimes">
<div class="card-body">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#customer-absence-times-form-popup" onclick="calcAbsenceTimePrependWidth()"></button>
<hr />
@Html.Partial("CustomerAbsenceTimePartial", Model)
</div>
</div>
@@ -1002,6 +1005,30 @@
}
</div>
@if(Html.IsInDebugMode() && AbstractModel.HasRightToViewCustomerAbsenceTimes)
{
<!-- ToDo: Popup für Abwesenheitsformular -->
<div class="modal" tabindex="-1" role="dialog" id="customer-absence-times-form-popup">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Abwesenheit hinzufügen</h5>
<button class="close" type="button" data-dismiss="modal" aria-label="close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body" id="modal-body">
@Html.Partial("CustomerAbsenceTimeFormPartial", Model)
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="button" data-dismiss="modal" onclick="submitCustomerAbsenceTimesForm()">OK</button>
<button class="btn btn-secondary" type="button" data-dismiss="modal" onclick="clearCustomerAbsenceTimesForm()">Abbrechen</button>
</div>
</div>
</div>
</div>
}
@if(!(Model?.Report is null) && Html.IsInDebugMode())
{
<div class="modal modal-fullscreen" tabindex="-1" role="dialog" id="report-popup">

179
BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimeFormPartial.cshtml Normal file
View File

@@ -0,0 +1,179 @@
@using BeWoPlanerMobil.Models;
@using BeWoPlanerMobil.Util
@using BS.Shared
@model CustomerModel
@*
ToDos:
1. Formularvalidierung mittels Klassen und Bootstrap
2. Ganztagsfunktionalität einbauen
3. Controller-Funktionen implementieren:
1. Bearbeiten einer existierenden Abwesenheit
2. Anlegen einer neuen Abwesenheit
*@
<script type="text/javascript">
$(function () {
$("#customer-absence-time-start-date-picker, #customer-absence-time-end-date-picker").datetimepicker({
locale: "de",
format: "L"
});
$("#customer-absence-time-start-time-picker, #customer-absence-time-end-time-picker").datetimepicker({
locale: "de",
format: "LT"
});
});
var initialDatePrependWidth = 0;
function calcAbsenceTimePrependWidth() {
try {
setTimeout(function() {
if (initialDatePrependWidth <= 0 && $.isNumeric(getMaxWidth("customer-absence-time-prepend"))) {
initialDatePrependWidth = getMaxWidth("customer-absence-time-prepend");
}
if (initialDatePrependWidth <= 0) {
return;
}
logInfo2(`max width: ${getMaxWidth("customer-absence-time-prepend")}`);
$(".customer-absence-time-prepend").width(getMaxWidth("customer-absence-time-prepend"));
});
} catch (error) {
showErrorPopup(error);
}
}
function submitCustomerAbsenceTimesForm() {
try {
} catch (error) {
showErrorPopup(error);
}
}
function clearCustomerAbsenceTimesForm() {
try {
} catch (error) {
showErrorPopup(error);
}
}
</script>
<div class="form-row">
<div class="col-lg">
<div class="form-group my-2">
<div class="input-group date" id="customer-absence-time-start-date-picker" data-target-input="nearest">
<div class="input-group-prepend">
<div class="input-group-text customer-absence-time-prepend">
Startdatum
</div>
</div>
<input type="text" id="customer-absence-time-start-date" name="Datum" class="form-control datetimepicker-input" data-target="#customer-absence-time-start-date-picker" data-toggle="datetimepicker" />
<div class="input-group-append" data-target="#customer-absence-time-start-date-picker" data-toggle="datetimepicker">
<div class="input-group-text px-2">
<i class="fas fa-calendar-alt"></i>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg">
<div class="form-group my-2">
<div class="input-group date" id="customer-absence-time-end-date-picker" data-target-input="nearest">
<div class="input-group-prepend">
<div class="input-group-text customer-absence-time-prepend">
Enddatum
</div>
</div>
<input type="text" id="customer-absence-time-end-date" name="Enddatum" class="form-control datetimepicker-input" data-target="#customer-absence-time-end-date-picker" data-toggle="datetimepicker" />
<div class="input-group-append" data-target="#customer-absence-time-end-date-picker" data-toggle="datetimepicker">
<div class="input-group-text px-2">
<i class="fas fa-calendar-alt"></i>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="col-lg">
<div class="form-group my-2">
<div class="input-group date" id="customer-absence-time-start-time-picker" data-target-input="nearest">
<div class="input-group-prepend">
<div class="input-group-text customer-absence-time-prepend">
Von
</div>
</div>
<input type="text" id="customer-absence-time-start-time" name="Start" class="form-control datetimepicker-input" data-target="#customer-absence-time-start-time-picker" />
<div class="input-group-append" data-target="#customer-absence-time-start-time-picker" data-toggle="datetimepicker">
<div class="input-group-text px-2">
<i class="fas fa-clock"></i>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg">
<div class="form-group my-2">
<div class="input-group date" id="customer-absence-time-end-time-picker" data-target-input="nearest">
<div class="input-group-prepend">
<div class="input-group-text customer-absence-time-prepend">
Bis
</div>
</div>
<input type="text" id="customer-absence-time-end-time" name="Ende" class="form-control datetimepicker-input" data-target="#customer-absence-time-end-time-picker" />
<div class="input-group-append" data-target="#customer-absence-time-end-time-picker" data-toggle="datetimepicker">
<div class="input-group-text px-2">
<i class="fas fa-clock"></i>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md">
<div class="custom-control custom-checkbox custom-control-inline">
<input type="checkbox" class="custom-control-input" name="allday-cb" id="customer-absence-time-allday-cb" />
<label class="custom-control-label" for="customer-absence-time-allday-cb">Ganztäglich</label>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md">
<div class="form-group my-2">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text customer-absence-time-prepend">
Kategorie
</div>
</div>
@Html.DropDownListFor(m => m.SelectedAbsenceReason, Model.AbsenceReasonItems, new { @class = "custom-select", Id = "absence-reason-select" })
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md">
<div class="form-group mb-1">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text customer-absence-time-prepend">
Erläuterung
</div>
</div>
<textarea class="form-control" id="notice" name="Notice" maxlength="1024" ></textarea>
</div>
</div>
</div>
</div>

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

@@ -1 +1,22 @@
<p>Hier wird f&uuml;r Sie gebaut!</p>
@using BeWoPlanerMobil.Models;
@using BS.Shared.Extensions
@model CustomerModel
<script type="text/javascript">
</script>
@foreach(var absenceTime in Model.SelectedCustomer.AbsenceTimes)
{
if(absenceTime.Start is null)
{
continue;
}
@*
ToDo: Startdatum und -zeit, Enddatum und -zeit, Kategorie, Erläuterung
*@
}

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

@@ -216,7 +216,7 @@
</div>
</div>
<!-- Einzelbuchung: Startdatum -->
<!-- Einzelbuchung: Startdatum und gegebenenfalls Enddatum -->
<div class="form-row">
<div class="col-md">
<div class="form-group my-2">

9
BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml
View File

@@ -1,5 +1,4 @@
@using BeWoPlanerMobil.Util
@model BeWoPlanerMobil.Models.ReportViewerModel
@model BeWoPlanerMobil.Models.ReportViewerModel
<script>
$(window).ready(function () {
@@ -17,6 +16,7 @@
}
}
// ToDo: Nicht hier laden, sondern nur, wenn keine weiteren Variablen benötigt werden!
function loadCustomReport() {
try {
var selectedReportOid = $("#msk-customReportSelect").val();
@@ -50,12 +50,12 @@
<div class="container-fluid my-3">
<div class="row h-auto" id="abc-def">
<div class="col-sm-12 col-md-4 col-lg-4 col-xl-3">
@*<div class="row">
<div class="row">
<div class="col">
@Html.DropDownListFor(model => model.SelectedReportType, Model.ReportTypes, new { @class = "custom-select", onchange = "updateForm()", id = "msk-report-type-select" })
<hr />
</div>
</div>*@
</div>
<div class="row">
<div class="col" id="msk-form-col">
@Html.Partial("ReportViewerFormPartial", Model)
@@ -69,5 +69,4 @@
}
</div>
</div>
</div>

2
BeWoPlanerMobil/Views/ReportViewer/ReportViewerFormPartial.cshtml
View File

@@ -1,9 +1,7 @@
@using BeWoPlanerMobil.Models
@using BeWoPlanerMobil.Util
@model BeWoPlanerMobil.Models.ReportViewerModel
<script type="text/javascript">
// ToDo:
function reportFilterOnChange() {
try {
//team oder mitarbeiter

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

@@ -494,7 +494,6 @@
</div>
}
@RenderBody()
</body>
</html>

93
Data/Access/SearchDAO.cs
View File

@@ -5531,15 +5531,28 @@ namespace BeWo.Data.Access
return list.ToList();
}
/// <summary>
/// VERALTET! FindMostRecentSignatureStatusInfoByServiceRecordOid benutzen!
/// </summary>
/// <param name="serviceRecordOid"></param>
/// <returns></returns>
public ServiceRecordHistory FindMostRecentServiceRecordHistoryEntryByServiceRecordOid(long serviceRecordOid)
{
var criteira = CreateCriteria<ServiceRecordHistory>()
.Add(Restrictions.Eq(nameof(ServiceRecordHistory.ServiceRecordOid), serviceRecordOid))
.AddOrder(Order.Desc(nameof(ServiceRecordHistory.InsTs)));
try
{
var criteira = CreateCriteria<ServiceRecordHistory>()
.Add(Restrictions.Eq(nameof(ServiceRecordHistory.ServiceRecordOid), serviceRecordOid))
.AddOrder(Order.Desc(nameof(ServiceRecordHistory.InsTs)));
return criteira.List<ServiceRecordHistory>().FirstOrDefault();
return criteira.List<ServiceRecordHistory>().FirstOrDefault();
}
catch(Exception e)
{
return null;
}
}
// ToDo: Veraltet und wird nicht mehr benutzt!
public Dictionary<long, ServiceRecordHistory> FindMostRecentServiceRecordHistoryEntryByServiceRecords(List<long> serviceRecordOids)
{
var criteria = CreateCriteria<ServiceRecordHistory>()
@@ -5619,5 +5632,77 @@ namespace BeWo.Data.Access
return criteria.List<ServiceRecord>().ToList();
}
public SignatureStateInfoFromServiceRecordHistoryEntry FindMostRecentSignatureStatusInfoByServiceRecordOid(long serviceRecordOid)
{
var sqlQuery = Session.CreateSQLQuery($"SELECT * FROM ServiceRecordHistory WHERE ServiceRecordOid = {serviceRecordOid} ORDER BY InsTs DESC LIMIT 1")
.AddScalar("CustomerConfirmationReceiptSignatureStateType", NHibernateUtil.Int32)
.AddScalar("EmployeeConfirmationReceiptSignatureStateType", NHibernateUtil.Int32)
.AddScalar("ServiceRecordSignatureStateType", NHibernateUtil.Int32)
.AddScalar("CustomerConfirmationReceiptSignatureOid", NHibernateUtil.Int64)
.AddScalar("EmployeeConfirmationReceiptSignatureOid", NHibernateUtil.Int64);
var objectsList = sqlQuery.List<object[]>().ToList();
var row = objectsList.FirstOrDefault();
if(row is null || row.Length != 5)
{
return null;
}
var customerConfirmationReceiptSignatureState = (SignatureStateType)row[0];
var employeeConfirmationReceiptSignatureState = (SignatureStateType)row[1];
var serviceRecordSignatureStateType = (SignatureStateType)row[2];
var customerConfirmationReceiptSignatureOid = (long?)row[3];
var employeeConfirmationReceiptSignatureOid = (long?)row[4];
return new SignatureStateInfoFromServiceRecordHistoryEntry(customerConfirmationReceiptSignatureState, employeeConfirmationReceiptSignatureState, serviceRecordSignatureStateType, customerConfirmationReceiptSignatureOid, employeeConfirmationReceiptSignatureOid);
}
public Dictionary<long, SignatureStateInfoFromServiceRecordHistoryEntry> FindMostRecentSignatureStatusInfoByServiceRecords(List<long> serviceRecordOids)
{
var result = new Dictionary<long, SignatureStateInfoFromServiceRecordHistoryEntry>();
if(serviceRecordOids is null || serviceRecordOids.Count == 0)
{
return result;
}
var sqlQuery = Session.CreateSQLQuery($"SELECT * FROM servicerecordhistory WHERE ServiceRecordOid IN ({serviceRecordOids.Aggregate(string.Empty, (current, item) => current + $"{item},").TrimEnd(',')}) ORDER BY InsTs DESC")
.AddScalar("ServiceRecordOid", NHibernateUtil.Int64)
.AddScalar("CustomerConfirmationReceiptSignatureStateType", NHibernateUtil.Int32)
.AddScalar("EmployeeConfirmationReceiptSignatureStateType", NHibernateUtil.Int32)
.AddScalar("ServiceRecordSignatureStateType", NHibernateUtil.Int32)
.AddScalar("CustomerConfirmationReceiptSignatureOid", NHibernateUtil.Int64)
.AddScalar("EmployeeConfirmationReceiptSignatureOid", NHibernateUtil.Int64);
var objectsList = sqlQuery.List<object[]>().ToList();
foreach(var obj in objectsList)
{
if(obj?.Length != 6)
{
continue;
}
var serviceRecordOid = (long?)obj[0];
if(serviceRecordOid is null || result.ContainsKey(serviceRecordOid.Value))
{
continue;
}
var customerConfirmationReceiptSignatureState = (SignatureStateType)obj[1];
var employeeConfirmationReceiptSignatureState = (SignatureStateType)obj[2];
var serviceRecordSignatureStateType = (SignatureStateType)obj[3];
var customerConfirmationReceiptSignatureOid = (long?)obj[4];
var employeeConfirmationReceiptSignatureOid = (long?)obj[5];
result.AddIfNotIn(new KeyValuePair<long, SignatureStateInfoFromServiceRecordHistoryEntry>(serviceRecordOid.Value, new SignatureStateInfoFromServiceRecordHistoryEntry(customerConfirmationReceiptSignatureState, employeeConfirmationReceiptSignatureState, serviceRecordSignatureStateType, customerConfirmationReceiptSignatureOid, employeeConfirmationReceiptSignatureOid)));
}
return result;
}
}
}

1
Data/Data.csproj
View File

@@ -382,6 +382,7 @@
<Compile Include="UpdInsInterceptor.cs" />
<Compile Include="Utils\AppointmentSearchResult.cs" />
<Compile Include="Utils\IntervalFinderHelper.cs" />
<Compile Include="Utils\SignatureStateInfoFromServiceRecordHistoryEntry.cs" />
<Compile Include="WCFHibernateSessionManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

23
Data/Utils/SignatureStateInfoFromServiceRecordHistoryEntry.cs Normal file
View File

@@ -0,0 +1,23 @@
using BS.Shared;
namespace BeWo.Data.Utils
{
public class SignatureStateInfoFromServiceRecordHistoryEntry
{
public SignatureStateType CustomerConfirmationReceiptSignatureStateType { get; }
public SignatureStateType EmployeeConfirmationReceiptSignatureStateType { get; }
public SignatureStateType ServiceRecordSignatureStateType { get; }
public long? CustomerConfirmationReceiptSignatureOid { get; }
public long? EmployeeConfirmationReceiptSignatureOid { get; }
public SignatureStateInfoFromServiceRecordHistoryEntry(SignatureStateType customerConfirmationReceiptSignatureStateType, SignatureStateType employeeConfirmationReceiptSignatureStateType, SignatureStateType serviceRecordSignatureStateType, long? customerConfirmationReceiptSignatureOid, long? employeeConfirmationReceiptSignatureOid)
{
CustomerConfirmationReceiptSignatureStateType = customerConfirmationReceiptSignatureStateType;
EmployeeConfirmationReceiptSignatureStateType = employeeConfirmationReceiptSignatureStateType;
ServiceRecordSignatureStateType = serviceRecordSignatureStateType;
CustomerConfirmationReceiptSignatureOid = customerConfirmationReceiptSignatureOid;
EmployeeConfirmationReceiptSignatureOid = employeeConfirmationReceiptSignatureOid;
}
}
}

4
Model/Changes_2023_10_25_ServiceRecordHistory SignatureStates.txt
View File

@@ -1,3 +1 @@
ALTER TABLE servicerecordhistory ADD COLUMN `CustomerConfirmationReceiptSignatureStateType` int DEFAULT 0;
ALTER TABLE servicerecordhistory ADD COLUMN `EmployeeConfirmationReceiptSignatureStateType` int DEFAULT 0;
ALTER TABLE servicerecordhistory ADD COLUMN `ServiceRecordSignatureStateType` int DEFAULT 0;
ALTER TABLE servicerecordhistory ADD COLUMN `CustomerConfirmationReceiptSignatureStateType` int DEFAULT 0, ADD COLUMN `EmployeeConfirmationReceiptSignatureStateType` int DEFAULT 0, ADD COLUMN `ServiceRecordSignatureStateType` int DEFAULT 0;

22
ReportImp/AWOMuensterlandRecklinghausen/Export/DiamantExporter.cs
View File

@@ -34,7 +34,7 @@ namespace AWOMuensterlandRecklinghausen.Export
public static String GetAbrechnungenString(DateTime date)
{
StringBuilder sb = new StringBuilder();
var s = GetMonatlicheAbrechnungLvrString(date);
var s = GetMonatlicheAbrechnungString(date);
if (!String.IsNullOrWhiteSpace(s))
{
sb.Append(s);
@@ -47,7 +47,7 @@ namespace AWOMuensterlandRecklinghausen.Export
return sb.ToString();
}
public static String GetMonatlicheAbrechnungLvrString(DateTime date)
public static String GetMonatlicheAbrechnungString(DateTime date)
{
// Export enthält Rechnungsangaben Zeilen (Zeile F) und Kostenstellen/Rechnungspositionsangaben (Zeile K) in zwei Zeilen
// Kommen aus Export in einer Zeile und werden hier getrennt, falls die Rechnung mehrere Positionen hat
@@ -77,7 +77,21 @@ namespace AWOMuensterlandRecklinghausen.Export
for (int i = startIdx; i < row.ItemArray.Length; i++)
{
var item = row[i];
if (i == 15)
if (i == 10)
{
string belegnr = item.ToString();
if (belegnr.Contains("Storno"))
{
sb.Append(String.Format("{0}", belegnr).Replace(" Storno", ""));
sb.Append(";");
}
else
{
sb.Append(item);
sb.Append(";");
}
}
else if (i == 15)
{
decimal betrag = ErzeugeBetrag(item);
if (betrag != 0)
@@ -200,7 +214,7 @@ c.DebitorNumber,
null,
null,
Round(sip.Claim, 2) AS 'Betrag',
CONCAT(p.`LastName`, ', ', p.`FirstName`, ' Abrechnung :PeriodeSlash ') as 'Verwendung',
CONCAT(p.`LastName`, ', ', p.`FirstName`, ' :PeriodeSlash ') as 'Verwendung',
null, null, 'EUR',
'K', 0, ii.UnitDescription, null, null, null, null, null, ii.AmountTotal
FROM

7
ReportImp/AWOMuensterlandRecklinghausen/StatusCheckAbrechnung.cs
View File

@@ -30,8 +30,11 @@ namespace AWOMuensterlandRecklinghausen
{
scRo.Custom1 = GetTeam(scRo);
// Customer c = DAOFactory.GenericDAO.LoadByID<Customer>(scro.Costbearer2Supportconcept.SupportConcept.Customer.CustomerOid);
var serviceRecordOids = scRo.ServiceRecords.Select(s => (long)s.ServiceRecordOid).ToList();
if(scRo.Costbearer2Supportconcept.SupportConcept.Customer.LastNameFirstName.Contains("Alkhodr"))
{
scRo.Custom1 = scRo.Custom1;
}
var serviceRecordOids = scRo.ServiceRecords.Where(s => s.Start.Value.Date >= start.Date && s.Start.Value.Date <= end.Date).Select(s => (long)s.ServiceRecordOid).ToList();
var customerSignature = DAOFactory.SearchDAO.GetConfirmationReceiptSignatureForServiceRecords(serviceRecordOids, SignatureType.Customer);
if (!(customerSignature?.SignatureImage is null))

26
ReportImp/AsbRheinErftDuerenSBD/SbdRechnung.cs
View File

@@ -104,19 +104,19 @@ namespace AsbRheinErftDuerenSBD
prozentZuschlag = ii.RateFactor;
prozentZuschlag = prozentZuschlag.Replace(",00%", "%");
}
else
{
if (i == 0)
{
stundenAnzahl = ii.UnitCount ?? 0;
stundenSatz = ii.AmountPerUnit ?? 0;
}
else if (i == 1)
{
stundenAnzahl2 = ii.UnitCount ?? 0;
stundenSatz2 = ii.AmountPerUnit ?? 0;
}
}
//else
//{
// if (i == 0)
// {
// stundenAnzahl = ii.UnitCount ?? 0;
// stundenSatz = ii.AmountPerUnit ?? 0;
// }
// else if (i == 1)
// {
// stundenAnzahl2 = ii.UnitCount ?? 0;
// stundenSatz2 = ii.AmountPerUnit ?? 0;
// }
//}
}
}
}

18
ReportImp/AwoDortmund/SonderFinanzauswertung.cs
View File

@@ -44,15 +44,15 @@ namespace BeWo.Report.DefaultReports
if (start.Year != end.Year || start.Month != end.Month)
lastMonth.StartDateTime = new DateTime(end.Year, end.Month, 1);
}
if (pRO.RateFactor.HasValue)
{
cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor);
}
else
{
cellRateFactorHeader.Visible = false;
cellRateFactor.Visible = false;
}
//if (pRO.RateFactor.HasValue)
//{
// cellRateFactorHeader.Text = String.Format("geleistete Std. x {0:0.##}", pRO.RateFactor);
//}
//else
//{
// cellRateFactorHeader.Visible = false;
// cellRateFactor.Visible = false;
//}
if (pRO.SupportConceptFinanceList != null)
{

109
ReportImp/AwoDortmund/SonderFinanzauswertung.designer.cs generated
View File

@@ -34,6 +34,7 @@ namespace BeWo.Report.DefaultReports
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 xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -77,7 +78,6 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
@@ -90,6 +90,10 @@ namespace BeWo.Report.DefaultReports
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -125,7 +129,7 @@ namespace BeWo.Report.DefaultReports
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(736F, 25F);
this.xrTable2.SizeF = new System.Drawing.SizeF(766F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
@@ -142,6 +146,7 @@ namespace BeWo.Report.DefaultReports
this.cellBewilligteFLSImBereich,
this.cellGeleistetImBereich,
this.cellRateFactor,
this.xrTableCell11,
this.xrTableCell8,
this.xrTableCell26});
this.xrTableRow2.Name = "xrTableRow2";
@@ -157,14 +162,14 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell31.Summary = xrSummary1;
this.xrTableCell31.Text = "1\r\n";
this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell31.Weight = 0.21270309701400902D;
this.xrTableCell31.Weight = 0.13293944920232709D;
//
// xrTableCell30
//
this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.Custom1")});
this.xrTableCell30.Name = "xrTableCell30";
this.xrTableCell30.Weight = 0.24372226596051094D;
this.xrTableCell30.Weight = 0.23485968780368371D;
//
// xrTableCell6
//
@@ -181,7 +186,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Mitarbeiter/in";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 0.44313159214105335D;
this.xrTableCell7.Weight = 0.39881844534855082D;
//
// cellBewilligteFLSImBereich
//
@@ -201,7 +206,7 @@ namespace BeWo.Report.DefaultReports
this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.cellGeleistetImBereich.Weight = 0.33234861340684646D;
this.cellGeleistetImBereich.Weight = 0.3323486134068464D;
//
// cellRateFactor
//
@@ -211,7 +216,7 @@ namespace BeWo.Report.DefaultReports
this.cellRateFactor.StylePriority.UseTextAlignment = false;
this.cellRateFactor.Text = "cellRateFactor";
this.cellRateFactor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.cellRateFactor.Weight = 0.33234820770787077D;
this.cellRateFactor.Weight = 0.3101917690553D;
//
// xrTableCell8
//
@@ -220,7 +225,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell8.Weight = 0.2880356030898143D;
this.xrTableCell8.Weight = 0.288035870620003D;
//
// xrTableCell26
//
@@ -229,7 +234,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.StylePriority.UseTextAlignment = false;
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell26.Weight = 0.42097504346732229D;
this.xrTableCell26.Weight = 0.42097490823432737D;
//
// lblTitel
//
@@ -280,7 +285,7 @@ namespace BeWo.Report.DefaultReports
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(736F, 50F);
this.xrTable1.SizeF = new System.Drawing.SizeF(766F, 50F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -297,6 +302,7 @@ namespace BeWo.Report.DefaultReports
this.cellBewilligtImZeitraumHeader,
this.cellGeleistetImZeitraumHeader,
this.cellRateFactorHeader,
this.xrTableCell10,
this.xrTableCell5,
this.xrTableCell25});
this.xrTableRow1.Name = "xrTableRow1";
@@ -306,13 +312,13 @@ namespace BeWo.Report.DefaultReports
//
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Text = "lfd. Nr.";
this.xrTableCell29.Weight = 0.21270309701400905D;
this.xrTableCell29.Weight = 0.13293943726619231D;
//
// xrTableCell28
//
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "RG Nr.";
this.xrTableCell28.Weight = 0.24372229802479162D;
this.xrTableCell28.Weight = 0.23485966916392315D;
//
// xrTableCell1
//
@@ -326,7 +332,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Kostenträger";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell2.Weight = 0.44313142724068466D;
this.xrTableCell2.Weight = 0.39881828293634203D;
//
// cellBewilligtImZeitraumHeader
//
@@ -334,7 +340,7 @@ namespace BeWo.Report.DefaultReports
this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false;
this.cellBewilligtImZeitraumHeader.Text = "bewilligte FLS";
this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.cellBewilligtImZeitraumHeader.Weight = 0.33234859778033238D;
this.cellBewilligtImZeitraumHeader.Weight = 0.33234859778033243D;
//
// cellGeleistetImZeitraumHeader
//
@@ -350,7 +356,7 @@ namespace BeWo.Report.DefaultReports
this.cellRateFactorHeader.StylePriority.UseTextAlignment = false;
this.cellRateFactorHeader.Text = "geleistete Std. x 1,2";
this.cellRateFactorHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.cellRateFactorHeader.Weight = 0.33234859774842457D;
this.cellRateFactorHeader.Weight = 0.31019202559625331D;
//
// xrTableCell5
//
@@ -358,7 +364,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "€/Stunde";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell5.Weight = 0.28803543821556626D;
this.xrTableCell5.Weight = 0.28803543821556632D;
//
// xrTableCell25
//
@@ -387,7 +393,7 @@ namespace BeWo.Report.DefaultReports
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable3.SizeF = new System.Drawing.SizeF(736F, 25F);
this.xrTable3.SizeF = new System.Drawing.SizeF(766F, 25F);
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UsePadding = false;
@@ -404,6 +410,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell24,
this.xrTableCell12,
this.xrTableCell9,
this.xrTableCell27});
this.xrTableRow3.Name = "xrTableRow3";
@@ -412,12 +419,12 @@ namespace BeWo.Report.DefaultReports
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Weight = 0.21270309701400902D;
this.xrTableCell4.Weight = 0.1329394474502652D;
//
// xrTableCell3
//
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Weight = 0.24372228360791093D;
this.xrTableCell3.Weight = 0.23485965436714035D;
//
// xrTableCell15
//
@@ -426,7 +433,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell15.Weight = 0.65583461506079621D;
this.xrTableCell15.Weight = 0.655834733389667D;
//
// xrTableCell16
//
@@ -434,7 +441,7 @@ namespace BeWo.Report.DefaultReports
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell16.Weight = 0.44313176113805786D;
this.xrTableCell16.Weight = 0.39881827520125057D;
//
// xrTableCell22
//
@@ -462,7 +469,7 @@ namespace BeWo.Report.DefaultReports
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell23.Summary = xrSummary3;
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell23.Weight = 0.33234859597180927D;
this.xrTableCell23.Weight = 0.33234886643779959D;
//
// xrTableCell24
//
@@ -476,14 +483,14 @@ namespace BeWo.Report.DefaultReports
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell24.Summary = xrSummary4;
this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell24.Weight = 0.33234819027283158D;
this.xrTableCell24.Weight = 0.3101923259887992D;
//
// xrTableCell9
//
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell9.Weight = 0.288035718764148D;
this.xrTableCell9.Weight = 0.28803575059184949D;
//
// xrTableCell27
//
@@ -491,11 +498,11 @@ namespace BeWo.Report.DefaultReports
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.StylePriority.UseTextAlignment = false;
xrSummary5.FormatString = "{0:c}";
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell27.Summary = xrSummary5;
xrSummary6.FormatString = "{0:c}";
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell27.Summary = xrSummary6;
this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell27.Weight = 0.4209748242446183D;
this.xrTableCell27.Weight = 0.42097485805286766D;
//
// GroupHeader1
//
@@ -519,10 +526,6 @@ namespace BeWo.Report.DefaultReports
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "xrLabel1";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -542,7 +545,7 @@ namespace BeWo.Report.DefaultReports
//
this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(641.0002F, 25F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(686.0002F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(79.99982F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
@@ -624,7 +627,40 @@ namespace BeWo.Report.DefaultReports
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// Finanzauswertung
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Fehl-kontakte";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell10.Weight = 0.28803543821556632D;
//
// xrTableCell11
//
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan", "{0:n2}")});
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell11.Weight = 0.28803519445502845D;
//
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenFehlkontakteInReportTimeSpan")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseTextAlignment = false;
xrSummary5.FormatString = "{0:0.00}";
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell12.Summary = xrSummary5;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell12.Weight = 0.28803466872787215D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
//
// SonderFinanzauswertung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
@@ -635,7 +671,7 @@ namespace BeWo.Report.DefaultReports
this.bottomMarginBand1,
this.ReportFooter});
this.DataSource = this.bindingSource1;
this.Margins = new System.Drawing.Printing.Margins(55, 36, 50, 30);
this.Margins = new System.Drawing.Printing.Margins(40, 20, 50, 30);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -710,5 +746,8 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
}
}

BIN
ReportImp/ChristopherusHaus/BriefpapierChristopherushaus.docx
View File

Binary file not shown.

BIN
ReportImp/ChristopherusHaus/BriefpapierChristopherushaus.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 105 KiB

3445
ReportImp/ChristopherusHaus/SettlementReport.resx
View File

File diff suppressed because it is too large Load Diff

3445
ReportImp/ChristopherusHaus/SettlementReport2.resx
View File

File diff suppressed because it is too large Load Diff

33
ReportImp/HshCologne/CustomReportCreator.cs
View File

@@ -40,9 +40,38 @@ namespace HshCologne
return CreateServicesOverviewReportForRo(ro, serviceCategoryOid);
}
}
public override XtraReport CreateServiceOverviewReportForCustomers(IList<long> customerOids, int month, int year, long? orgaOid, long? empOid, long? serviceCategoryOid, int startDay, int endDay, bool nurFehlende)
{
var roList = new List<ServicesOverviewRO>();
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
foreach (var coid in customerOids)
{
var ro = ServicesOverviewRO.Create(coid, month, year, true, orgaOid ?? 0, empOid ?? 0, startDay, endDay, serviceCategoryOid);
if (ro != null)
{
roList.Add(ro);
}
}
if (roList.Count > 0)
{
var rootReport = CreateServicesOverviewReportForRo(roList[0], serviceCategoryOid);
rootReport.CreateDocument();
for (int i = 1; i < roList.Count; i++)
{
var lNext = CreateServicesOverviewReportForRo(roList[i], serviceCategoryOid);
lNext.CreateDocument();
rootReport.Pages.AddRange(lNext.Pages);
}
return rootReport;
}
return new XtraReport();
}
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
{
XtraReport report = null;

1
ReportImp/KirschbaumManz/CustomMitarbeiterstundenkontoBerechnung.cs
View File

@@ -12,6 +12,7 @@ namespace KirschbaumManz
{
public override void HandleServiceRecords(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList<ServiceRecord> groupFilteredRecords, Contract contract)
{
groupFilteredRecords = groupFilteredRecords.Where(r => r.ServiceDescription != null && r.ServiceDescription.ServiceCategory.Name != null && !r.ServiceDescription.ServiceCategory.Name.Contains("Arbeitszeit")).ToList();
CorrectOverlappingTimes(groupFilteredRecords.OrderBy(s => s.Start).ToList());
}

3
ReportImp/KirschbaumManz/Validation/ServiceRecordValidator.cs
View File

@@ -17,7 +17,8 @@ namespace KirschbaumManz.Validation
{
public override string[] GetIgnoreCategoriesForOverlappingCheck()
{
return new[] { "Soziotherapie", "Arbeitszeit" };
// return new[] { "Soziotherapie", "Arbeitszeit" };
return new[] { "Arbeitszeit" };
}
}
}

1
ReportImp/LebenshilfeCoburg/LebenshilfeCoburg.csproj
View File

@@ -132,6 +132,7 @@
<DependentUpon>RosterReport.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomDienstplanungsmanager.cs" />
<Compile Include="Service\CustomServiceRecordStatisticFactory.cs" />
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>

21
ReportImp/LebenshilfeCoburg/Service/CustomServiceRecordStatisticFactory.cs Normal file
View File

@@ -0,0 +1,21 @@
using BeWo.Service.Plugins;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LebenshilfeCoburg.Service
{
public class CustomServiceRecordStatisticFactory : ServiceRecordStatisticFactory
{
public override SupportConceptStatisticsDC CreateSupportConceptStatisticsImpl(long costBearer2SupportConceptOid, DateTime statisticsDate, long? ignoreServiceRecordOid)
{
var stat = base.CreateSupportConceptStatisticsImpl(costBearer2SupportConceptOid, statisticsDate, ignoreServiceRecordOid);
stat.PeriodStatistics = stat.PeriodStatistics.OrderByDescending(p => p.SupportConceptApprovalPeriod.StartDate).ToList();
return stat;
}
}
}

212
ReportImp/PflegedienstWessel/Invoicing/CustomInvoiceCreation.cs Normal file
View File

@@ -0,0 +1,212 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Services;
namespace PflegedienstWessel.Invoicing
{
public class CustomAlltagsunterstuetzungsInvoiceCreation : InvoiceCreation
{
private DateTime? accountingPeriodStart = null;
private DateTime? accountingPeriodEnd = null;
// public override void SetInvoiceId(ServiceInvoice invoice)
//{
// invoice.InvoiceBase.InvoiceId = "Alltag";
// invoice.InvoiceBase.InvoiceTypeText = "Alltagsunterstützung";
//}
public override List<ServiceInvoiceDC> GenerateServiceInvoices(long costBearerOid, DateTimeSpan invoicePeriod, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
//bei den weiteren Kostenträgern (außer Persönliches Budget 24 Stunden) wird je eine Rechnung pro Leistungskategorie benötigt
// -> es werden für jeden Kunden pro Kostenträger Rechnungen erstellt und hintereinandergefügt
var invoiceList = new List<ServiceInvoice>();
var invoiceCounter = 0;
var sortedScs = supportConcepts2ServiceRecords.Keys.OrderBy(s => s.Customer.LastNameFirstName).ToList();
foreach (var sc in sortedScs)
{
var serviceRecords = supportConcepts2ServiceRecords[sc];
serviceRecords = serviceRecords.Where(s => !s.ServiceDescription.CategoryName.Contains("Fachleistung")).ToList(); // die sind in Spitzabrechnung
if (sc.CostBearerList.Count > 0)
{
var costBearer = DAOFactory.GenericDAO.LoadByID<CostBearer>(sc.CostBearerList[0].CostBearerOid);
Dictionary<string, List<ServiceRecordDC>> srDict = new Dictionary<string, List<ServiceRecordDC>>();
foreach (var sr in serviceRecords)
{
String key = sr.ServiceDescription.CategoryName;
if (!srDict.ContainsKey(key))
srDict.Add(key, new List<ServiceRecordDC>());
srDict[key].Add(sr);
}
foreach (var catName in srDict.Keys)
{
var list = srDict[catName];
var invoice = CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, sc, list);
if (invoice != null)
{
invoice.InvoiceBase.InvoiceId = "Service";
invoiceList.Add(invoice);
invoiceCounter++;
}
}
}
}
var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList();
return result;
}
public override ServiceInvoice CreateSingleInvoice(int invoiceCounter, CostBearer costBearer, DateTimeSpan invoicePeriod, CompactSupportConceptDC supportConcept, List<ServiceRecordDC> serviceRecords)
{
var i = base.CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, supportConcept, serviceRecords);
if (i != null)
{
var claim = i.GetTotalClaim();
if (!claim.HasValue || claim.Value == 0)
return null;
}
return i;
}
public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod,
IList<CompactSupportConceptDC> supportConceptList)
{
if (invoicePeriod != null)
{
accountingPeriodStart = invoicePeriod.StartDate;
accountingPeriodEnd = invoicePeriod.EndDate;
}
base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList);
}
public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
{
if (costBearer.Organisation.Name.ToLower().Contains("persönliches Budget"))
{
serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2;
serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null)
{
var cust = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer;
if (cust.Person.InvoiceAddress != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.InvoiceAddress.CopyToNew();
}
else if (cust.Person.Address != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.Address.CopyToNew();
}
if (cust.Person.InvoiceAddress != null && cust.Person.InvoiceAddress.AddressLine1 != null)
{
serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.InvoiceAddress.AddressLine1;
serviceInvoice.InvoiceBase.RecipientPersonLastName = "";
}
else
{
serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.FirstName;
serviceInvoice.InvoiceBase.RecipientPersonLastName = cust.Person.LastName;
}
return;
}
if (costBearer.Organisation.InvoiceAddress != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew();
}
else if (costBearer.Organisation.Address != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew();
}
}
}
public override void SetServiceInvoicePeriods(ServiceInvoice invoice, CostBearer2SupportConcept costBearer2SupportConcept,
DateTimeSpan invoicePeriod, List<ServiceRecordDC> serviceRecords)
{
var invoiceAccountingPeriodSpan = new DateTimeSpan
{
StartDateTime = invoice.InvoiceBase.AccountingPeriodStart.Value,
EndDateTime = invoice.InvoiceBase.AccountingPeriodEnd.Value
};
foreach (SupportConceptApprovalPeriod iPeriod in costBearer2SupportConcept.ApprovalPeriodList)
{
SupportConceptApprovalPeriodDC approvalPeriodDC = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDC(iPeriod);
if (approvalPeriodDC.Span.EndDateTime < invoiceAccountingPeriodSpan.StartDateTime || approvalPeriodDC.Span.StartDateTime > invoiceAccountingPeriodSpan.EndDate)
{
continue;
}
ServiceInvoicePeriod serviceInvoicePeriod = CreateServiceInvoicePeriod(approvalPeriodDC, invoiceAccountingPeriodSpan);
serviceInvoicePeriod.SupportConceptApprovalPeriod = iPeriod;
serviceInvoicePeriod.Customer = costBearer2SupportConcept.SupportConcept.Customer;
CostBearer costBearer = costBearer2SupportConcept.CostBearer;
List<CostRatePeriodDC> costRates = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(costBearer.CostRatePeriods);
CostRatePeriodDC serviceUnit = costRates.GetCostRatePeriodForDate(CostRatePeriodType.MinutesPerServiceUnit, DateTime.Now);
serviceInvoicePeriod.ServiceUnitName = serviceUnit.UnitName;
SetInvoiceItems(invoice, serviceInvoicePeriod, approvalPeriodDC, costBearer2SupportConcept, invoicePeriod, serviceRecords);
if (serviceInvoicePeriod.InvoiceItemList.Count > 0)
invoice.ServiceInvoicePeriodList.Add(serviceInvoicePeriod);
}
}
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
{
if (iServiceRecord.ServiceDescription.CategoryName.Contains("Fachleistung"))
return null;
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
DateTime start = ii.ItemPeriodStart.Value;
decimal preisLeistung = 0;
string catName = iServiceRecord.ServiceDescription.CategoryName.ToString();
var cat = DAOFactory.SearchDAO.FindServiceCategoryByName(catName);
if (cat != null)
{
var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, start);
if (cp != null && cp.CostRateValue.HasValue)
preisLeistung = (decimal)cp.CostRateValue;
ii.AmountPerUnit = preisLeistung;
ii.RateFactor = null;
ii.AmountTotal = preisLeistung * ii.UnitCount;
ii.GrossAmountTotal = preisLeistung * ii.UnitCount;
ii.ItemDescription = catName;
}
return ii;
}
}
}

46
ReportImp/PflegedienstWessel/Invoicing/CustomInvoiceFactory.cs Normal file
View File

@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace PflegedienstWessel.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
foreach (var list in supportConcepts2ServiceRecords.Values)
{
foreach (var sr in list)
{
if (sr.CostBearer.Name.ToLower().Contains("persönliches budget 24")) // nochmal checken beim deployen wie der Name der Orga ist und Faktor auf FLS in Sammelrechnung?
{
return new CustomPersBudget24InvoiceCreation();
}
else
{
var sd = sr.ServiceDescription.Category;
var ic = GetInvoiceCreatorForCategory(sd);
if (ic != null)
return ic;
}
}
}
return base.CreateInvoiceCreator(specificId, tenant, supportConcepts2ServiceRecords);
}
private InvoiceCreation GetInvoiceCreatorForCategory(ServiceCategoryDC sd)
{
if (sd != null && !String.IsNullOrEmpty(sd.Name))
{
String cat = sd.Name.ToLower().Trim();
if (!cat.Contains("fachleistung"))
{
return new CustomInvoiceCreation();
}
}
return null;
}
}
}

114
ReportImp/PflegedienstWessel/Invoicing/CustomPersBudget24InvoiceCreation.cs Normal file
View File

@@ -0,0 +1,114 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
namespace PflegedienstWessel.Invoicing
{
public class CustomPersBudget24InvoiceCreation : InvoiceCreation
{
public override void SetInvoiceId(ServiceInvoice invoice)
{
invoice.InvoiceBase.InvoiceId = "PersBudget";
invoice.InvoiceBase.InvoiceTypeText = "PersBudget24";
}
public override void SetAmountAdvancePayments(ServiceInvoice invoice)
{
//do nothing
}
public override void SetAmountEquityContribution(ServiceInvoice invoice)
{
//do nothing
}
public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc)
{
// Anders als bei anderen Kostenträger zahlen die Selbstzahler im Persönlichen Budget 24 Stunden alle Leistungen monatlich aus einer Rechnung
//if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Assistenz"))
// return null;
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
DateTime start = ii.ItemPeriodStart.Value;
decimal preisAssistenz = 0;
//Achtung je nach Preisgestaltung wird jetzt bei FLS kein Faktor gezogen!
string catName = iServiceRecord.ServiceDescription.CategoryName.ToString();
var cat = DAOFactory.SearchDAO.FindServiceCategoryByName(catName);
if (cat != null)
{
var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, start);
if (cp != null && cp.CostRateValue.HasValue)
preisAssistenz = (decimal)cp.CostRateValue;
ii.AmountPerUnit = preisAssistenz;
ii.RateFactor = null;
ii.AmountTotal = preisAssistenz * ii.UnitCount;
ii.GrossAmountTotal = preisAssistenz * ii.UnitCount;
}
return ii;
}
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount)
{
return base.CreateSummaryInvoiceItems(itemList, invoicePeriod, scap, calc, true, true);
}
public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer)
{
serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2;
serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid;
serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name;
serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList();
serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid;
if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null)
{
var cust = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer;
if (cust.Person.InvoiceAddress != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.InvoiceAddress.CopyToNew();
}
else if (cust.Person.Address != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.Address.CopyToNew();
}
if (cust.Person.InvoiceAddress != null && cust.Person.InvoiceAddress.AddressLine1 != null)
{
serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.InvoiceAddress.AddressLine1;
serviceInvoice.InvoiceBase.RecipientPersonLastName = "";
}
else
{
serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.FirstName;
serviceInvoice.InvoiceBase.RecipientPersonLastName = cust.Person.LastName;
}
return;
}
if (costBearer.Organisation.InvoiceAddress != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew();
}
else if (costBearer.Organisation.Address != null)
{
serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew();
}
}
}
}

57
ReportImp/PflegedienstWessel/Invoicing/SettlementInvoiceCreation.cs Normal file
View File

@@ -0,0 +1,57 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
namespace PflegedienstWessel.Invoicing
{
public class CustomSettlementInvoiceCreation : SettlementInvoiceCreation
{
public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s)
{
return false;
}
public override bool IsServiceRecordBillable(ServiceRecord iRecord)
{
if (iRecord.ServiceDescription.ServiceCategory.Name.Contains("Fachleistung"))
{
return true;
}
return false;
}
public override void CalculateSettlementInvoiceApprovedAmounts(Settlement2DC si, SupportConceptCostBearerRelDC relDC, Calculations calc)
{
si.ApprovedFLSWeekly = 0;
si.ApprovedFLS = 0;
foreach (var sp in relDC.ApprovalPeriodList)
{
if (sp.ServiceCategory == null || sp.ServiceCategory.Name.Contains("Fachleistung"))
{
si.ApprovedFLSWeekly += calc.GetApprovedHoursPerWeek(sp, relDC.CostBearer.CostRatePeriods) ?? 0m;
decimal flsTotal = calc.GetApprovedHoursTotal(sp, relDC.CostBearer.CostRatePeriods) ?? 0m;
flsTotal = Math.Round(flsTotal, 2, MidpointRounding.AwayFromZero);
si.ApprovedFLS += flsTotal;
}
}
}
public override IList<ServiceRecord> GetBillableServiceRecords(CostBearer2SupportConcept c2s)
{
return c2s.ServiceRecords.OrderBy(s => s.Start).Where(s => s.ServiceDescription.ServiceCategory.Name.ToLower().Contains("Fachleistung")).ToList();
}
}
}

4
ReportImp/PflegedienstWessel/PflegedienstWessel.csproj
View File

@@ -69,6 +69,10 @@
<Compile Include="Fahrtkosten.Designer.cs">
<DependentUpon>Fahrtkosten.cs</DependentUpon>
</Compile>
<Compile Include="Invoicing\CustomInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomPersBudget24InvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
<Compile Include="KilometerauswertungsListReport.cs">
<SubType>Component</SubType>
</Compile>

17
ReportImp/PraunheimerWerkstaettenGmbh/ServicesOverviewReport.cs
View File

@@ -12,6 +12,8 @@ using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Services;
using BS.Shared.DataContracts;
using BeWo.Service.DCEntityMapper;
using System.Linq;
namespace PraunheimerWerkstaettenGmbh
{
@@ -72,6 +74,21 @@ namespace PraunheimerWerkstaettenGmbh
private void BerechneSollIst(ServicesOverviewRO ro)
{
if (ro.SupportConceptCostBearer == null)
{
if (ro.CostBearer2SupportConceptList != null && ro.CostBearer2SupportConceptList.Count > 0)
{
if (ro.CostBearer2SupportConceptList.Count == 1)
ro.SupportConceptCostBearer = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(ro.CostBearer2SupportConceptList[0]);
else if (ro.CostBearer2SupportConceptList.Count > 1)
{
var cb2sc = ro.CostBearer2SupportConceptList.FirstOrDefault(cs => ro.StartDate >= cs.StartDate.Value && ro.StartDate <= cs.EndDate.Value);
if (cb2sc != null)
ro.SupportConceptCostBearer = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(cb2sc);
}
}
}
if (ro.SupportConceptCostBearer != null && ro.SupportConceptCostBearer.CostBearer2SupportConceptOid != null)
{
if (ro.SupportConceptCostBearer.StartDate != null)

1892
ReportImp/SozialwerkAachenerChristen/AllgemeineRechnung.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1728
ReportImp/SozialwerkAachenerChristen/AllgemeineRechnung.resx
View File

File diff suppressed because it is too large Load Diff

1576
ReportImp/SozialwerkAachenerChristen/AssistenzRechnung.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1734
ReportImp/SozialwerkAachenerChristen/AssistenzRechnung.resx
View File

File diff suppressed because it is too large Load Diff

2124
ReportImp/SozialwerkAachenerChristen/PersBudgetRechnung.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1728
ReportImp/SozialwerkAachenerChristen/PersBudgetRechnung.resx
View File

File diff suppressed because it is too large Load Diff

16
ReportImp/SozialwerkAachenerChristen/SettlementReport.Designer.cs generated
View File

@@ -78,7 +78,6 @@ namespace SozialwerkAachenerChristen.Alt
this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -102,12 +101,13 @@ namespace SozialwerkAachenerChristen.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -538,7 +538,7 @@ namespace SozialwerkAachenerChristen.Alt
this.xrLabel4.SizeF = new System.Drawing.SizeF(203.4856F, 14.20453F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.Text = "Ambulant betreutes Wohnen";
this.xrLabel4.Text = "Ambulant Betreutes Wohnen";
//
// xrLabel3
//
@@ -655,10 +655,6 @@ namespace SozialwerkAachenerChristen.Alt
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell23.Weight = 0.26009181878516091D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -888,6 +884,10 @@ namespace SozialwerkAachenerChristen.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -912,9 +912,9 @@ namespace SozialwerkAachenerChristen.Alt
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

16
ReportImp/SozialwerkAachenerChristen/SettlementReport2.Designer.cs generated
View File

@@ -89,7 +89,6 @@ namespace SozialwerkAachenerChristen.In
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -111,13 +110,14 @@ namespace SozialwerkAachenerChristen.In
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -572,7 +572,7 @@ namespace SozialwerkAachenerChristen.In
this.xrLabel4.SizeF = new System.Drawing.SizeF(203.4856F, 14.20453F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.Text = "Ambulant betreutes Wohnen";
this.xrLabel4.Text = "Ambulant Betreutes Wohnen";
//
// xrLabel3
//
@@ -783,10 +783,6 @@ namespace SozialwerkAachenerChristen.In
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.Weight = 3D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1009,6 +1005,10 @@ namespace SozialwerkAachenerChristen.In
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.18436727741574874D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1034,9 +1034,9 @@ namespace SozialwerkAachenerChristen.In
((System.ComponentModel.ISupportInitialize)(this.xrRichText6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

1345
ReportImp/TeamPfeil/Quittierungsbeleg.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1736
ReportImp/TeamPfeil/Quittierungsbeleg.resx
View File

File diff suppressed because it is too large Load Diff

1984
ReportImp/TeamPfeil/QuittierungsbelegQualifikation.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1736
ReportImp/TeamPfeil/QuittierungsbelegQualifikation.resx
View File

File diff suppressed because it is too large Load Diff

5
ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs
View File

@@ -78,7 +78,10 @@ namespace VSDHammReports
double total = 0;
foreach (var value in dict.Values)
{
value.Minutes *= (double)rateFactor;
if (!value.ServiceDescription.Contains("80"))
{
value.Minutes *= (double)rateFactor;
}
total += value.Minutes;
}
pRO.TotalFLMBillable = total;

655
ReportImp/VSDHammReports/SettlementReport.Designer.cs generated
View File

@@ -31,6 +31,7 @@ namespace VSDHammReports.Alt
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
@@ -75,26 +76,6 @@ namespace VSDHammReports.Alt
this.lblAZ = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAZLabel = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow26 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow27 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow28 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow29 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
@@ -105,7 +86,6 @@ namespace VSDHammReports.Alt
this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -115,14 +95,45 @@ namespace VSDHammReports.Alt
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.Zwischensum = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable8 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTable9 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow16 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.Zwischensumme = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -655,221 +666,6 @@ namespace VSDHammReports.Alt
this.lblAZLabel.Text = "AZ LWL:";
this.lblAZLabel.WordWrap = false;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable6});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 12F);
this.GroupFooter1.HeightF = 132F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrTable6
//
this.xrTable6.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow23,
this.xrTableRow24,
this.xrTableRow25,
this.xrTableRow26,
this.xrTableRow27,
this.xrTableRow28,
this.xrTableRow29});
this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 132F);
this.xrTable6.StylePriority.UseBorderColor = false;
//
// xrTableRow23
//
this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell39});
this.xrTableRow23.Name = "xrTableRow23";
this.xrTableRow23.Weight = 0.085D;
//
// xrTableCell39
//
this.xrTableCell39.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell39.StylePriority.UseBorderColor = false;
this.xrTableCell39.StylePriority.UseBorders = false;
this.xrTableCell39.Weight = 1D;
//
// xrTableRow24
//
this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell40,
this.xrTableCell41});
this.xrTableRow24.Name = "xrTableRow24";
this.xrTableRow24.Weight = 0.085D;
//
// xrTableCell40
//
this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell40.StylePriority.UseBorders = false;
this.xrTableCell40.StylePriority.UseFont = false;
this.xrTableCell40.StylePriority.UsePadding = false;
this.xrTableCell40.Text = "Gesamtforderung:";
this.xrTableCell40.Weight = 0.78314100999098546D;
//
// xrTableCell41
//
this.xrTableCell41.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")});
this.xrTableCell41.Name = "xrTableCell41";
this.xrTableCell41.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell41.StylePriority.UseBorders = false;
this.xrTableCell41.StylePriority.UseFont = false;
this.xrTableCell41.StylePriority.UsePadding = false;
this.xrTableCell41.StylePriority.UseTextAlignment = false;
this.xrTableCell41.Text = "[AmountRecordedFLSString]";
this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell41.Weight = 0.21685899000901443D;
//
// xrTableRow25
//
this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell42});
this.xrTableRow25.Name = "xrTableRow25";
this.xrTableRow25.Weight = 0.085D;
//
// xrTableCell42
//
this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell42.Name = "xrTableCell42";
this.xrTableCell42.StylePriority.UseBorders = false;
this.xrTableCell42.Weight = 1D;
//
// xrTableRow26
//
this.xrTableRow26.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell43,
this.xrTableCell44});
this.xrTableRow26.Name = "xrTableRow26";
this.xrTableRow26.Weight = 0.085D;
//
// xrTableCell43
//
this.xrTableCell43.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell43.StylePriority.UseBorderColor = false;
this.xrTableCell43.StylePriority.UseBorders = false;
this.xrTableCell43.StylePriority.UseFont = false;
this.xrTableCell43.Text = "abzüglich der geleisteten Abschlagszahlung:";
this.xrTableCell43.Weight = 0.78314100999098568D;
//
// xrTableCell44
//
this.xrTableCell44.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell44.StylePriority.UseBorderColor = false;
this.xrTableCell44.StylePriority.UseBorders = false;
this.xrTableCell44.StylePriority.UseFont = false;
this.xrTableCell44.StylePriority.UseTextAlignment = false;
this.xrTableCell44.Text = "[AmountAdvancedPayments]";
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell44.Weight = 0.21685899000901443D;
//
// xrTableRow27
//
this.xrTableRow27.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell45,
this.xrTableCell46});
this.xrTableRow27.Name = "xrTableRow27";
this.xrTableRow27.Weight = 0.085D;
//
// xrTableCell45
//
this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell45.Name = "xrTableCell45";
this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell45.StylePriority.UseBorders = false;
this.xrTableCell45.StylePriority.UsePadding = false;
this.xrTableCell45.Text = "abzüglich Eigenanteil:";
this.xrTableCell45.Weight = 0.78314100999098568D;
//
// xrTableCell46
//
this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eigenbeteiligung", "{0:c}")});
this.xrTableCell46.Name = "xrTableCell46";
this.xrTableCell46.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell46.StylePriority.UseBorders = false;
this.xrTableCell46.StylePriority.UsePadding = false;
this.xrTableCell46.StylePriority.UseTextAlignment = false;
this.xrTableCell46.Text = "xrTableCell15";
this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell46.Weight = 0.21685899000901443D;
//
// xrTableRow28
//
this.xrTableRow28.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell47});
this.xrTableRow28.Name = "xrTableRow28";
this.xrTableRow28.Weight = 0.085D;
//
// xrTableCell47
//
this.xrTableCell47.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell47.StylePriority.UseBorderColor = false;
this.xrTableCell47.StylePriority.UseBorders = false;
this.xrTableCell47.Weight = 1D;
//
// xrTableRow29
//
this.xrTableRow29.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell48,
this.xrTableCell49});
this.xrTableRow29.Name = "xrTableRow29";
this.xrTableRow29.Weight = 0.15D;
//
// xrTableCell48
//
this.xrTableCell48.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell48.StylePriority.UseBorderColor = false;
this.xrTableCell48.StylePriority.UseBorders = false;
this.xrTableCell48.StylePriority.UseFont = false;
this.xrTableCell48.Text = "Restforderung:";
this.xrTableCell48.Weight = 0.78314100999098568D;
//
// xrTableCell49
//
this.xrTableCell49.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell49.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrTableCell49.Name = "xrTableCell49";
this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell49.StylePriority.UseBorderColor = false;
this.xrTableCell49.StylePriority.UseBorders = false;
this.xrTableCell49.StylePriority.UseFont = false;
this.xrTableCell49.StylePriority.UseTextAlignment = false;
this.xrTableCell49.Text = "[Claim]";
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell49.Weight = 0.21685899000901443D;
//
// xrLabel22
//
this.xrLabel22.BackColor = System.Drawing.Color.Transparent;
@@ -933,7 +729,10 @@ namespace VSDHammReports.Alt
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.Detail1,
this.Zwischensum,
this.ReportFooter1,
this.Zwischensumme});
this.DetailReport.DataMember = "InvoiceItems";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -999,10 +798,6 @@ namespace VSDHammReports.Alt
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell16.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1100,6 +895,325 @@ namespace VSDHammReports.Alt
this.xrLabel6.Text = "Fehlkontakte";
this.xrLabel6.WordWrap = false;
//
// Zwischensum
//
this.Zwischensum.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable8});
this.Zwischensum.HeightF = 26F;
this.Zwischensum.Name = "Zwischensum";
this.Zwischensum.Visible = false;
//
// xrTable8
//
this.xrTable8.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 0F);
this.xrTable8.Name = "xrTable8";
this.xrTable8.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow12,
this.xrTableRow4});
this.xrTable8.SizeF = new System.Drawing.SizeF(650F, 26F);
this.xrTable8.StylePriority.UseFont = false;
//
// xrTableRow12
//
this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell9,
this.xrTableCell10});
this.xrTableRow12.Name = "xrTableRow12";
this.xrTableRow12.Weight = 0.40476190476190466D;
//
// xrTableCell9
//
this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell9.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseBorderColor = false;
this.xrTableCell9.StylePriority.UseBorders = false;
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.Text = "Zwischensumme [Notice]:";
this.xrTableCell9.Weight = 2.3494233116736778D;
//
// xrTableCell10
//
this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
this.xrTableCell10.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBorderColor = false;
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
xrSummary1.FormatString = "{0:c}";
xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell10.Summary = xrSummary1;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell10.Weight = 0.650576688326322D;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell7});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.21428571428571425D;
//
// xrTableCell7
//
this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorderColor = false;
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.Weight = 3D;
//
// ReportFooter1
//
this.ReportFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable9});
this.ReportFooter1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ReportFooter1.HeightF = 132F;
this.ReportFooter1.Name = "ReportFooter1";
this.ReportFooter1.StylePriority.UseFont = false;
//
// xrTable9
//
this.xrTable9.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable9.Name = "xrTable9";
this.xrTable9.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow7,
this.xrTableRow8,
this.xrTableRow14,
this.xrTableRow15,
this.xrTableRow16,
this.xrTableRow17,
this.xrTableRow18});
this.xrTable9.SizeF = new System.Drawing.SizeF(650F, 132F);
this.xrTable9.StylePriority.UseBorderColor = false;
//
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8,
this.xrTableCell11});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 0.085D;
//
// xrTableCell8
//
this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.Weight = 0.78314100999098546D;
//
// xrTableCell11
//
this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell11.StylePriority.UseBorders = false;
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell11.Weight = 0.21685899000901443D;
//
// xrTableRow8
//
this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell12,
this.xrTableCell14});
this.xrTableRow8.Name = "xrTableRow8";
this.xrTableRow8.Weight = 0.085D;
//
// xrTableCell12
//
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.Text = "Gesamtforderung:";
this.xrTableCell12.Weight = 0.78314100999098546D;
//
// xrTableCell14
//
this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLSString")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell14.StylePriority.UseBorders = false;
this.xrTableCell14.StylePriority.UseFont = false;
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "[AmountRecordedFLSString]";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell14.Weight = 0.21685899000901443D;
//
// xrTableRow14
//
this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell17});
this.xrTableRow14.Name = "xrTableRow14";
this.xrTableRow14.Weight = 0.085D;
//
// xrTableCell17
//
this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.StylePriority.UseBorders = false;
this.xrTableCell17.Weight = 1D;
//
// xrTableRow15
//
this.xrTableRow15.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell18,
this.xrTableCell19});
this.xrTableRow15.Name = "xrTableRow15";
this.xrTableRow15.Weight = 0.085D;
//
// xrTableCell18
//
this.xrTableCell18.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell18.StylePriority.UseBorderColor = false;
this.xrTableCell18.StylePriority.UseBorders = false;
this.xrTableCell18.StylePriority.UseFont = false;
this.xrTableCell18.Text = "abzüglich der geleisteten Abschlagszahlung:";
this.xrTableCell18.Weight = 0.78314100999098568D;
//
// xrTableCell19
//
this.xrTableCell19.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell19.StylePriority.UseBorderColor = false;
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.Text = "[AmountAdvancedPayments]";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell19.Weight = 0.21685899000901443D;
//
// xrTableRow16
//
this.xrTableRow16.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell20,
this.xrTableCell23});
this.xrTableRow16.Name = "xrTableRow16";
this.xrTableRow16.Weight = 0.085D;
//
// xrTableCell20
//
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.Text = "abzüglich Eigenanteil:";
this.xrTableCell20.Weight = 0.78314100999098568D;
//
// xrTableCell23
//
this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eigenbeteiligung", "{0:c}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell23.StylePriority.UseBorders = false;
this.xrTableCell23.StylePriority.UsePadding = false;
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "xrTableCell15";
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell23.Weight = 0.21685899000901443D;
//
// xrTableRow17
//
this.xrTableRow17.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell24});
this.xrTableRow17.Name = "xrTableRow17";
this.xrTableRow17.Weight = 0.085D;
//
// xrTableCell24
//
this.xrTableCell24.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell24.StylePriority.UseBorderColor = false;
this.xrTableCell24.StylePriority.UseBorders = false;
this.xrTableCell24.Weight = 1D;
//
// xrTableRow18
//
this.xrTableRow18.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell25,
this.xrTableCell26});
this.xrTableRow18.Name = "xrTableRow18";
this.xrTableRow18.Weight = 0.15D;
//
// xrTableCell25
//
this.xrTableCell25.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell25.StylePriority.UseBorderColor = false;
this.xrTableCell25.StylePriority.UseBorders = false;
this.xrTableCell25.StylePriority.UseFont = false;
this.xrTableCell25.Text = "Restforderung:";
this.xrTableCell25.Weight = 0.78314100999098568D;
//
// xrTableCell26
//
this.xrTableCell26.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell26.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell26.StylePriority.UseBorderColor = false;
this.xrTableCell26.StylePriority.UseBorders = false;
this.xrTableCell26.StylePriority.UseFont = false;
this.xrTableCell26.StylePriority.UseTextAlignment = false;
this.xrTableCell26.Text = "[Claim]";
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell26.Weight = 0.21685899000901443D;
//
// Zwischensumme
//
this.Zwischensumme.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
new DevExpress.XtraReports.UI.GroupField("Notice", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
this.Zwischensumme.HeightF = 0F;
this.Zwischensumme.Name = "Zwischensumme";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1107,7 +1221,6 @@ namespace VSDHammReports.Alt
this.topMarginBand1,
this.bottomMarginBand1,
this.GroupHeader1,
this.GroupFooter1,
this.DetailReport,
this.ReportFooter});
this.DataSource = this.bindingSource1;
@@ -1122,11 +1235,12 @@ namespace VSDHammReports.Alt
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1173,7 +1287,6 @@ namespace VSDHammReports.Alt
private DevExpress.XtraReports.UI.XRLabel lblAZ;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel lblAZLabel;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
@@ -1185,25 +1298,6 @@ namespace VSDHammReports.Alt
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRTable xrTable6;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow29;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
private DevExpress.XtraReports.UI.XRTable xrTable7;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
@@ -1217,5 +1311,34 @@ namespace VSDHammReports.Alt
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.GroupFooterBand Zwischensum;
private DevExpress.XtraReports.UI.XRTable xrTable8;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable9;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.GroupHeaderBand Zwischensumme;
}
}

25
ReportImp/VSDHammReports/SettlementReport.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
namespace VSDHammReports.Alt
{
@@ -16,6 +17,7 @@ namespace VSDHammReports.Alt
public void SetReportDataSource(SettlementRO pRO)
{
bool replaceFF = false;
bool hasFehlkontakte = false;
if (String.IsNullOrEmpty(pRO.RecipientOrganisation) || !pRO.RecipientOrganisation.ToLower().StartsWith("lwl"))
{
@@ -33,10 +35,21 @@ namespace VSDHammReports.Alt
//ii.UnitCount *= rateFactor;
ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}",
ii.ItemPeriodStart, ii.ItemPeriodEnd);
ii.ItemDescription += String.Format(": {0:0.##} FLS x {1:c}",
ii.UnitCount, ii.AmountPerUnit);
ii.ItemPeriodStart, ii.ItemPeriodEnd);
if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0)
{
Zwischensum.Visible = true;
hasFehlkontakte = true;
ii.ItemDescription += String.Format(": {0:0.##} Std. x {1:c}", ii.UnitCount, ii.AmountPerUnit);
ii.Notice = "Fehlkontakte - 80 % abrechenbar";
}
else
{
ii.ItemDescription += String.Format(": {0:0.##} FLS x {1:c}", ii.UnitCount, ii.AmountPerUnit);
ii.Notice = "Fachleistungsstunden";
}
}
@@ -67,7 +80,8 @@ namespace VSDHammReports.Alt
pRO.GeleisteteFLSMitStundensatzAktuell = pRO.InvoiceItems[2].UnitCount;
pRO.Betrag3 = String.Format("{0:c}", pRO.InvoiceItems[2].AmountTotal);
pRO.HourlyRateNew = pRO.InvoiceItems[2].AmountPerUnit ?? 0;
}
pRO.DifferentHourlyRateCount = 3;
}
else if (pRO.InvoiceItems.Count == 2)
{
@@ -80,6 +94,7 @@ namespace VSDHammReports.Alt
pRO.GeleisteteFLSMitStundensatzAktuell = pRO.InvoiceItems[1].UnitCount;
pRO.Betrag3 = String.Format("{0:c}", pRO.InvoiceItems[1].AmountTotal);
pRO.HourlyRateNew = pRO.InvoiceItems[1].AmountPerUnit ?? 0;
pRO.DifferentHourlyRateCount = 2;
}
else
{
@@ -177,7 +192,7 @@ namespace VSDHammReports.Alt
isDefaultSpitzabrechnung = true;
}
}
if (isDefaultSpitzabrechnung)
if (isDefaultSpitzabrechnung && hasFehlkontakte == false)
{
//UpdateAbrechnungsFelder(pRO);

349
ReportImp/VSDHammReports/SettlementReport2.Designer.cs generated
View File

@@ -90,10 +90,21 @@ namespace VSDHammReports
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable7 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -110,28 +121,15 @@ namespace VSDHammReports
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable7 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -830,6 +828,10 @@ namespace VSDHammReports
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.Weight = 3D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -843,10 +845,150 @@ namespace VSDHammReports
this.xrLabel11,
this.xrTable5});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 12F);
this.GroupFooter1.HeightF = 484.8541F;
this.GroupFooter1.HeightF = 450.4791F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrLabel10
//
this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
this.xrLabel10.CanShrink = true;
this.xrLabel10.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 149.2292F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel10.StylePriority.UseBackColor = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Abwesenheitszeiten";
this.xrLabel10.WordWrap = false;
//
// xrTable3
//
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.2291F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow22});
this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableRow22
//
this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell29});
this.xrTableRow22.Name = "xrTableRow22";
this.xrTableRow22.Weight = 0.47619047619047605D;
//
// xrTableCell29
//
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell29.StylePriority.UsePadding = false;
this.xrTableCell29.Text = "xrTableCell4";
this.xrTableCell29.Weight = 3D;
//
// xrLabel7
//
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 257.5625F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel7.StylePriority.UseBackColor = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Erklärung des Anbieters:";
this.xrLabel7.WordWrap = false;
//
// xrLabel19
//
this.xrLabel19.BackColor = System.Drawing.Color.Transparent;
this.xrLabel19.CanShrink = true;
this.xrLabel19.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.5625F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(650F, 66.66667F);
this.xrLabel19.StylePriority.UseBackColor = false;
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = resources.GetString("xrLabel19.Text");
//
// xrLabel21
//
this.xrLabel21.BackColor = System.Drawing.Color.Transparent;
this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel21.CanShrink = true;
this.xrLabel21.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 425.6874F);
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(229.1667F, 20F);
this.xrLabel21.StylePriority.UseBackColor = false;
this.xrLabel21.StylePriority.UseBorders = false;
this.xrLabel21.StylePriority.UseFont = false;
this.xrLabel21.Text = "Ort, Datum";
this.xrLabel21.WordWrap = false;
//
// xrLabel22
//
this.xrLabel22.BackColor = System.Drawing.Color.Transparent;
this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel22.CanShrink = true;
this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(303.1249F, 425.6874F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel22.SizeF = new System.Drawing.SizeF(346.8752F, 20F);
this.xrLabel22.StylePriority.UseBackColor = false;
this.xrLabel22.StylePriority.UseBorders = false;
this.xrLabel22.StylePriority.UseFont = false;
this.xrLabel22.Text = "Stempel, rechtsverbindliche Unterschrift/en";
this.xrLabel22.WordWrap = false;
//
// xrTable7
//
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 216.521F);
this.xrTable7.Name = "xrTable7";
this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable7.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrTable7.StylePriority.UseFont = false;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.47619047619047605D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.Text = "xrTableCell4";
this.xrTableCell3.Weight = 3D;
//
// xrLabel11
//
this.xrLabel11.BackColor = System.Drawing.Color.Transparent;
this.xrLabel11.CanShrink = true;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.5209F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel11.StylePriority.UseBackColor = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.Text = "Fehlkontakte";
this.xrLabel11.WordWrap = false;
//
// xrTable5
//
this.xrTable5.BorderColor = System.Drawing.SystemColors.ControlLight;
@@ -854,34 +996,15 @@ namespace VSDHammReports
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow30,
this.xrTableRow31,
this.xrTableRow32,
this.xrTableRow34,
this.xrTableRow35,
this.xrTableRow36,
this.xrTableRow37});
this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 132F);
this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 115F);
this.xrTable5.StylePriority.UseBorderColor = false;
//
// xrTableRow30
//
this.xrTableRow30.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell48});
this.xrTableRow30.Name = "xrTableRow30";
this.xrTableRow30.Weight = 0.085D;
//
// xrTableCell48
//
this.xrTableCell48.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell48.StylePriority.UseBorderColor = false;
this.xrTableCell48.StylePriority.UseBorders = false;
this.xrTableCell48.Weight = 1D;
//
// xrTableRow31
//
this.xrTableRow31.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -1057,150 +1180,6 @@ namespace VSDHammReports
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.21685899000901443D;
//
// xrLabel10
//
this.xrLabel10.BackColor = System.Drawing.Color.Transparent;
this.xrLabel10.CanShrink = true;
this.xrLabel10.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 178.3958F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel10.StylePriority.UseBackColor = false;
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Abwesenheitszeiten";
this.xrLabel10.WordWrap = false;
//
// xrTable3
//
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.3958F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow22});
this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableRow22
//
this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell29});
this.xrTableRow22.Name = "xrTableRow22";
this.xrTableRow22.Weight = 0.47619047619047605D;
//
// xrTableCell29
//
this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")});
this.xrTableCell29.Name = "xrTableCell29";
this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell29.StylePriority.UsePadding = false;
this.xrTableCell29.Text = "xrTableCell4";
this.xrTableCell29.Weight = 3D;
//
// xrLabel7
//
this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 286.7292F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel7.StylePriority.UseBackColor = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Erklärung des Anbieters:";
this.xrLabel7.WordWrap = false;
//
// xrLabel19
//
this.xrLabel19.BackColor = System.Drawing.Color.Transparent;
this.xrLabel19.CanShrink = true;
this.xrLabel19.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 306.7291F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(650F, 66.66667F);
this.xrLabel19.StylePriority.UseBackColor = false;
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = resources.GetString("xrLabel19.Text");
//
// xrLabel21
//
this.xrLabel21.BackColor = System.Drawing.Color.Transparent;
this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel21.CanShrink = true;
this.xrLabel21.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 454.8541F);
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(229.1667F, 20F);
this.xrLabel21.StylePriority.UseBackColor = false;
this.xrLabel21.StylePriority.UseBorders = false;
this.xrLabel21.StylePriority.UseFont = false;
this.xrLabel21.Text = "Ort, Datum";
this.xrLabel21.WordWrap = false;
//
// xrLabel22
//
this.xrLabel22.BackColor = System.Drawing.Color.Transparent;
this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel22.CanShrink = true;
this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(303.1249F, 454.8541F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel22.SizeF = new System.Drawing.SizeF(346.8752F, 20F);
this.xrLabel22.StylePriority.UseBackColor = false;
this.xrLabel22.StylePriority.UseBorders = false;
this.xrLabel22.StylePriority.UseFont = false;
this.xrLabel22.Text = "Stempel, rechtsverbindliche Unterschrift/en";
this.xrLabel22.WordWrap = false;
//
// xrTable7
//
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 245.6876F);
this.xrTable7.Name = "xrTable7";
this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow3});
this.xrTable7.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrTable7.StylePriority.UseFont = false;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.47619047619047605D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.Text = "xrTableCell4";
this.xrTableCell3.Weight = 3D;
//
// xrLabel11
//
this.xrLabel11.BackColor = System.Drawing.Color.Transparent;
this.xrLabel11.CanShrink = true;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225.6875F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel11.StylePriority.UseBackColor = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.Text = "Fehlkontakte";
this.xrLabel11.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1226,10 +1205,10 @@ namespace VSDHammReports
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1257,8 +1236,6 @@ namespace VSDHammReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell53;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable5;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow30;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow31;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;

2
Service/Plugins/PluginLoader.cs
View File

@@ -85,7 +85,7 @@ namespace BeWo.Service.Plugins
//t = "4867997795"; // ADiK Kleve
//t = "3184859776"; // Sergej Becker
//t = "7752610643"; // BWK Gbr
//t = "3785623125"; // Betreuwo
t = "3785623125"; // Betreuwo
//t = "7130228334"; // LH Borken
//t = "4209820830"; // VKM Hamm
//t = "5700328131"; // Betreutes Wohnen St. Ludgerus Essen-Werden

79
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -36,6 +36,7 @@ using System.Text;
using System.Threading;
using System.Web;
using System.Windows;
using BeWo.Data.Utils;
using Utils = BeWo.Service.Core.Utils;
namespace BeWo.Service.ServiceImplementations
@@ -2230,11 +2231,12 @@ namespace BeWo.Service.ServiceImplementations
var customerMonthlySignatureState = serviceRecord2SignatureState.CustomerMonthlySignatureStateType;
var employeeMonthlySignatureState = serviceRecord2SignatureState.EmployeeMonthlySignatreStateType;
ServiceRecordHistory previousRecordHistoryEntry = null;
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
if(serviceRecord.Oid.HasValue)
{
previousRecordHistoryEntry = DAOFactory.SearchDAO.FindMostRecentServiceRecordHistoryEntryByServiceRecordOid(serviceRecord.Oid.Value);
//previousRecordHistoryEntry = DAOFactory.SearchDAO.FindMostRecentServiceRecordHistoryEntryByServiceRecordOid(serviceRecord.Oid.Value);
previousRecordHistorySignatureInfo = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecordOid(serviceRecord.Oid.Value);
}
serviceRecordHistoryEntries.AddIfNotIn(new ServiceRecordHistory
@@ -2269,22 +2271,17 @@ namespace BeWo.Service.ServiceImplementations
SystemEntryID = serviceRecord.SystemEntryID,
DistanceInMeter = serviceRecord.DistanceInMeter,
IsCreatedInMobileClient = serviceRecord.IsCreatedInMobileClient,
ServiceRecordSignatureStateType = singleSignatureState ?? previousRecordHistoryEntry?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureStateType = customerMonthlySignatureState ?? previousRecordHistoryEntry?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = employeeMonthlySignatureState ?? previousRecordHistoryEntry?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureOid = previousRecordHistoryEntry?.CustomerConfirmationReceiptSignatureOid,
EmployeeConfirmationReceiptSignatureOid = previousRecordHistoryEntry?.EmployeeConfirmationReceiptSignatureOid
ServiceRecordSignatureStateType = singleSignatureState ?? previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureStateType = customerMonthlySignatureState ?? previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = employeeMonthlySignatureState ?? previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureOid,
EmployeeConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureOid
});
}
DAOFactory.GenericDAO.Insert(serviceRecordHistoryEntries);
}
// ToDo: 3 Unterschriften; 1 Gültig mit U1; 2 Ungültig mit U1; 3 Gültig mit U2;
// ToDo:
// ToDo:
// ToDo:
// ToDo:
private static List<ServiceRecord2SignatureStates> GenerateSignatureStates(List<ServiceRecord> serviceRecordsWithDeletedSingleSignatures, List<ServiceRecord2SignatureStates> serviceRecordsdWithRemovedConfirmationReceiptSignatures, List<ServiceRecord> originals)
{
var serviceRecords2SignatureStates = new List<ServiceRecord2SignatureStates>();
@@ -3190,11 +3187,11 @@ namespace BeWo.Service.ServiceImplementations
{
foreach(var original in lOriginals)
{
ServiceRecordHistory previousRecordHistoryEntry = null;
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
if(original.Oid.HasValue)
{
previousRecordHistoryEntry = DAOFactory.SearchDAO.FindMostRecentServiceRecordHistoryEntryByServiceRecordOid(original.Oid.Value);
previousRecordHistorySignatureInfo = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecordOid(original.Oid.Value);
}
serviceRecordHistoryEntries.AddIfNotIn(new ServiceRecordHistory
@@ -3229,9 +3226,11 @@ namespace BeWo.Service.ServiceImplementations
SystemEntryID = original.SystemEntryID,
DistanceInMeter = original.DistanceInMeter,
IsCreatedInMobileClient = original.IsCreatedInMobileClient,
ServiceRecordSignatureStateType = previousRecordHistoryEntry?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureStateType = previousRecordHistoryEntry?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = previousRecordHistoryEntry?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None
ServiceRecordSignatureStateType = previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureStateType = previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureOid,
EmployeeConfirmationReceiptSignatureOid = previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureOid
});
}
}
@@ -7897,21 +7896,22 @@ namespace BeWo.Service.ServiceImplementations
ServiceLogic.SetActivationType<ConfirmationReceiptSignature>(oids2Versions, ActivationTypeId.Deleted);
var timeAlteredServiceRecords = DAOFactory.GenericDAO.LoadByIDs<ServiceRecord>(serviceRecordOids);
var mostRecentServiceRecordHistoryEntries = DAOFactory.SearchDAO.FindMostRecentServiceRecordHistoryEntryByServiceRecords(serviceRecordOids);
var mostRecentSignatureStatusInfos = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecords(serviceRecordOids);
if(confirmationReceiptSignatures2Update.Any())
{
foreach(var serviceRecord in timeAlteredServiceRecords)
{
ServiceRecordHistory previousServiceRecordHistoryEntry = null;
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
if(serviceRecord.Oid.HasValue && mostRecentServiceRecordHistoryEntries.ContainsKey(serviceRecord.Oid.Value))
if(serviceRecord.Oid.HasValue && mostRecentSignatureStatusInfos.ContainsKey(serviceRecord.Oid.Value))
{
previousServiceRecordHistoryEntry = mostRecentServiceRecordHistoryEntries[serviceRecord.Oid.Value];
previousRecordHistorySignatureInfo = mostRecentSignatureStatusInfos[serviceRecord.Oid.Value];
}
var newCustomerSignatureState = DetermineNewSignatureState(previousServiceRecordHistoryEntry?.CustomerConfirmationReceiptSignatureStateType);
var newEmployeeSignatureState = DetermineNewSignatureState(previousServiceRecordHistoryEntry?.EmployeeConfirmationReceiptSignatureStateType);
var newCustomerSignatureState = DetermineNewSignatureState(previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType);
var newEmployeeSignatureState = DetermineNewSignatureState(previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType);
var newSignatureStatesObject = new ServiceRecord2SignatureStates(
serviceRecord,
@@ -7935,9 +7935,9 @@ namespace BeWo.Service.ServiceImplementations
var formerlySignedServiceRecords = DAOFactory.SearchDAO.FindFormerlyLinkedServiceRecordsBySignatureOid(signatureOid);
var mostRecentHistoryEntries = DAOFactory.SearchDAO.FindMostRecentServiceRecordHistoryEntryByServiceRecords(formerlySignedServiceRecords.Select(s => s.Oid.Value).ToList());
var blah = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecords(formerlySignedServiceRecords.Select(sr => sr.Oid.Value).ToList());
mostRecentServiceRecordHistoryEntries.AddAndIgnoreDuplicates(mostRecentHistoryEntries);
mostRecentSignatureStatusInfos.AddAndIgnoreDuplicates(blah);
confirmationReceiptSignature.ServiceRecords.AddRangeIfElementsNotIn(formerlySignedServiceRecords);
}
@@ -7955,15 +7955,15 @@ namespace BeWo.Service.ServiceImplementations
if(previousServiceRecord2SignatureStates is null)
{
ServiceRecordHistory previousServiceRecordHistoryEntry = null;
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
if(serviceRecord.Oid.HasValue && mostRecentServiceRecordHistoryEntries.ContainsKey(serviceRecord.Oid.Value))
if(serviceRecord.Oid.HasValue && mostRecentSignatureStatusInfos.ContainsKey(serviceRecord.Oid.Value))
{
previousServiceRecordHistoryEntry = mostRecentServiceRecordHistoryEntries[serviceRecord.Oid.Value];
previousRecordHistorySignatureInfo = mostRecentSignatureStatusInfos[serviceRecord.Oid.Value];
}
newSignatureStatesObject.CustomerMonthlySignatureStateType = DetermineNewDeletedSignatureState(previousServiceRecordHistoryEntry?.CustomerConfirmationReceiptSignatureStateType);
newSignatureStatesObject.EmployeeMonthlySignatreStateType = DetermineNewDeletedSignatureState(previousServiceRecordHistoryEntry?.EmployeeConfirmationReceiptSignatureStateType);
newSignatureStatesObject.CustomerMonthlySignatureStateType = DetermineNewDeletedSignatureState(previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType);
newSignatureStatesObject.EmployeeMonthlySignatreStateType = DetermineNewDeletedSignatureState(previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType);
}
else
{
@@ -8323,8 +8323,13 @@ namespace BeWo.Service.ServiceImplementations
private static void MakeSignatureStatusTypeServiceRecordHistoryEntry(ServiceRecord serviceRecord, SignatureStateType? singleSignatureStateType, SignatureStateType? customerMonthlySignatureStateType, SignatureStateType? employeeMonthlySignatureStateType, long? customerConfirmationReceiptSignatureOid, long? employeeConfirmationReceiptsignatureOid)
{
// Alten ServiceRecordHistory laden
var mostRecentHistoryEntry = DAOFactory.SearchDAO.FindMostRecentServiceRecordHistoryEntryByServiceRecordOid(serviceRecord.Oid.Value);
// Alten Unterschriftenstatus aus ServiceRecordHistory laden
SignatureStateInfoFromServiceRecordHistoryEntry previousRecordHistorySignatureInfo = null;
if(serviceRecord.Oid.HasValue)
{
previousRecordHistorySignatureInfo = DAOFactory.SearchDAO.FindMostRecentSignatureStatusInfoByServiceRecordOid(serviceRecord.Oid.Value);
}
var seviceRecordHistoryEntry = new ServiceRecordHistory
{
@@ -8358,11 +8363,11 @@ namespace BeWo.Service.ServiceImplementations
SystemEntryID = serviceRecord.SystemEntryID,
DistanceInMeter = serviceRecord.DistanceInMeter,
IsCreatedInMobileClient = serviceRecord.IsCreatedInMobileClient,
CustomerConfirmationReceiptSignatureStateType = customerMonthlySignatureStateType ?? mostRecentHistoryEntry?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = employeeMonthlySignatureStateType ?? mostRecentHistoryEntry?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
ServiceRecordSignatureStateType = singleSignatureStateType ?? mostRecentHistoryEntry?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureOid = customerConfirmationReceiptSignatureOid ?? mostRecentHistoryEntry?.CustomerConfirmationReceiptSignatureOid,
EmployeeConfirmationReceiptSignatureOid = employeeConfirmationReceiptsignatureOid ?? mostRecentHistoryEntry?.EmployeeConfirmationReceiptSignatureOid
CustomerConfirmationReceiptSignatureStateType = customerMonthlySignatureStateType ?? previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
EmployeeConfirmationReceiptSignatureStateType = employeeMonthlySignatureStateType ?? previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureStateType ?? SignatureStateType.None,
ServiceRecordSignatureStateType = singleSignatureStateType ?? previousRecordHistorySignatureInfo?.ServiceRecordSignatureStateType ?? SignatureStateType.None,
CustomerConfirmationReceiptSignatureOid = customerConfirmationReceiptSignatureOid ?? previousRecordHistorySignatureInfo?.CustomerConfirmationReceiptSignatureOid,
EmployeeConfirmationReceiptSignatureOid = employeeConfirmationReceiptsignatureOid ?? previousRecordHistorySignatureInfo?.EmployeeConfirmationReceiptSignatureOid
};
DAOFactory.GenericDAO.Insert(seviceRecordHistoryEntry);

12
Service/ServiceImplementations/QueryServiceImp.cs
View File

@@ -87,21 +87,9 @@ namespace BeWo.Service.ServiceImplementations
var lDir = BS.Shared.Core.Utils.CreateSavePath(baseDirectory, tenant + @"\temp");
var lPath = BS.Shared.Core.Utils.CreateSavePath(lDir, lResult);
var table = BS.Shared.Core.Utils.XMLDeserializeFromString<DataTable>(dataTableJsonString);
BS.Shared.Core.Utils.XMLSerialize(lPath, table);
if(!Directory.Exists(lDir))
{
}
if(!File.Exists(lPath))
{
}
return lResult;
}
catch (Exception e)

31
Shared/Extensions/DateTimeExtensions.cs
View File

@@ -684,5 +684,36 @@ namespace BS.Shared.Extensions
{
return (dateTime.GetLastOfMonth() - dateTime.GetFirstOfMonth()).Days + 1;
}
/// <summary>
/// Liefert einen String, der das Interval darstellt.
/// Ist endDate null und die Uhrzeit vom Startdatum 00:00 oder sind beide Uhrzeiten 00:00, wird die Uhrzeit nicht angezeigt.
/// </summary>
/// <param name="dateTime">Startdatum des Intervalls</param>
/// <param name="endDate">Eventuelles Enddatum des Intervalls</param>
/// <returns></returns>
public static string ToIntervalString(this DateTime dateTime, DateTime? endDate)
{
if(endDate is null)
{
if(dateTime.Hour == 0 && dateTime.Minute == 0)
{
return $"{dateTime:dd.MM.yyyy}";
}
return $"{dateTime:dd.MM.yyyy HH:mm}";
}
if(dateTime.Hour == 0 && dateTime.Minute == 0 && endDate.Value.Hour == 0 && endDate.Value.Minute == 0)
{
return dateTime.Year == endDate.Value.Year ?
$"{dateTime:dd.MM.} - {endDate.Value:dd.MM.yyyy}" :
$"{dateTime:dd.MM.yyyy} - {endDate.Value:dd.MM.yyyy}";
}
return dateTime.Year == endDate.Value.Year ?
$"{dateTime:dd.MM. HH:mm} - {endDate.Value:dd.MM.yyyy HH:mm}" :
$"{dateTime:dd.MM.yyyy HH:mm} - {endDate.Value:dd.MM.yyyy HH:mm}";
}
}
}