();
- result.AddRange(Employees.Select(item => new SelectListItem {Value = item.EmployeeOid.ToString(), Text = $"{item.LastName}, {item.FirstName}", Selected = item.Equals(MobileSessionFacade.LoggedInCompactEmployee)}).ToList());
+ result.AddRange(Employees.Select(item => new SelectListItem {Value = item.EmployeeOid.ToString(), Text = $"{item.LastName}, {item.FirstName}", Selected = item.Equals(MobileSessionFacade.LoggedInCompactEmployee)}).OrderBy(s => s.Text).ToList());
return result;
}
diff --git a/BeWoPlanerMobil/Scripts/mainView.js b/BeWoPlanerMobil/Scripts/mainView.js
index 9985031b9..d50cf5522 100644
--- a/BeWoPlanerMobil/Scripts/mainView.js
+++ b/BeWoPlanerMobil/Scripts/mainView.js
@@ -37,11 +37,18 @@ function actuallyBuildCollapsibleSet(kollektion, selectedGoalOids) {
$("#kollabierbar1").append(collapsibleHtml);
}
+var level = 0;
+
var collapsibleHtml;
function buildGoalTreeItem(goalItem, selectedGoalOids) {
+ var goalOid = goalItem.ValueListEntryOid;
+ var goalHeader = goalItem.Header;
+ var isChecked = selectedGoalOids != null && isElementInArray(selectedGoalOids, goalOid) ? "checked" : "";
- if(!goalItem.IsLeaf) {
- collapsibleHtml += '';
+ if (!goalItem.IsLeaf) {
+ //collapsibleHtml += '';
+ collapsibleHtml += '' + goalHeader + '
';
+ //collapsibleHtml += '';
collapsibleHtml += '';
try {
@@ -54,18 +61,14 @@ function buildGoalTreeItem(goalItem, selectedGoalOids) {
} catch(exception) {
console.log('Fehler bei der Baumkonstruktion: ' + exception.message);
}
+ collapsibleHtml += "
";
} else {
-
- var goalOid = goalItem.ValueListEntryOid;
- var goalHeader = goalItem.Header;
-
- var isChecked = selectedGoalOids != null && isElementInArray(selectedGoalOids, goalOid) ? "checked" : "";
-
+
collapsibleHtml += '' + goalHeader + '
';
}
- collapsibleHtml += "";
+
}
function loadGoalsOnSuccess(json) {
@@ -261,6 +264,35 @@ function updateGoals(cbId) {
makeAjaxCall("GET", updateGoalsUrl, null, { pGoalOid: cbId }, null);
}
+var goalOidArray = new Array();
+function updateChildGoals(goalOid) {
+ goalOidArray = new Array();
+
+ var parent = document.getElementById("goal" + goalOid);
+ alert("start");
+ CheckChildGoalNodes(parent);
+ //makeAjaxCall("GET", updateGoalsUrl, null, { pGoalOid: cbId }, null);
+}
+
+function CheckChildGoalNodes(parent) {
+ goalOidArray = new Array();
+
+ var next = parent.parentNode;
+ alert(next);
+ alert(next.nextSibling);
+ var nodeList = next.childNodes;
+
+ alert(nodeList.length);
+ for (var i = 0; i < nodeList.length; i++) {
+ var node = nodeList[i];
+
+ alert(node.nodeName);
+ CheckChildGoalNodes(node);
+ }
+
+ //makeAjaxCall("GET", updateGoalsUrl, null, { pGoalOid: cbId }, null);
+}
+
function setServiceDescription() {
var sdOid = $("#leistungen_select").find(":selected").val();
diff --git a/BeWoPlanerMobil/Views/Shared/Error.cshtml b/BeWoPlanerMobil/Views/Shared/Error.cshtml
index 26aae1d0a..122a71dae 100644
--- a/BeWoPlanerMobil/Views/Shared/Error.cshtml
+++ b/BeWoPlanerMobil/Views/Shared/Error.cshtml
@@ -7,7 +7,7 @@
Error
-
+
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
index 96697dade..14e49580a 100644
--- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
+++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
@@ -7,21 +7,21 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index c472e8b2a..7f6b6d08c 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -1532,6 +1533,15 @@ namespace BeWo.Data.Access
return c.List().ToList();
}
+ public IList FindNotizenKategorien(TableID objectTid, long objectOid)
+ {
+ var c = CreateCriteriaIsActiveOrArchived()
+ .Add(Restrictions.Eq(NotizenKategorie.PropertyName_ObjectTid, objectTid))
+ .Add(Restrictions.Eq(NotizenKategorie.PropertyName_ObjectOid, objectOid));
+
+ return c.List().ToList();
+ }
+
public IEnumerable FindMedRecordsForCustomer(long pCustomerOid)
{
var c = CreateCriteriaIsActive()
@@ -2102,6 +2112,15 @@ namespace BeWo.Data.Access
return criteria.List();
}
+ public IEnumerable GetChildTextModules(TextModule textModule)
+ {
+ var criteria = CreateCriteriaIsActive();
+
+ criteria.Add(Restrictions.Eq(nameof(TextModule.Parent), textModule));
+
+ return criteria.List();
+ }
+
public IEnumerable FindEmployeeChatBewoMessageSync(long oid)
{
var c = CreateCriteriaIsActive()
@@ -2501,6 +2520,10 @@ namespace BeWo.Data.Access
public IList FindAppointmentsByRecurrenceId(List pRecurrenceIds, bool pExcludeRootAppointments = false)
{
+ if (pRecurrenceIds == null || pRecurrenceIds.Count == 0)
+ {
+ return new List();
+ }
var criterionList = new List();
pRecurrenceIds.DoForEach(id =>
@@ -2509,7 +2532,10 @@ namespace BeWo.Data.Access
});
var recurrenceIdOr = CreateOrCriteria(criterionList);
-
+ if (recurrenceIdOr == null)
+ {
+ return new List(); ;
+ }
var c = CreateCriteria()
.Add(Restrictions.Eq(BeWoEntityBase.PropertyName_IsActive, ActivationTypeId.Active))
.Add(Restrictions.IsNotNull(SchedulerAppointment.PropertyName_RecurrenceInfo))
@@ -2542,5 +2568,22 @@ namespace BeWo.Data.Access
return c.List();
}
+
+ public IList FindDefaultHourlyRateCostRatePeriods()
+ {
+ var c = CreateCriteria();
+
+ c.Add(Restrictions.Eq(CostRatePeriod.PropertyName_CostRateType, CostRatePeriodType.HourlyRate))
+ .Add(Restrictions.IsNull(CostRatePeriod.PropertyName_ObjectOid));
+
+ return c.List();
+ }
+
+ public virtual IList GetSqlResult(string sql)
+ {
+ var q = Session.CreateSQLQuery(sql);
+ return q.List();
+
+ }
}
}
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 75209f879..c3c426fbf 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -123,6 +123,9 @@
+
+
+
@@ -570,6 +573,15 @@
PreserveNewest
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
Designer
diff --git a/Data/Entities/Contract.cs b/Data/Entities/Contract.cs
index 13191540e..2da9a8813 100644
--- a/Data/Entities/Contract.cs
+++ b/Data/Entities/Contract.cs
@@ -178,6 +178,12 @@ namespace BeWo.Data.Entities
}
}
-
+ public virtual CostRatePeriod HourlyRateCostRateValue { get; set; }
+
+ public virtual decimal? ProbationPeriod2 { get; set; }
+
+ public virtual ValueListEntry ContractTypeValueListEntry { get; set; }
+
+ public virtual ValueListEntry QualifikationsBedarfValueListEntry { get; set; }
}
}
diff --git a/Data/Entities/Customer.cs b/Data/Entities/Customer.cs
index 32c271199..398284ccc 100644
--- a/Data/Entities/Customer.cs
+++ b/Data/Entities/Customer.cs
@@ -55,7 +55,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_VertretungGewuenscht = "VertretungGewuenscht";
public static string PropertyName_AbWelchemKrankheitsTag = "AbWelchemKrankheitsTag ";
public static string PropertyName_VertretungDringendErforderlich = "VertretungGewuenscht";
-
+ public static string PropertyName_Arbeitszeit = "Arbeitszeit";
private Auszahlungsintervall _Auszahlungsintervall;
private IList _AbsenceTimes;
@@ -102,7 +102,7 @@ namespace BeWo.Data.Entities
private bool _VertretungGewuenscht;
private int _AbWelchemKrankheitsTag;
private bool _VertretungDringendErforderlich;
-
+ private IList _Arbeitszeit;
public Customer()
{
@@ -694,5 +694,21 @@ namespace BeWo.Data.Entities
}
}
+ public virtual IList Arbeitszeiten
+ {
+ get { return _Arbeitszeit ?? (_Arbeitszeit = new List()); }
+
+ set
+ {
+ if (AreDifferent(_Arbeitszeit, value))
+ {
+ _Arbeitszeit = value;
+ }
+ }
+ }
+
+ public virtual bool Pflege { get; set; }
+ public virtual bool Toilettengang { get; set; }
+ public virtual bool Aggressiv { get; set; }
}
}
\ No newline at end of file
diff --git a/Data/Entities/Employee.cs b/Data/Entities/Employee.cs
index ade8bbcfe..acd8eea87 100644
--- a/Data/Entities/Employee.cs
+++ b/Data/Entities/Employee.cs
@@ -36,7 +36,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_Contracts = "Contracts";
- public static string PropertyName_Arbeitszeit = "Arbeitszeit";
+ public static string PropertyName_Arbeitszeiten = "Arbeitszeiten";
public static string PropertyName_Text1 = "Text1";
@@ -51,12 +51,14 @@ namespace BeWo.Data.Entities
public static string PropertyName_Notice2 = "Notice2";
public static String PropertyName_EmployeeColor = "EmployeeColor";
-
- private IList _AbsenceTimes;
+
+ public static string PropertyName_VarFieldValueList = "VarFieldValueList";
+
+ private IList _AbsenceTimes;
private IList _Contracts;
- private IList _Arbeitszeit;
+ private IList _Arbeitszeiten;
private IList _Employee2CustomerList;
@@ -97,9 +99,10 @@ namespace BeWo.Data.Entities
private IList _ValueList;
private String _EmployeeColor;
-
- public Employee()
+ private IList _VarFieldValueList;
+
+ public Employee()
{
_Tid = TableID.Employee;
}
@@ -156,15 +159,15 @@ namespace BeWo.Data.Entities
}
}
- public virtual IList Arbeitszeit
+ public virtual IList Arbeitszeiten
{
- get { return _Arbeitszeit ?? (_Arbeitszeit = new List()); }
+ get { return _Arbeitszeiten ?? (_Arbeitszeiten = new List()); }
set
{
- if (AreDifferent(_Arbeitszeit, value))
+ if (AreDifferent(_Arbeitszeiten, value))
{
- _Arbeitszeit = value;
+ _Arbeitszeiten = value;
}
}
}
@@ -387,7 +390,24 @@ namespace BeWo.Data.Entities
}
}
- public virtual Contract LastContract
+ public virtual bool Pflege { get; set; }
+ public virtual bool Toilettengang { get; set; }
+ public virtual bool Aggressiv { get; set; }
+
+ public virtual IList VarFieldValueList
+ {
+ get { return _VarFieldValueList ?? (_VarFieldValueList = new List()); }
+
+ set
+ {
+ if (AreDifferent(_VarFieldValueList, value))
+ {
+ _VarFieldValueList = value;
+ }
+ }
+ }
+
+ public virtual Contract LastContract
{
get
{
diff --git a/Data/Entities/Organisation.cs b/Data/Entities/Organisation.cs
index 02c82a7da..29f913ace 100644
--- a/Data/Entities/Organisation.cs
+++ b/Data/Entities/Organisation.cs
@@ -26,6 +26,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_Function = "OrganisationsFunction";
+ public static string PropertyName_Arbeitszeiten = "Arbeitszeiten";
+
private Address _Address;
private BankAccount _BankAccount;
@@ -48,6 +50,8 @@ namespace BeWo.Data.Entities
private IList _VarFieldValueList;
+ private IList _Arbeitszeiten;
+
public Organisation()
{
this._Tid = TableID.Organisation;
@@ -224,5 +228,19 @@ namespace BeWo.Data.Entities
}
}
}
+
+ public virtual IList Arbeitszeiten
+ {
+ get { return _Arbeitszeiten ?? (_Arbeitszeiten = new List()); }
+
+ set
+ {
+ if (AreDifferent(_Arbeitszeiten, value))
+ {
+ _Arbeitszeiten = value;
+ }
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/Data/Entities/SupportConcept.cs b/Data/Entities/SupportConcept.cs
index d54975511..d419c645b 100644
--- a/Data/Entities/SupportConcept.cs
+++ b/Data/Entities/SupportConcept.cs
@@ -36,7 +36,9 @@ namespace BeWo.Data.Entities
public static string PropertyName_ServiceAccountings = "ServiceAccountings";
- private DateTime? _ApprovalDate;
+ public static string PropertyName_VarFieldValueList = "VarFieldValueList";
+
+ private DateTime? _ApprovalDate;
private bool? _Conference;
@@ -65,7 +67,9 @@ namespace BeWo.Data.Entities
private IList _ValueList;
- public SupportConcept()
+ private IList _VarFieldValueList;
+
+ public SupportConcept()
{
_Tid = TableID.SupportConcept;
}
@@ -319,5 +323,18 @@ namespace BeWo.Data.Entities
}
}
}
- }
+
+ public virtual IList VarFieldValueList
+ {
+ get { return _VarFieldValueList ?? (_VarFieldValueList = new List()); }
+
+ set
+ {
+ if (AreDifferent(_VarFieldValueList, value))
+ {
+ _VarFieldValueList = value;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Data/Entities/Vertretung.cs b/Data/Entities/Vertretung.cs
index 2ea19bdc2..e05dfc673 100644
--- a/Data/Entities/Vertretung.cs
+++ b/Data/Entities/Vertretung.cs
@@ -118,21 +118,21 @@ namespace BeWo.Data.Entities
}
- public virtual long? AbsenceTimeOid
- {
- get
- {
- return this._AbsenceTimeOid;
- }
+ //public virtual long? AbsenceTimeOid
+ //{
+ // get
+ // {
+ // return this._AbsenceTimeOid;
+ // }
- set
- {
- if (this.AreDifferent(this._AbsenceTimeOid, value))
- {
- this._AbsenceTimeOid = value;
- }
- }
- }
+ // set
+ // {
+ // if (this.AreDifferent(this._AbsenceTimeOid, value))
+ // {
+ // this._AbsenceTimeOid = value;
+ // }
+ // }
+ //}
diff --git a/Data/Mappings/Contract.hbm.xml b/Data/Mappings/Contract.hbm.xml
index ed54a0226..ade19b1af 100644
--- a/Data/Mappings/Contract.hbm.xml
+++ b/Data/Mappings/Contract.hbm.xml
@@ -23,8 +23,12 @@
+
+
+
+
diff --git a/Data/Mappings/Customer.hbm.xml b/Data/Mappings/Customer.hbm.xml
index 932513144..51a619a61 100644
--- a/Data/Mappings/Customer.hbm.xml
+++ b/Data/Mappings/Customer.hbm.xml
@@ -45,7 +45,9 @@
-
+
+
+
@@ -119,5 +121,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Data/Mappings/Employee.hbm.xml b/Data/Mappings/Employee.hbm.xml
index f5cff0c87..381446783 100644
--- a/Data/Mappings/Employee.hbm.xml
+++ b/Data/Mappings/Employee.hbm.xml
@@ -22,6 +22,9 @@
+
+
+
@@ -73,9 +76,14 @@
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Data/Mappings/Organisation.hbm.xml b/Data/Mappings/Organisation.hbm.xml
index 9557e67a4..cba7efdde 100644
--- a/Data/Mappings/Organisation.hbm.xml
+++ b/Data/Mappings/Organisation.hbm.xml
@@ -31,9 +31,13 @@
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Data/Mappings/SupportConcept.hbm.xml b/Data/Mappings/SupportConcept.hbm.xml
index bd2caffb8..2f9182a5d 100644
--- a/Data/Mappings/SupportConcept.hbm.xml
+++ b/Data/Mappings/SupportConcept.hbm.xml
@@ -43,5 +43,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Data/Mappings/Vertretung.hbm.xml b/Data/Mappings/Vertretung.hbm.xml
index 9396af754..1a106f57f 100644
--- a/Data/Mappings/Vertretung.hbm.xml
+++ b/Data/Mappings/Vertretung.hbm.xml
@@ -22,8 +22,5 @@
-
-
-
\ No newline at end of file
diff --git a/Host/ReportView.aspx.cs b/Host/ReportView.aspx.cs
index 7d0e62388..4bd6a8b4c 100644
--- a/Host/ReportView.aspx.cs
+++ b/Host/ReportView.aspx.cs
@@ -123,6 +123,15 @@ namespace Host
case ReportTypes.Jahresbericht:
report = CreateJahresbericht();
break;
+ case ReportTypes.Employee:
+ report = CreateEmployeeDataReport();
+ break;
+ case ReportTypes.Contract:
+ report = new XtraReport();
+ break;
+ case ReportTypes.NotizenKategorie:
+ report = new XtraReport();
+ break;
default:
report = CreateQueryReport();
break;
@@ -479,7 +488,14 @@ namespace Host
return reportCreator.CreateJahresberichtReport(year, cbOid, teamOid, artOid);
}
- private AbstractReportCreator GetReportCreator()
+ private XtraReport CreateEmployeeDataReport()
+ {
+ long oid = long.Parse(Request.Params["eOid"]);
+
+ return reportCreator.CreateEmployeeDataReport(oid);
+ }
+
+ private AbstractReportCreator GetReportCreator()
{
String t = slicedToken["tenant"].ToString();
AbstractReportCreator creator = null;
diff --git a/Report/AbstractReportCreator.cs b/Report/AbstractReportCreator.cs
index 40640fb46..8aa8dcd64 100644
--- a/Report/AbstractReportCreator.cs
+++ b/Report/AbstractReportCreator.cs
@@ -62,6 +62,11 @@ namespace BeWo.Report
public abstract XtraReport CreateJahresberichtReport(int year, long? cbOid, long? teamOid, long? betreuungsartOid);
-
- }
+ public abstract XtraReport CreateEmployeeDataReport(long oid);
+
+ public abstract XtraReport CreateSbdLeistungsnachweisForAllCustomers(int month, int year, long orgaOid, long empOid, long serviceCategoryOid, int startDay, int endDay);
+
+ public abstract XtraReport CreateSbdLeistungsnachweisForSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long serviceCategoryOid, int startDay, int endDay);
+
+ }
}
\ No newline at end of file
diff --git a/Report/DefaultReportCreator.cs b/Report/DefaultReportCreator.cs
index 22559a540..bd010dfab 100644
--- a/Report/DefaultReportCreator.cs
+++ b/Report/DefaultReportCreator.cs
@@ -310,7 +310,15 @@ namespace BeWo.Report
public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
- List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
+ var os = new OperationsServiceImp();
+ var m = os.GetMandator();
+ if (m.AllowSbd)
+ {
+ return CreateSbdLeistungsnachweisForAllCustomers(month, year, orgaOid, empOid, serviceCategoryOid ?? 0, startDay, endDay);
+ }
+
+
+ List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
if (lROs.Count > 0)
{
@@ -322,19 +330,6 @@ namespace BeWo.Report
reportId = organisation.Name;
}
- if (String.IsNullOrEmpty(reportId))
- {
- var os = new OperationsServiceImp();
- var m = os.GetMandator();
- if (m.AllowSbd)
- {
- reportId = "LeistungsnachweisSbd";
- }
- }
-
-
-
-
var lServiceOverviewAllCustomersReport = this.FindReportImp(reportId);
lServiceOverviewAllCustomersReport.SetReportDataSource(lROs[0]);
(lServiceOverviewAllCustomersReport as XtraReport).CreateDocument();
@@ -352,32 +347,66 @@ namespace BeWo.Report
}
return new XtraReport();
}
-
- public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
+
+ public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
- String reportId = null;
+ var os = new OperationsServiceImp();
+ var m = os.GetMandator();
+ if (m.AllowSbd)
+ {
+ return CreateSbdLeistungsnachweisForSingleCustomerReport(customerOid, month, year, orgaOid, empOid, serviceCategoryOid ?? 0, startDay, endDay);
+
+ }
+
+ String reportId = null;
if (orgaOid > 0)
{
var organisation = DAOFactory.GenericDAO.LoadByID(orgaOid);
if (organisation != null)
reportId = organisation.Name;
}
- if (String.IsNullOrEmpty(reportId))
- {
- var os = new OperationsServiceImp();
- var m = os.GetMandator();
- if (!String.IsNullOrEmpty(m.ClientId) && m.ClientId == "SBD")
- {
- reportId = "LeistungsnachweisSbd";
- }
- }
+
var lServiceOverviewSingleCustomerReport = this.FindReportImp(reportId);
lServiceOverviewSingleCustomerReport.SetReportDataSource(ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid));
return lServiceOverviewSingleCustomerReport as XtraReport;
}
- public override XtraReport CreateServiceRecordListReport(long employeeOid, long customerOid, long supportConceptOid, long costbearer2SupportConceptOid, bool isLimitedToAdditionalServices, DateTimeSpan limitingTimeSpan)
+ public override XtraReport CreateSbdLeistungsnachweisForAllCustomers(int month, int year, long orgaOid, long empOid, long serviceCategoryOid, int startDay, int endDay)
+ {
+ var lROs = SbdStundenaufstellungRO.Create(month, year, orgaOid, empOid, serviceCategoryOid, startDay, endDay);
+
+ if (lROs.Count > 0)
+ {
+
+
+ var lServiceOverviewAllCustomersReport = this.FindReportImp();
+ lServiceOverviewAllCustomersReport.SetReportDataSource(lROs[0]);
+ (lServiceOverviewAllCustomersReport as XtraReport).CreateDocument();
+ var Report = lServiceOverviewAllCustomersReport as XtraReport;
+
+ for (int i = 1; i < lROs.Count; i++)
+ {
+ var lNext = FindReportImp();
+ lNext.SetReportDataSource(lROs[i]);
+ (lNext as XtraReport).CreateDocument();
+ Report.Pages.AddRange((lNext as XtraReport).Pages);
+ }
+
+ return lServiceOverviewAllCustomersReport as XtraReport;
+ }
+ return new XtraReport();
+ }
+
+ public override XtraReport CreateSbdLeistungsnachweisForSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long serviceCategoryOid, int startDay, int endDay)
+ {
+ var report = this.FindReportImp();
+ report.SetReportDataSource(SbdStundenaufstellungRO.Create(customerOid, month, year, orgaOid, empOid, serviceCategoryOid, startDay, endDay));
+
+ return report as XtraReport;
+ }
+
+ public override XtraReport CreateServiceRecordListReport(long employeeOid, long customerOid, long supportConceptOid, long costbearer2SupportConceptOid, bool isLimitedToAdditionalServices, DateTimeSpan limitingTimeSpan)
{
IBeWoReport lServiceRecordListReport = FindReportImp();
@@ -534,5 +563,12 @@ namespace BeWo.Report
return report as XtraReport;
}
- }
+
+ public override XtraReport CreateEmployeeDataReport(long oid)
+ {
+ var report = FindReportImp();
+ report.SetReportDataSource(EmployeeDataRO.Create(MapperFactory.EmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID(oid))));
+ return report as XtraReport;
+ }
+ }
}
\ No newline at end of file
diff --git a/Report/DefaultReports/LeistungsnachweisSbd.cs b/Report/DefaultReports/LeistungsnachweisSbd.cs
index b11c18e1a..cb0d444eb 100644
--- a/Report/DefaultReports/LeistungsnachweisSbd.cs
+++ b/Report/DefaultReports/LeistungsnachweisSbd.cs
@@ -6,6 +6,7 @@ using BeWo.Report.ReportObjects;
using BeWo.Report;
using DevExpress.XtraReports.UI;
using System.Data;
+using BeWo.Service.Plugins;
using BS.Shared.Core;
namespace BeWo.Report.DefaultReports
@@ -13,7 +14,7 @@ namespace BeWo.Report.DefaultReports
[IDSpecificClass(Identifier = "LeistungsnachweisSbd")]
public partial class LeistungsnachweisSbd : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
{
- public LeistungsnachweisSbd()
+ public LeistungsnachweisSbd()
{
InitializeComponent();
@@ -27,16 +28,19 @@ namespace BeWo.Report.DefaultReports
private void InitTable(ServicesOverviewRO ro)
{
+ var vs = PluginLoader.FindClass();
+
decimal gesamt = 0;
-
- DateTime startMonat = ro.StartDate;
- DateTime endMonat = ro.EndDate;
+
+ DateTime startMonat = ro.StartDate;
+ DateTime endMonat = ro.EndDate;
lblMitarbeiter.Text = String.Format("{0}", ro.MainAttendant);
lblKlient.Text = String.Format("{0} {1}", ro.CustomerFirstName, ro.CustomerLastName);
var serviceDetails = new List();
- Dictionary day2DetailDict = new Dictionary();
+ Dictionary day2DetailDict =
+ new Dictionary();
while (startMonat <= endMonat)
{
@@ -48,29 +52,32 @@ namespace BeWo.Report.DefaultReports
{
detail.IstSamstag = true;
}
+
if (startMonat.DayOfWeek == DayOfWeek.Sunday)
{
detail.IstSonntag = true;
}
- var ferien = GetFerien(startMonat);
+
+ var ferien = vs.GetFerien(startMonat, "nrw");
if (ferien != null)
{
detail.IstFerien = true;
detail.TimeRangeString = ferien.Name;
}
- Feiertag ft = GetFeiertag(startMonat);
+ var ft = vs.GetFeiertag(startMonat);
if (ft != null)
{
detail.IstFeiertag = true;
detail.TimeRangeString = ft.Name;
}
+
serviceDetails.Add(detail);
if (!day2DetailDict.ContainsKey(detail.StartDate.Day))
{
day2DetailDict.Add(detail.StartDate.Day, detail);
}
-
+
startMonat = startMonat.AddDays(1);
}
@@ -84,120 +91,10 @@ namespace BeWo.Report.DefaultReports
sd.Notice = serviceDetail.Notice;
}
}
+
ro.Services = serviceDetails;
}
- private Ferien GetFerien(DateTime start)
- {
- var ferienList = GetFerienNrw();
-
- foreach (var ferien in ferienList)
- {
- if (start >= ferien.Start && start <= ferien.Ende)
- return ferien;
- }
- return null;
- }
-
- private Feiertag GetFeiertag(DateTime start)
- {
- List feiertage = GetFeiertage(start.Year);
-
- foreach (var ft in feiertage)
- {
- if (start == ft.Datum)
- return ft;
- }
- return null;
- }
-
- private List GetFeiertage(int year)
- {
- List list = new List();
-
- list.Add(new Feiertag() {Datum = new DateTime(year, 1, 1), Name = "Neujahr"});
-
-
- list.Add(new Feiertag() {Datum = new DateTime(year, 5, 1), Name = "Tag der Arbeit"});
- list.Add(new Feiertag() {Datum = new DateTime(year, 10, 3), Name = "Tag der dt. Einheit"});
- list.Add(new Feiertag() {Datum = new DateTime(year, 11, 1), Name = "Allerheiligen"});
- list.Add(new Feiertag() {Datum = new DateTime(year, 12, 24), Name = "Heilig Abend"});
- list.Add(new Feiertag() {Datum = new DateTime(year, 12, 25), Name = "1. Weihnachtstag"});
- list.Add(new Feiertag() {Datum = new DateTime(year, 12, 26), Name = "2. Weihnachtstag"});
- if (year == 2017)
- {
- list.Add(new Feiertag() { Datum = new DateTime(year, 10, 31), Name = "Reformationstag" });
- }
-
- DateTime osterSonntag = GetOsterSonntag(year);
- list.Add(new Feiertag() {Datum = osterSonntag.AddDays(-2), Name = "Karfreitag"});
- list.Add(new Feiertag() {Datum = osterSonntag.AddDays(1), Name = "Ostermontag"});
- list.Add(new Feiertag() {Datum = osterSonntag.AddDays(39), Name = "Christi Himmelfahrt"});
-
- list.Add(new Feiertag() {Datum = osterSonntag.AddDays(50), Name = "Pfingstmontag"});
- list.Add(new Feiertag() { Datum = osterSonntag.AddDays(60), Name = "Fronleichnam" });
-
- return list;
- }
-
-
- protected DateTime GetOsterSonntag(int year)
- {
-
- int g, h, c, j, l, i;
-
- g = year % 19;
- c = year / 100;
- h = ((c - (c / 4)) - (((8 * c) + 13) / 25) + (19 * g) + 15) % 30;
- i = h - (h / 28) * (1 - (29 / (h + 1)) * ((21 - g) / 11));
- j = (year + (year / 4) + i + 2 - c + (c / 4)) % 7;
-
- l = i - j;
- int month = (int)(3 + ((l + 40) / 44));
- int day = (int)(l + 28 - 31 * (month / 4));
-
- return new DateTime(year, month, day);
-
- }
-
- private List GetFerienNrw()
- {
- List list = new List();
- list.Add(new Ferien() {Name = "Sommerferien", Start = new DateTime(2014, 7, 7), Ende = new DateTime(2014, 8, 19)});
- list.Add(new Ferien() {Name = "Herbstferien", Start = new DateTime(2014, 10, 6), Ende = new DateTime(2014, 10, 18)});
- list.Add(new Ferien() {Name = "Weihnachtsferien", Start = new DateTime(2014, 12, 22), Ende = new DateTime(2015, 1, 6)});
-
- list.Add(new Ferien() {Name = "Osterferien", Start = new DateTime(2015, 3, 30), Ende = new DateTime(2015, 4, 11)});
- list.Add(new Ferien() {Name = "Sommerferien", Start = new DateTime(2015, 6, 29), Ende = new DateTime(2015, 8, 11)});
- list.Add(new Ferien() {Name = "Herbstferien", Start = new DateTime(2015, 10, 5), Ende = new DateTime(2015, 10, 17)});
- list.Add(new Ferien() {Name = "Weihnachtsferien", Start = new DateTime(2015, 12, 23), Ende = new DateTime(2016, 1, 6)});
-
- list.Add(new Ferien() {Name = "Osterferien", Start = new DateTime(2016, 3, 21), Ende = new DateTime(2016, 4, 2)});
- list.Add(new Ferien() {Name = "Sommerferien", Start = new DateTime(2016, 7, 11), Ende = new DateTime(2016, 8, 23)});
- list.Add(new Ferien() {Name = "Herbstferien", Start = new DateTime(2016, 10, 10), Ende = new DateTime(2016, 10, 21)});
- list.Add(new Ferien() {Name = "Weihnachtsferien", Start = new DateTime(2016, 12, 23), Ende = new DateTime(2017, 1, 6)});
-
- list.Add(new Ferien() {Name = "Osterferien", Start = new DateTime(2017, 4, 10), Ende = new DateTime(2017, 4, 22)});
- list.Add(new Ferien() {Name = "Sommerferien", Start = new DateTime(2017, 7, 17), Ende = new DateTime(2017, 8, 29)});
- list.Add(new Ferien() { Name = "Herbstferien", Start = new DateTime(2017, 10, 23), Ende = new DateTime(2017, 11, 4) });
- list.Add(new Ferien() { Name = "Weihnachtsferien", Start = new DateTime(2017, 12, 27), Ende = new DateTime(2018, 1, 6) });
-
-
- return list;
- }
}
-
- class Ferien
- {
- public String Name { get; set; }
- public DateTime Start { get; set; }
- public DateTime Ende { get; set; }
- }
-
- class Feiertag
- {
- public String Name { get; set; }
- public DateTime Datum { get; set; }
- }
}
diff --git a/Report/DefaultReports/LeistungsnachweisSbd.designer.cs b/Report/DefaultReports/LeistungsnachweisSbd.designer.cs
index 9e8523f05..268c1ce74 100644
--- a/Report/DefaultReports/LeistungsnachweisSbd.designer.cs
+++ b/Report/DefaultReports/LeistungsnachweisSbd.designer.cs
@@ -30,6 +30,7 @@ namespace BeWo.Report.DefaultReports
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
@@ -170,9 +171,6 @@ namespace BeWo.Report.DefaultReports
//
this.ruleIstFerien.Condition = "[IstSamstag] Or [IstSonntag] Or [IstFeiertag] Or [IstFerien]";
this.ruleIstFerien.DataMember = "Services";
- //
- //
- //
this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightSteelBlue;
this.ruleIstFerien.Name = "ruleIstFerien";
//
@@ -510,9 +508,12 @@ namespace BeWo.Report.DefaultReports
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLM", "{0:0.00}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldStd")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.StylePriority.UseTextAlignment = false;
+ xrSummary1.FormatString = "{0:0.00}";
+ xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrTableCell23.Summary = xrSummary1;
this.xrTableCell23.Weight = 0.16551729631138867D;
//
// xrTableCell24
@@ -558,7 +559,7 @@ namespace BeWo.Report.DefaultReports
this.FieldCaption,
this.PageInfo,
this.DataField});
- this.Version = "13.2";
+ this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
diff --git a/Report/DefaultReports/ServicesOverviewReport.cs b/Report/DefaultReports/ServicesOverviewReport.cs
index 83bc47192..9ee3105d5 100644
--- a/Report/DefaultReports/ServicesOverviewReport.cs
+++ b/Report/DefaultReports/ServicesOverviewReport.cs
@@ -1,7 +1,9 @@
using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
namespace BeWo.Report.DefaultReports
{
+ [IDSpecificClass(Identifier = "QuittierungsbelegAlt")]
public partial class Stundenzettel : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
{
public Stundenzettel()
diff --git a/Report/Report.csproj b/Report/Report.csproj
index 81b28dd1e..eb50ffae0 100644
--- a/Report/Report.csproj
+++ b/Report/Report.csproj
@@ -149,6 +149,12 @@
AdditionalServiceBookingReport.cs
+
+ Component
+
+
+ EmployeeDataReport.cs
+
Component
@@ -191,6 +197,12 @@
MedikamentenverordnungslistenReport.cs
+
+ Component
+
+
+ Quittierungsbeleg.cs
+
Component
@@ -313,6 +325,7 @@
+
@@ -324,6 +337,7 @@
+
@@ -340,6 +354,10 @@
AdditionalServiceBookingReport.cs
+
+ EmployeeDataReport.cs
+ Designer
+
Finanzauswertung.cs
Designer
@@ -363,6 +381,10 @@
MedikamentenverordnungslistenReport.cs
+
+ Quittierungsbeleg.cs
+ Designer
+
Teamauslastung.cs
diff --git a/Report/ReportObjects/FLSReportRO.cs b/Report/ReportObjects/FLSReportRO.cs
index b5373f657..9c3d83e75 100644
--- a/Report/ReportObjects/FLSReportRO.cs
+++ b/Report/ReportObjects/FLSReportRO.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
-
+using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
-
+using BeWo.Service.DCEntityMapper;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
@@ -426,6 +426,8 @@ namespace BeWo.Report.ReportObjects
public string[] Goals { get; set; }
+ public string GoalString { get; set; }
+
public string GroupName { get; set; }
public string InsUser { get; set; }
@@ -478,5 +480,27 @@ namespace BeWo.Report.ReportObjects
public long? ServiceRecordOid { get; set; }
}
+
+ public static void CreateGoalList(FLSReportServiceRecord sr)
+ {
+ if (sr.ServiceRecordOid.HasValue)
+ {
+ var srBO = DAOFactory.GenericDAO.LoadByID(sr.ServiceRecordOid.Value);
+ var dc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(srBO);
+
+ if (dc.Goals != null && dc.Goals.Count > 0)
+ {
+ sr.GoalString = "";
+ foreach (var goal in dc.Goals)
+ {
+ if (sr.GoalString.Length > 0)
+ sr.GoalString += ", ";
+ sr.GoalString += goal.TypeDescription;
+
+ }
+ }
+ }
+
+ }
}
}
\ No newline at end of file
diff --git a/Report/ReportObjects/InvoiceCustomerRO.cs b/Report/ReportObjects/InvoiceCustomerRO.cs
index da7bda82c..bca79a966 100644
--- a/Report/ReportObjects/InvoiceCustomerRO.cs
+++ b/Report/ReportObjects/InvoiceCustomerRO.cs
@@ -67,6 +67,8 @@ namespace BeWo.Report.ReportObjects
public string SenderPhone { get; set; }
+ public string SenderMail { get; set; }
+
public string TotalClaim { get; set; }
public string RecipientSalutationAddressField { get; set; }
@@ -169,6 +171,11 @@ namespace BeWo.Report.ReportObjects
{
result.SenderPhone = "Tel.: " + iContactDC.ContactValue;
}
+
+ if (iContactDC.ContactType == ContactType.business_Mail)
+ {
+ result.SenderMail = iContactDC.ContactValue;
+ }
}
if (pDC.InvoiceItems != null && pDC.InvoiceItems.Count > 0)
diff --git a/Report/ReportObjects/MitarbeiterauslastungRO.cs b/Report/ReportObjects/MitarbeiterauslastungRO.cs
index 7f21ac310..b6e1398a2 100644
--- a/Report/ReportObjects/MitarbeiterauslastungRO.cs
+++ b/Report/ReportObjects/MitarbeiterauslastungRO.cs
@@ -47,6 +47,19 @@ namespace BeWo.Report.ReportObjects
}
public static MitarbeiterauslastungRO Create(long? employeeOid, IList teamOids, DateTime startDate, DateTime endDate)
+ {
+ IList employeeOids = new List();
+
+ if (employeeOid.HasValue)
+ {
+ employeeOids.Add(employeeOid.Value);
+ }
+
+ return Create(employeeOids, teamOids, startDate, endDate);
+ }
+
+
+ public static MitarbeiterauslastungRO Create(IList employeeOids, IList teamOids, DateTime startDate, DateTime endDate)
{
var ro = new MitarbeiterauslastungRO();
@@ -56,10 +69,10 @@ namespace BeWo.Report.ReportObjects
//Dictionary teamEmployeeDict = new Dictionary();
IList employees = null;
- if (employeeOid.HasValue)
+ if (employeeOids != null && employeeOids.Count > 0)
{
- var emp = DAOFactory.GenericDAO.GetByID(employeeOid.Value);
- employees = new List { emp };
+ //var emp = DAOFactory.GenericDAO.GetByID(employeeOid.Value);
+ employees = DAOFactory.GenericDAO.LoadByIDs(employeeOids);
}
else if (teamOids != null)
{
@@ -292,6 +305,12 @@ namespace BeWo.Report.ReportObjects
public decimal IstKw5 { get; set; }
public decimal IstKw6 { get; set; }
+
+ public String Custom1 { get; set; }
+
+ public String Custom2 { get; set; }
+
+ public String Custom3 { get; set; }
}
public class TeamDetail
diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
index 4ddcf928f..0d05f7165 100644
--- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
+++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
@@ -266,23 +266,29 @@ namespace BeWo.Report.ReportObjects
tatSollStdGesamt += tatSollStdImVertragsUndBerichtzeitraum;
var festeflsSollProMonat = BerechneFlsSollProMonat(emp, berichtsAnfang, berichtsEnde);
- var flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
+ decimal flsSollImVertragsUndBerichtzeitraum = 0;
if (festeflsSollProMonat.HasValue)
- {
- if (stundenSollProMonat.HasValue)
+ {
+ flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
+
+ if (stundenSollProMonat.HasValue)
{
- flsSollImVertragsUndBerichtzeitraum *= festeflsSollProMonat.Value / stundenSollProMonat.Value;
+ flsSollImVertragsUndBerichtzeitraum *= (festeflsSollProMonat.Value / stundenSollProMonat.Value);
}
}
else
{
if (c != null && c.WeeklyFLS.HasValue)
{
-
- }
- if (c != null && c.WeeklyFLS.HasValue && c.WeeklyTotalHours.HasValue && c.WeeklyTotalHours.Value != 0)
- flsSollImVertragsUndBerichtzeitraum *= c.WeeklyFLS.Value / c.WeeklyTotalHours.Value;
+ flsSollImVertragsUndBerichtzeitraum = tatSollStdImVertragsUndBerichtzeitraum;
+
+ if (c.WeeklyTotalHours.HasValue && c.WeeklyTotalHours.Value != 0)
+ {
+ flsSollImVertragsUndBerichtzeitraum *= c.WeeklyFLS.Value / c.WeeklyTotalHours.Value;
+ }
+
+ }
}
flsSollGesamt += flsSollImVertragsUndBerichtzeitraum;
diff --git a/Report/ReportObjects/ServiceInvoiceRO.cs b/Report/ReportObjects/ServiceInvoiceRO.cs
index e778f55a4..9f388e13f 100644
--- a/Report/ReportObjects/ServiceInvoiceRO.cs
+++ b/Report/ReportObjects/ServiceInvoiceRO.cs
@@ -80,6 +80,8 @@ namespace BeWo.Report.ReportObjects
public string RecipientPostCodeAndTown { get; set; }
+ public string RecipientAddressLine1 { get; set; }
+
public string RecipientStreet { get; set; }
public string RecipientPoBox { get; set; }
@@ -129,7 +131,14 @@ namespace BeWo.Report.ReportObjects
pDC.InvoiceBase.SenderLastName.ToStringNullCheck(),
SenderContactPersonDivision = pDC.InvoiceBase.SenderDivision,
};
- if (String.IsNullOrWhiteSpace(lResult.RecipientContactPerson))
+
+ if (pDC.InvoiceBase.RecipientAddressOid.HasValue)
+ {
+ var address = DAOFactory.GenericDAO.LoadByID(pDC.InvoiceBase.RecipientAddressOid.Value);
+ lResult.RecipientAddressLine1 = address.AddressLine1;
+ }
+
+ if (String.IsNullOrWhiteSpace(lResult.RecipientContactPerson))
{
lResult.RecipientContactPerson = "";
}
diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs
index 62158841d..ecfab0dee 100644
--- a/Report/ReportObjects/ServicesOverviewRO.cs
+++ b/Report/ReportObjects/ServicesOverviewRO.cs
@@ -6,6 +6,7 @@ using System.Text;
using BeWo.Data;
using BeWo.Data.Access;
using BeWo.Data.Entities;
+using BeWo.Service.Configuration;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
@@ -99,6 +100,10 @@ namespace BeWo.Report.ReportObjects
public decimal RateFactor { get; set; }
+ public decimal MinutenGeleistetBisVormonat { get; set; }
+
+ public decimal MinutenSollBisVormonat { get; set; }
+
public List Services
{
get
@@ -169,6 +174,10 @@ namespace BeWo.Report.ReportObjects
public IList CostBearer2SupportConceptList { get; set; }
+ public MandatorDC Mandator { get; set; }
+
+ public long? FilteredEmployeeOid { get; set; }
+
// private CostBearer2SupportConceptData CostBearer2SupportConceptData { get; set; }
public static List Create(int pMonth, int pYear, long orgaOid, long empOid, int startDay,
@@ -380,6 +389,72 @@ namespace BeWo.Report.ReportObjects
}
}
+ public void CalculateFLSSollIst2()
+ {
+ if (this.SupportConceptCostBearer != null &&
+ this.SupportConceptCostBearer.CostBearer2SupportConceptOid != null)
+ {
+
+ CostBearer2SupportConcept c2s =
+ DAOFactory.GenericDAO.LoadByID(this.SupportConceptCostBearer
+ .CostBearer2SupportConceptOid.Value);
+ var calc = PluginLoader.FindClass(c2s.CostBearer.ID) ??
+ Calculations.GetInstance(c2s.CostBearer.ID);
+
+ var costRatePeriods =
+ MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods);
+ foreach (var scap in c2s.ApprovalPeriodList)
+ {
+ if (scap.StartDate.HasValue && scap.StartDate < this.StartDate && scap.EndDate.HasValue &&
+ scap.EndDate >= this.StartDate)
+ {
+ var scapdc = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod
+ .MapToNewDC(scap);
+
+ DateTime start = scap.StartDate.Value;
+ DateTime end = this.StartDate;
+
+ decimal approvedSoll = calc.GetApprovedHoursForPeriod(scapdc, costRatePeriods, start, end.AddDays(-1)) ?? 0;
+
+
+
+ //Berechne Ist bis Ende des Vormonats
+ decimal minutenIst = 0;
+
+ IList allServiceRecords = c2s.ServiceRecords;
+ Dictionary groupBookingDict = new Dictionary();
+ foreach (var item in allServiceRecords)
+ {
+ if (!item.GroupOid.HasValue || !groupBookingDict.ContainsKey(item.GroupOid.Value))
+ {
+ if (item.Start != null)
+ {
+ if (item.Start >= this.SupportConceptCostBearer.StartDate.Value &&
+ item.Start.Value < end)
+ {
+ if (item.ServiceDescription != null &&
+ item.ServiceDescription.ServiceCategory != null &&
+ item.ServiceDescription.ServiceCategory.IsBillable)
+ {
+ minutenIst +=
+ (item.RoundedDuration *
+ item.ServiceDescription.ServiceCategory.Percentage) / 100;
+
+ if (item.GroupOid.HasValue)
+ groupBookingDict.Add(item.GroupOid.Value, true);
+ }
+ }
+ }
+ }
+ }
+
+ this.MinutenGeleistetBisVormonat = minutenIst;
+ this.MinutenSollBisVormonat = approvedSoll * 60;
+ }
+ }
+ }
+ }
+
private static ServicesOverviewRO Create(Customer customer, DateTimeSpan span, bool disableEmptySupportConcepts, long orgaOid, long empOid, bool searchServiceRecordsByEndDate, long? serviceCategoryOid = null)
{
// IList lServiceRecords = pServiceRecords;
@@ -388,6 +463,10 @@ namespace BeWo.Report.ReportObjects
var lResult = new ServicesOverviewRO();
+ if (empOid > 0)
+ {
+ lResult.FilteredEmployeeOid = empOid;
+ }
lResult.CustomerOid = customer.Oid.Value;
lResult.Abwesenheiten = new List();
lResult.CostBearer2SupportConceptList = new List();
@@ -554,7 +633,7 @@ namespace BeWo.Report.ReportObjects
var relDC = cb2sc.MapToNewDC();
var rateFactorsInSpanList = relDC.CostBearer.CostRatePeriods.GetSpans(CostRatePeriodType.RateFactor,
- start.Value.Date, end.Value.Date).ToList();
+ lResult.StartDate, lResult.EndDate).ToList();
if (rateFactorsInSpanList.Count > 0)
{
var crv = rateFactorsInSpanList.Last().Key;
@@ -705,6 +784,8 @@ namespace BeWo.Report.ReportObjects
sd.FLSUnqualifiedString = String.Format("{0:0.##}", sd.FLSUnqualified);
sd.FLSUnqualifiedString = sd.FLSUnqualifiedString.Replace(".", ",");
+ sd.EmployeeOid = iSr.Employee.Oid.Value;
+
string employeeAbbr = iSr.Employee.Person.Abbreviation;
string employeeFullName = iSr.Employee.Person.FirstName + " " + iSr.Employee.Person.LastName;
@@ -1086,6 +1167,7 @@ namespace BeWo.Report.ReportObjects
lResult.TotalGefahreneKilometerString = String.Format("{0:0.##}", lResult.TotalGefahreneKilometer);
+ lResult.Mandator = MapperFactory.MandatorDC_Mandator.MapToNewDC(AppSettings.GetMandatorEntity());
// if (cb2scOid2Data.Count == 1)
// {
// lResult.CostBearer2SupportConceptData = cb2scOid2Data.Values.First();
@@ -1125,6 +1207,10 @@ namespace BeWo.Report.ReportObjects
if (sig != null)
{
sd.Signature = sig.DataBild;
+ if (sig.Zeitstempel > DateTime.MinValue)
+ {
+ sd.SignatureDate = sig.Zeitstempel;
+ }
}
}
}
@@ -1176,8 +1262,8 @@ namespace BeWo.Report.ReportObjects
newRo.TotalFLSUnqualified = ro.TotalFLSUnqualified;
newRo.TotalFLSPerCostBearer = ro.TotalFLSPerCostBearer;
newRo.TotalGefahreneKilometer = ro.TotalGefahreneKilometer;
-
-
+ newRo.SupportConceptCostBearer = ro.SupportConceptCostBearer;
+ newRo.Mandator = ro.Mandator;
return newRo;
}
@@ -1205,6 +1291,8 @@ namespace BeWo.Report.ReportObjects
public string EmployeeAbbr { get; set; }
+ public long EmployeeOid { get; set; }
+
public int EmployeeCount { get; set; }
public string EmployeeFullname { get; set; }
@@ -1280,8 +1368,11 @@ namespace BeWo.Report.ReportObjects
public long? SignatureOid { get; set; }
public String Signature { get; set; }
+ public DateTime? SignatureDate { get; set; }
+
public string EmployeeFirstName { get; set; }
public string EmployeeLastName { get; set; }
+
}
public class ServiceDoubleDetail
diff --git a/Report/ReportObjects/Settlement2RO.cs b/Report/ReportObjects/Settlement2RO.cs
index 4eeb263d2..cb0aa296c 100644
--- a/Report/ReportObjects/Settlement2RO.cs
+++ b/Report/ReportObjects/Settlement2RO.cs
@@ -235,7 +235,7 @@ namespace BeWo.Report.ReportObjects
if (pDC.Claim > 0)
{
- lResult.FinalSentence = "Bitte überweisen Sie unsere Restforderung nach Prüfung der Schlussabrechnung auf das unten angegebene Konto.";
+ lResult.FinalSentence = "Bitte überweisen Sie unsere Restforderung nach Prüfung der Endabrechnung auf das unten angegebene Konto.";
}
else if (pDC.Claim == 0)
{
diff --git a/Report/ReportObjects/SettlementRO.cs b/Report/ReportObjects/SettlementRO.cs
index ea637cae9..2ee405a3e 100644
--- a/Report/ReportObjects/SettlementRO.cs
+++ b/Report/ReportObjects/SettlementRO.cs
@@ -532,7 +532,7 @@ namespace BeWo.Report.ReportObjects
if (pDC.Claim > 0)
{
- lResult.FinalSentence = "Bitte überweisen Sie unsere Restforderung nach Prüfung der Schlussabrechnung auf das unten angegebene Konto.";
+ lResult.FinalSentence = "Bitte überweisen Sie unsere Restforderung nach Prüfung der Endabrechnung auf das unten angegebene Konto.";
}
else if (pDC.Claim == 0)
{
diff --git a/ReportImp/AachenerVereinReports/Mitarbeiterauswertung.cs b/ReportImp/AachenerVereinReports/Mitarbeiterauswertung.cs
index a2be06fff..b9a0d7180 100644
--- a/ReportImp/AachenerVereinReports/Mitarbeiterauswertung.cs
+++ b/ReportImp/AachenerVereinReports/Mitarbeiterauswertung.cs
@@ -65,7 +65,7 @@ namespace BeWo.AachenerVerein
Employee emp = empDict[oid];
IList absenceTimes = emp.AbsenceTimes;
- row.Field2 = emp.Person.LastName;
+ row.Field2 = String.Format("{0}, {1}", emp.Person.LastName, emp.Person.FirstName);
row.Field3 = null;
decimal flsIst = 0;
@@ -377,7 +377,14 @@ namespace BeWo.AachenerVerein
return contract.WeeklyTotalHours*4;
}
}
- if (emp.Person.LastName.ToLower() == "terhaart")
+ if (emp.Person.LastName.ToLower() == "schröder" && emp.Person.FirstName.ToLower() == "rebecca")
+ {
+ if (contract != null)
+ {
+ return contract.WeeklyTotalHours * 4;
+ }
+ }
+ if (emp.Person.LastName.ToLower() == "terhaart")
return 50m;
if (emp.Person.LastName.ToLower() == "vossebrecher")
return 22.5m;
diff --git a/ReportImp/AdikKleve/InvoiceCustomerReport.Designer.cs b/ReportImp/AdikKleve/InvoiceCustomerReport.Designer.cs
index 47cf625c7..c108936f0 100644
--- a/ReportImp/AdikKleve/InvoiceCustomerReport.Designer.cs
+++ b/ReportImp/AdikKleve/InvoiceCustomerReport.Designer.cs
@@ -710,8 +710,7 @@ namespace AdikKleve
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(351.375F, 77.49999F);
this.xrLabel7.StylePriority.UseFont = false;
- this.xrLabel7.Text = "Klombeckstr. 2 (Verwaltung)\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2" +
- "114\r\n";
+ this.xrLabel7.Text = "Hoffmannallee 105\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2114\r\n";
//
// xrLine1
//
diff --git a/ReportImp/AdikKleve/ServiceInvoiceReport.Designer.cs b/ReportImp/AdikKleve/ServiceInvoiceReport.Designer.cs
index f630af24f..f060f4764 100644
--- a/ReportImp/AdikKleve/ServiceInvoiceReport.Designer.cs
+++ b/ReportImp/AdikKleve/ServiceInvoiceReport.Designer.cs
@@ -41,6 +41,7 @@ namespace AdikKleve
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.lblFax = new DevExpress.XtraReports.UI.XRLabel();
this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
@@ -95,7 +96,6 @@ namespace AdikKleve
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
- this.lblFax = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
@@ -121,9 +121,6 @@ namespace AdikKleve
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
- //
- //
- //
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
@@ -151,10 +148,10 @@ namespace AdikKleve
//
this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+ this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(727F, 127.08F);
- this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.CenterImage;
this.xrPictureBox1.StylePriority.UseBorders = false;
//
// bottomMarginBand1
@@ -163,6 +160,7 @@ namespace AdikKleve
this.xrLabel10,
this.xrLine1,
this.xrLabel11});
+ this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrLabel10
@@ -174,8 +172,7 @@ namespace AdikKleve
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(351.375F, 77.49999F);
this.xrLabel10.StylePriority.UseFont = false;
- this.xrLabel10.Text = "Klombeckstr. 2 (Verwaltung)\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2" +
- "114\r\n";
+ this.xrLabel10.Text = "Hoffmannallee 105\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2114\r\n";
//
// xrLine1
//
@@ -213,6 +210,16 @@ namespace AdikKleve
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
+ // lblFax
+ //
+ this.lblFax.CanShrink = true;
+ this.lblFax.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 117F);
+ this.lblFax.Name = "lblFax";
+ this.lblFax.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblFax.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.lblFax.SizeF = new System.Drawing.SizeF(292F, 17F);
+ this.lblFax.StylePriority.UseFont = false;
+ //
// lblAddress
//
this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 0F);
@@ -855,16 +862,6 @@ namespace AdikKleve
this.xrLabel1.Text = "xrLabel1";
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
//
- // lblFax
- //
- this.lblFax.CanShrink = true;
- this.lblFax.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 117F);
- this.lblFax.Name = "lblFax";
- this.lblFax.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblFax.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.lblFax.SizeF = new System.Drawing.SizeF(292F, 17F);
- this.lblFax.StylePriority.UseFont = false;
- //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
@@ -887,7 +884,7 @@ namespace AdikKleve
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
- this.Version = "13.2";
+ this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
diff --git a/ReportImp/AdikKleve/ServicesOverviewReport.Designer.cs b/ReportImp/AdikKleve/ServicesOverviewReport.Designer.cs
index f0e6f11ab..07da9ee70 100644
--- a/ReportImp/AdikKleve/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/AdikKleve/ServicesOverviewReport.Designer.cs
@@ -39,6 +39,7 @@ namespace AdikKleve
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
@@ -49,6 +50,9 @@ namespace AdikKleve
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
+ this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
@@ -76,7 +80,6 @@ namespace AdikKleve
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
- this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
@@ -87,10 +90,9 @@ namespace AdikKleve
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldHours = new DevExpress.XtraReports.UI.CalculatedField();
- this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
- this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
- this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -189,6 +191,16 @@ namespace AdikKleve
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.21947326355415672D;
//
+ // xrTableCell2
+ //
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
+ this.xrTableCell2.StylePriority.UsePadding = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.Text = "Unterschrift";
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell2.Weight = 0.36578877212122679D;
+ //
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -308,6 +320,39 @@ namespace AdikKleve
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell17.Weight = 0.11363633739220362D;
//
+ // xrTableCell10
+ //
+ this.xrTableCell10.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrPictureBox2});
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
+ this.xrTableCell10.StylePriority.UsePadding = false;
+ this.xrTableCell10.StylePriority.UseTextAlignment = false;
+ this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell10.Weight = 0.1893938716363312D;
+ //
+ // xrPictureBox2
+ //
+ this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
+ this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrPictureBox2.Name = "xrPictureBox2";
+ this.xrPictureBox2.SizeF = new System.Drawing.SizeF(150F, 30F);
+ this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+ this.xrPictureBox2.StylePriority.UseBorders = false;
+ this.xrPictureBox2.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.xrPictureBox1_BeforePrint);
+ //
+ // GroupHeader1
+ //
+ this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableServiceRecords1});
+ this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.GroupHeader1.HeightF = 40F;
+ this.GroupHeader1.Name = "GroupHeader1";
+ this.GroupHeader1.RepeatEveryPage = true;
+ this.GroupHeader1.StylePriority.UseFont = false;
+ //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
@@ -384,7 +429,7 @@ namespace AdikKleve
this.xrLabel28.SizeF = new System.Drawing.SizeF(324.8749F, 18F);
this.xrLabel28.StylePriority.UseBorders = false;
this.xrLabel28.StylePriority.UseFont = false;
- this.xrLabel28.Text = "ADiK-Kleve, Nassauerallee 2, 47533 Kleve";
+ this.xrLabel28.Text = "ADiK-Kleve, Hoffmannallee 105, 47533 Kleve";
//
// xrLabel29
//
@@ -573,7 +618,7 @@ namespace AdikKleve
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(143.75F, 54.45833F);
this.xrLabel15.StylePriority.UseFont = false;
- this.xrLabel15.Text = "Nassauerallee 2\r\n47533 Kleve";
+ this.xrLabel15.Text = "Hoffmannallee 105\r\n47533 Kleve";
//
// xrLine1
//
@@ -585,26 +630,17 @@ namespace AdikKleve
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel6,
+ this.xrLabel8,
+ this.xrLabel2,
this.xrLabel3,
this.xrLabel4,
this.xrLabel5});
this.ReportFooter.Font = new System.Drawing.Font("Arial", 8F);
- this.ReportFooter.HeightF = 118F;
+ this.ReportFooter.HeightF = 138F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
- // xrLabel6
- //
- this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(370.5419F, 100F);
- this.xrLabel6.Name = "xrLabel6";
- this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel6.SizeF = new System.Drawing.SizeF(300F, 18F);
- this.xrLabel6.StylePriority.UseBorders = false;
- this.xrLabel6.StylePriority.UseFont = false;
- this.xrLabel6.Text = "Ort\tDatum\tUnterschrift (Klient Frau/Herr)";
- //
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
@@ -612,33 +648,34 @@ namespace AdikKleve
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel3.SizeF = new System.Drawing.SizeF(168.2083F, 48.20836F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(200.0002F, 24.25003F);
this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.Text = "1. Summe FLS gesamt:\r\n";
+ this.xrLabel3.Text = "Summe Minuten gesamt:";
//
// xrLabel4
//
this.xrLabel4.BorderWidth = 2F;
+ this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")});
this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(188.2083F, 20.00001F);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(220.0002F, 20.00001F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
- this.xrLabel4.SizeF = new System.Drawing.SizeF(299.5417F, 48.20836F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(299.5417F, 24.25003F);
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseBorderWidth = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
- this.xrLabel4.Text = "[fieldBillableFLS!0.00]";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel5
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(19.99995F, 100F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(20F, 120F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel5.SizeF = new System.Drawing.SizeF(299.9999F, 17.99997F);
+ this.xrLabel5.SizeF = new System.Drawing.SizeF(316.6664F, 17.99997F);
this.xrLabel5.StylePriority.UseBorders = false;
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Ort\tDatum\tUnterschrift (ADiK-Kleve) ";
@@ -688,48 +725,44 @@ namespace AdikKleve
this.fieldHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldHours.Name = "fieldHours";
//
- // xrTableCell2
+ // xrLabel2
//
- this.xrTableCell2.Name = "xrTableCell2";
- this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
- this.xrTableCell2.StylePriority.UsePadding = false;
- this.xrTableCell2.StylePriority.UseTextAlignment = false;
- this.xrTableCell2.Text = "Unterschrift";
- this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell2.Weight = 0.36578877212122679D;
+ this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Top;
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(398.33F, 120F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(316.6664F, 17.99997F);
+ this.xrLabel2.StylePriority.UseBorders = false;
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Ort\tDatum\tUnterschrift (Klient/in) ";
//
- // xrTableCell10
+ // xrLabel6
//
- this.xrTableCell10.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrPictureBox2});
- this.xrTableCell10.Name = "xrTableCell10";
- this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
- this.xrTableCell10.StylePriority.UsePadding = false;
- this.xrTableCell10.StylePriority.UseTextAlignment = false;
- this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell10.Weight = 0.1893938716363312D;
+ this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(19.99976F, 44.25004F);
+ this.xrLabel6.Multiline = true;
+ this.xrLabel6.Name = "xrLabel6";
+ this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel6.SizeF = new System.Drawing.SizeF(200.0002F, 24.25003F);
+ this.xrLabel6.StylePriority.UseFont = false;
+ this.xrLabel6.Text = "Summe Stunden gesamt:";
//
- // GroupHeader1
+ // xrLabel8
//
- this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrTableServiceRecords1});
- this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.GroupHeader1.HeightF = 40F;
- this.GroupHeader1.Name = "GroupHeader1";
- this.GroupHeader1.RepeatEveryPage = true;
- this.GroupHeader1.StylePriority.UseFont = false;
- //
- // xrPictureBox2
- //
- this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
- this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrPictureBox2.Name = "xrPictureBox2";
- this.xrPictureBox2.SizeF = new System.Drawing.SizeF(150F, 30F);
- this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
- this.xrPictureBox2.StylePriority.UseBorders = false;
- this.xrPictureBox2.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.xrPictureBox1_BeforePrint);
+ this.xrLabel8.BorderWidth = 2F;
+ this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldBillableFLS", "{0:0.##}")});
+ this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+ this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(220F, 44.25004F);
+ this.xrLabel8.Name = "xrLabel8";
+ this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+ this.xrLabel8.SizeF = new System.Drawing.SizeF(299.5417F, 24.25003F);
+ this.xrLabel8.StylePriority.UseBorders = false;
+ this.xrLabel8.StylePriority.UseBorderWidth = false;
+ this.xrLabel8.StylePriority.UseFont = false;
+ this.xrLabel8.StylePriority.UsePadding = false;
+ this.xrLabel8.StylePriority.UseTextAlignment = false;
+ this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Stundenzettel
//
@@ -806,7 +839,6 @@ namespace AdikKleve
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel22;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
- private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
@@ -830,5 +862,8 @@ namespace AdikKleve
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel8;
}
}
diff --git a/ReportImp/AdikKleve/SettlementReport.Designer.cs b/ReportImp/AdikKleve/SettlementReport.Designer.cs
index 70cce73ce..ae2127452 100644
--- a/ReportImp/AdikKleve/SettlementReport.Designer.cs
+++ b/ReportImp/AdikKleve/SettlementReport.Designer.cs
@@ -93,12 +93,14 @@ namespace AdikKleve.Alt
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.lblFax = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
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.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -119,14 +121,12 @@ namespace AdikKleve.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
- this.lblFax = 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.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -223,9 +223,6 @@ namespace AdikKleve.Alt
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
- //
- //
- //
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
@@ -698,10 +695,10 @@ namespace AdikKleve.Alt
//
this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+ this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(727F, 127.08F);
- this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.CenterImage;
this.xrPictureBox1.StylePriority.UseBorders = false;
//
// xrLabel7
@@ -722,6 +719,7 @@ namespace AdikKleve.Alt
this.xrLabel9,
this.xrLabel13,
this.xrLine1});
+ this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrLabel9
@@ -746,8 +744,7 @@ namespace AdikKleve.Alt
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(351.375F, 77.49999F);
this.xrLabel13.StylePriority.UseFont = false;
- this.xrLabel13.Text = "Klombeckstr. 2 (Verwaltung)\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2" +
- "114\r\n";
+ this.xrLabel13.Text = "Hoffmannallee 105\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2114\r\n";
//
// xrLine1
//
@@ -777,6 +774,17 @@ namespace AdikKleve.Alt
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
+ // lblFax
+ //
+ this.lblFax.CanShrink = true;
+ this.lblFax.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 117F);
+ this.lblFax.Name = "lblFax";
+ this.lblFax.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblFax.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.lblFax.SizeF = new System.Drawing.SizeF(292F, 16.99999F);
+ this.lblFax.StylePriority.UseFont = false;
+ this.lblFax.Text = "Fax:";
+ //
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -847,6 +855,10 @@ namespace AdikKleve.Alt
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell23.Weight = 0.21685899000901443D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
+ //
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1062,21 +1074,6 @@ namespace AdikKleve.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
- // lblFax
- //
- this.lblFax.CanShrink = true;
- this.lblFax.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 117F);
- this.lblFax.Name = "lblFax";
- this.lblFax.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblFax.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.lblFax.SizeF = new System.Drawing.SizeF(292F, 16.99999F);
- this.lblFax.StylePriority.UseFont = false;
- this.lblFax.Text = "Fax:";
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
- //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1095,13 +1092,13 @@ namespace AdikKleve.Alt
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
- this.Version = "13.2";
+ this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/AdikKleve/SettlementReport2.Designer.cs b/ReportImp/AdikKleve/SettlementReport2.Designer.cs
index cade4c4a9..94b43f1b7 100644
--- a/ReportImp/AdikKleve/SettlementReport2.Designer.cs
+++ b/ReportImp/AdikKleve/SettlementReport2.Designer.cs
@@ -86,6 +86,7 @@ namespace AdikKleve
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.lblFax = new DevExpress.XtraReports.UI.XRLabel();
this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
@@ -93,6 +94,7 @@ namespace AdikKleve
this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -113,14 +115,12 @@ namespace AdikKleve
this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell();
- this.lblFax = 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.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -176,9 +176,6 @@ namespace AdikKleve
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
- //
- //
- //
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
@@ -597,10 +594,10 @@ namespace AdikKleve
//
this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
+ this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(727F, 127.08F);
- this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.CenterImage;
this.xrPictureBox1.StylePriority.UseBorders = false;
//
// xrLabel7
@@ -621,6 +618,7 @@ namespace AdikKleve
this.xrLabel9,
this.xrLabel13,
this.xrLine1});
+ this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrLabel9
@@ -645,8 +643,7 @@ namespace AdikKleve
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(351.375F, 77.49999F);
this.xrLabel13.StylePriority.UseFont = false;
- this.xrLabel13.Text = "Klombeckstr. 2 (Verwaltung)\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2" +
- "114\r\n";
+ this.xrLabel13.Text = "Hoffmannallee 105\r\n47533 Kleve\r\nFinanzamt Kleve\r\nSteuer-Nr. 116/5800/2114\r\n";
//
// xrLine1
//
@@ -676,6 +673,17 @@ namespace AdikKleve
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
+ // lblFax
+ //
+ this.lblFax.CanShrink = true;
+ this.lblFax.LocationFloat = new DevExpress.Utils.PointFloat(30F, 117F);
+ this.lblFax.Name = "lblFax";
+ this.lblFax.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.lblFax.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
+ this.lblFax.SizeF = new System.Drawing.SizeF(292F, 17F);
+ this.lblFax.StylePriority.UseFont = false;
+ this.lblFax.Text = "Fax:";
+ //
// fieldApprovedFLSWithFactor
//
this.fieldApprovedFLSWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]";
@@ -749,6 +757,10 @@ namespace AdikKleve
this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell53.Weight = 0.21685899000901443D;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
+ //
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -967,21 +979,6 @@ namespace AdikKleve
this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell60.Weight = 0.21685899000901443D;
//
- // lblFax
- //
- this.lblFax.CanShrink = true;
- this.lblFax.LocationFloat = new DevExpress.Utils.PointFloat(30F, 117F);
- this.lblFax.Name = "lblFax";
- this.lblFax.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.lblFax.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
- this.lblFax.SizeF = new System.Drawing.SizeF(292F, 17F);
- this.lblFax.StylePriority.UseFont = false;
- this.lblFax.Text = "Fax:";
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
- //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1002,13 +999,13 @@ namespace AdikKleve
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
- this.Version = "13.2";
+ this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/AdikKleve/Validation/ServiceRecordValidator.cs b/ReportImp/AdikKleve/Validation/ServiceRecordValidator.cs
index 685bc4c8e..b956cbb95 100644
--- a/ReportImp/AdikKleve/Validation/ServiceRecordValidator.cs
+++ b/ReportImp/AdikKleve/Validation/ServiceRecordValidator.cs
@@ -15,7 +15,7 @@ using BS.Shared.Services;
namespace AdikKleve.Validation
{
- public class DkkkServiceRecordValidator : ServiceRecordValidator
+ public class CustomServiceRecordValidator : ServiceRecordValidator
{
public override ServiceRecordValidationResultDC CheckOverlappingEmployeeServiceRecords(ServiceRecordDC newServiceRecord, DateTime start, long employeeOid, decimal roundedDuration)
{
diff --git a/ReportImp/AlphaEv/Abwesenheitstage.cs b/ReportImp/AlphaEv/Abwesenheitstage.cs
index 4d5f470eb..420fcd87d 100644
--- a/ReportImp/AlphaEv/Abwesenheitstage.cs
+++ b/ReportImp/AlphaEv/Abwesenheitstage.cs
@@ -6,9 +6,11 @@ using DevExpress.XtraReports.UI;
using System.Data;
using BeWo.Data.Access;
using BeWo.Data.Entities;
+using BS.Shared.Core;
namespace AlphaEv
{
+ [IDSpecificClass(Identifier = "Abwesenheitstage")]
public partial class Abwesenheitstage : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
{
public Abwesenheitstage()
diff --git a/ReportImp/AlphaEv/AlphaEv.csproj b/ReportImp/AlphaEv/AlphaEv.csproj
index cf4b15245..0fd01c269 100644
--- a/ReportImp/AlphaEv/AlphaEv.csproj
+++ b/ReportImp/AlphaEv/AlphaEv.csproj
@@ -77,6 +77,12 @@
InvoiceCustomerReport.cs
+
+ Component
+
+
+ AuswertungSozialdienst.cs
+
Component
@@ -101,6 +107,7 @@
SettlementReport.cs
+
Component
@@ -127,6 +134,9 @@
InvoiceCustomerReport.cs
Designer
+
+ AuswertungSozialdienst.cs
+
ServiceInvoiceReport.cs
Designer
diff --git a/ReportImp/AlphaEv/CustomReportCreator.cs b/ReportImp/AlphaEv/CustomReportCreator.cs
index cb0064330..54cb176c0 100644
--- a/ReportImp/AlphaEv/CustomReportCreator.cs
+++ b/ReportImp/AlphaEv/CustomReportCreator.cs
@@ -116,7 +116,7 @@ namespace AlphaEv
}
}
- return roList;
+ return roList.OrderBy(r => r.CustomerLastName + ", " + r.CustomerFirstName).ToList();
}
public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
diff --git a/ReportImp/AlphaEv/Export/DiamantExporter.cs b/ReportImp/AlphaEv/Export/DiamantExporter.cs
index 9db67c52c..e69d0cef6 100644
--- a/ReportImp/AlphaEv/Export/DiamantExporter.cs
+++ b/ReportImp/AlphaEv/Export/DiamantExporter.cs
@@ -50,6 +50,7 @@ namespace AlphaEv.Export
sb.AppendLine("DebKonto;Datum;Kst;Text;Betrag;leer;leer;leer;Sachkonto");
List oidList = new List();
oidList.Add(1);
+ oidList.Add(7);
var s = GetMonatlicheAbrechnungStringForCats(date, oidList, "4016", null);
if (!String.IsNullOrWhiteSpace(s))
{
@@ -113,10 +114,12 @@ namespace AlphaEv.Export
var item = row[i];
-
- if (i == 4)
+
+ if (i == 4 && row[4] != null)
{
- var betrag = (decimal) row[4];
+ decimal betrag = 0;
+ Decimal.TryParse(row[4].ToString(), out betrag);
+ //var betrag = (decimal) row[4];
if (row[8] != null && row[9] != null && costDict != null)
{
diff --git a/ReportImp/AlphaEv/Mitarbeiterstundenkonto.cs b/ReportImp/AlphaEv/Mitarbeiterstundenkonto.cs
index a44cde8bc..da54513a8 100644
--- a/ReportImp/AlphaEv/Mitarbeiterstundenkonto.cs
+++ b/ReportImp/AlphaEv/Mitarbeiterstundenkonto.cs
@@ -14,6 +14,9 @@ namespace AlphaEv
public Mitarbeiterstundenkonto()
{
InitializeComponent();
+
+ //Spalte: nach FLS für Klienten Hauptbetreuung
+ //+ Spalte: nach Vertretungsstunden
}
public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
diff --git a/ReportImp/AssistenzaReports/AssistenzaReports.csproj b/ReportImp/AssistenzaReports/AssistenzaReports.csproj
index 3017b8b0c..b265ef353 100644
--- a/ReportImp/AssistenzaReports/AssistenzaReports.csproj
+++ b/ReportImp/AssistenzaReports/AssistenzaReports.csproj
@@ -183,10 +183,18 @@
+
+ {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}
+ Data
+
{40D8B312-EA64-49E3-A31A-5E57ED4D5654}
Report
+
+ {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}
+ Shared
+