diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 1d4d74ff2..6274c334d 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -16,7 +16,7 @@ true Internet true - true + false 8CA4066C36C87B745E4016FDA715A6DB16FCFFA9 @@ -39,16 +39,16 @@ false true false - https://app.ownsoft.de/test/ + https://app.ownsoft.de/ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.259 + 2.0.1.260 true publish.htm false true - 260 + 261 2.0.1.%2a false true diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index c3f5d6713..060d57d23 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,7 +2,7 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\ - https://app.ownsoft.de/test/|https://app.ownsoft.de/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/ + https://app.ownsoft.de/|https://app.ownsoft.de/test/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/ https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/ diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 4b8ccf552..2b85a65a3 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -1081,6 +1081,12 @@ namespace BeWo showStackTrace = false; showSupportForm = false; } + else if (!String.IsNullOrEmpty(e.Message) && e.Message.IndexOf("Row was updated or deleted by another transaction") >= 0) + { + displayMessage = "Der Datensatz wurde in der Zwischenzeit von " + BS.Shared.Translation.Translator.Translate("einem anderen Benutzer") + " geändert. Ihre Änderungen konnten leider NICHT gespeichert werden. Das Problem tritt auf, wenn mehrere " + BS.Shared.Translation.Translator.Translate("BenutzerPlural") + " gleichzeitig den gleichen Datensatz bearbeiten.\n\nSie müssen den Datensatz schließen und erneut öffnen, um die Änderungen vornehmen zu können."; + showStackTrace = false; + showSupportForm = false; + } //else if (stacktrace.IndexOf("GenericADOException") >= 0 && stacktrace.IndexOf("could not insert") >= 0 && stacktrace.IndexOf("Data too long for column") >= 0) //{ // displayMessage = "Eine Eingabe enthält zu viele Zeichen."; diff --git a/BeWo/View/Detail/Report/QueryView.xaml.cs b/BeWo/View/Detail/Report/QueryView.xaml.cs index d749dbdde..7ab606612 100644 --- a/BeWo/View/Detail/Report/QueryView.xaml.cs +++ b/BeWo/View/Detail/Report/QueryView.xaml.cs @@ -545,6 +545,7 @@ namespace BeWo.View.Detail.Report param.Name = item.Name; param.ParamType = item.ParamType; + param.DefaultValue = item.DefaultValue; switch (item.ParamType) { diff --git a/Data/Entities/Parameter.cs b/Data/Entities/Parameter.cs index 7e40e7c26..451508dd0 100644 --- a/Data/Entities/Parameter.cs +++ b/Data/Entities/Parameter.cs @@ -70,5 +70,7 @@ namespace BeWo.Data.Entities } } } + + public virtual string DefaultValue { get; set; } } } \ No newline at end of file diff --git a/Data/Mappings/Parameter.hbm.xml b/Data/Mappings/Parameter.hbm.xml index de6659b39..dc15649ab 100644 --- a/Data/Mappings/Parameter.hbm.xml +++ b/Data/Mappings/Parameter.hbm.xml @@ -15,5 +15,6 @@ + \ No newline at end of file diff --git a/Model/Changes_2025_02_25 Parameter Defaultvalue.txt b/Model/Changes_2025_02_25 Parameter Defaultvalue.txt new file mode 100644 index 000000000..34ffd1ce9 --- /dev/null +++ b/Model/Changes_2025_02_25 Parameter Defaultvalue.txt @@ -0,0 +1,3 @@ +ALTER TABLE `Parameter` +ADD COLUMN `DefaultValue` VARCHAR(256) NULL DEFAULT NULL; + diff --git a/Queries/Einträge ohne Monatsunterschrift der Hauptbetreuung.txt b/Queries/Einträge ohne Monatsunterschrift der Hauptbetreuung.txt new file mode 100644 index 000000000..8c373e71a --- /dev/null +++ b/Queries/Einträge ohne Monatsunterschrift der Hauptbetreuung.txt @@ -0,0 +1,34 @@ +SELECT +p.LastName as 'Nachname', +p.Firstname as 'Vorname', +c2s.ApprovedStartDate as 'Bewilligt von', +c2s.ApprovedEndDate as 'Bewilligt bis', +scat.Name as 'Kategorie', +Date_Format(sr.StartDate, '%d.%m.%Y') as 'Datum', +IF (Date_Format(sr.StartDate, '%s') <> '00', '', Date_Format(sr.StartDate, '%H:%i')) as 'von', +IF (Date_Format(sr.StartDate, '%s') <> '00', '', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), '%H:%i')) as 'bis', +Round(sr.Roundedduration, 0) as 'Minuten', +(select CONCAT(emp1p.`FirstName`, ' ', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as 'Hauptbetreuung', +(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as 'Team' +FROM servicerecord sr +join costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid +join supportconcept sc on c2s.supportconceptoid = sc.oid +join customer c on sc.customeroid = c.oid +join person p on c.personoid = p.oid +join servicedescription sd on sd.oid = sr.servicedescriptionoid +join servicecategory scat on scat.oid = sd.servicecategoryoid +where sr.oid +not in (select servicerecordoid from confirmationreceiptsignature2servicerecord crs2s +join confirmationreceiptsignature crs on crs2s.confirmationreceiptsignatureoid = crs.oid where crs.employeeoid is not null and crs.customeroid is null) and +scat.billable = true and +sr.startdate >= ':Von' and sr.startdate < ':bis' +order by p.Lastname, sr.startdate + + + +INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4713,24,0,'Einträge ohne Monatsunterschrift der Hauptbetreuung','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.oid \nnot in (select servicerecordoid from confirmationreceiptsignature2servicerecord crs2s\njoin confirmationreceiptsignature crs on crs2s.confirmationreceiptsignatureoid = crs.oid where crs.employeeoid is not null and crs.customeroid is null) and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `parameter` (`QueryOid`,`Tid`,`Name`,`Type`,`DbType`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`DefaultValue`) VALUES (4713,25,'Von_bis',5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'aktueller Monat'); + + + + diff --git a/Queries/Einträge ohne Monatsunterschrift des Klienten.txt b/Queries/Einträge ohne Monatsunterschrift des Klienten.txt new file mode 100644 index 000000000..e6602ff6c --- /dev/null +++ b/Queries/Einträge ohne Monatsunterschrift des Klienten.txt @@ -0,0 +1,35 @@ +SELECT +p.LastName as 'Nachname', +p.Firstname as 'Vorname', +c2s.ApprovedStartDate as 'Bewilligt von', +c2s.ApprovedEndDate as 'Bewilligt bis', +scat.Name as 'Kategorie', +Date_Format(sr.StartDate, '%d.%m.%Y') as 'Datum', +IF (Date_Format(sr.StartDate, '%s') <> '00', '', Date_Format(sr.StartDate, '%H:%i')) as 'von', +IF (Date_Format(sr.StartDate, '%s') <> '00', '', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), '%H:%i')) as 'bis', +Round(sr.Roundedduration, 0) as 'Minuten', +(select CONCAT(emp1p.`FirstName`, ' ', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as 'Hauptbetreuung', +(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as 'Team' +FROM servicerecord sr +join costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid +join supportconcept sc on c2s.supportconceptoid = sc.oid +join customer c on sc.customeroid = c.oid +join person p on c.personoid = p.oid +join servicedescription sd on sd.oid = sr.servicedescriptionoid +join servicecategory scat on scat.oid = sd.servicecategoryoid +where sr.oid +not in (select servicerecordoid from confirmationreceiptsignature2servicerecord crs2s +join confirmationreceiptsignature crs on crs2s.confirmationreceiptsignatureoid = crs.oid where crs.employeeoid is null and crs.customeroid is not null) and +scat.billable = true and +sr.startdate >= ':Von' and sr.startdate < ':bis' +order by p.Lastname, sr.startdate + + + + +INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4712,24,0,'Einträge ohne Monatsunterschrift des Klienten','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.oid \nnot in (select servicerecordoid from confirmationreceiptsignature2servicerecord crs2s\njoin confirmationreceiptsignature crs on crs2s.confirmationreceiptsignatureoid = crs.oid where crs.employeeoid is null and crs.customeroid is not null) and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `parameter` (`QueryOid`,`Tid`,`Name`,`Type`,`DbType`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`DefaultValue`) VALUES (4712,25,'Von_bis',5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'aktueller Monat'); + + + + diff --git a/Queries/Fehlende Einzelunterschriften im ausgewählten Zeitaum.txt b/Queries/Fehlende Einzelunterschriften im ausgewählten Zeitaum.txt new file mode 100644 index 000000000..415363fda --- /dev/null +++ b/Queries/Fehlende Einzelunterschriften im ausgewählten Zeitaum.txt @@ -0,0 +1,34 @@ + +SELECT +p.LastName as 'Nachname', +p.Firstname as 'Vorname', +c2s.ApprovedStartDate as 'Bewilligt von', +c2s.ApprovedEndDate as 'Bewilligt bis', +scat.Name as 'Kategorie', +Date_Format(sr.StartDate, '%d.%m.%Y') as 'Datum', +IF (Date_Format(sr.StartDate, '%s') <> '00', '', Date_Format(sr.StartDate, '%H:%i')) as 'von', +IF (Date_Format(sr.StartDate, '%s') <> '00', '', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), '%H:%i')) as 'bis', +Round(sr.Roundedduration, 0) as 'Minuten', +(select CONCAT(emp1p.`FirstName`, ' ', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as 'Hauptbetreuung', +(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as 'Team' +FROM servicerecord sr +join costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid +join supportconcept sc on c2s.supportconceptoid = sc.oid +join customer c on sc.customeroid = c.oid +join person p on c.personoid = p.oid +join servicedescription sd on sd.oid = sr.servicedescriptionoid +join servicecategory scat on scat.oid = sd.servicecategoryoid +where sr.SignatureOID is null and +scat.billable = true and +sr.startdate >= ':Von' and sr.startdate < ':bis' +order by p.Lastname, sr.startdate + + + + +INSERT INTO `query` (`Oid`,`Tid`,`Type`,`Title`,`SQL`,`Notice`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`UserGroupOids`,`ReportTypeName`,`FileName`,`ExportTitle`) VALUES (4711,24,0,'Einträge ohne Unterschrift','SELECT \np.LastName as \'Nachname\',\np.Firstname as \'Vorname\',\nc2s.ApprovedStartDate as \'Bewilligt von\',\nc2s.ApprovedEndDate as \'Bewilligt bis\',\nscat.Name as \'Kategorie\',\nDate_Format(sr.StartDate, \'%d.%m.%Y\') as \'Datum\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(sr.StartDate, \'%H:%i\')) as \'von\',\nIF (Date_Format(sr.StartDate, \'%s\') <> \'00\', \'\', Date_Format(Date_Add(sr.StartDate, INTERVAL sr.Roundedduration MINUTE), \'%H:%i\')) as \'bis\',\nRound(sr.Roundedduration, 0) as \'Minuten\',\n(select CONCAT(emp1p.`FirstName`, \' \', emp1p.`LastName`) from employee emp1 join `person` emp1p on emp1p.`Oid` = emp1.`PersonOid` where emp1.`Oid` in (select employeeoid from `employee2customer` e2c1 join `valuelistentry2object` vl2o on e2c1.`Oid` = vl2o.`ObjectOid` join `valuelistentry` vle on vl2o.`ValueListEntryOid` = vle.`Oid` where e2c1.`CustomerOid` = c.`Oid` and vle.`SystemEntryID` = 3) LIMIT 1) as \'Hauptbetreuung\',\n(select t.`Name` from team t where t.`Oid` in (select teamoid from `team2customer` t2c where t2c.`CustomerOid` = c.`Oid`) LIMIT 1) as \'Team\' \nFROM servicerecord sr\njoin costbearer2supportconcept c2s on sr.costbearer2supportconceptoid = c2s.oid\njoin supportconcept sc on c2s.supportconceptoid = sc.oid\njoin customer c on sc.customeroid = c.oid\njoin person p on c.personoid = p.oid\njoin servicedescription sd on sd.oid = sr.servicedescriptionoid\njoin servicecategory scat on scat.oid = sd.servicecategoryoid\nwhere sr.SignatureOID is null and\nscat.billable = true and\nsr.startdate >= \':Von\' and sr.startdate < \':bis\'\norder by p.Lastname, sr.startdate',NULL,NULL,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `parameter` (`QueryOid`,`Tid`,`Name`,`Type`,`DbType`,`InsTs`,`InsUser`,`UdpUser`,`Version`,`IsActive`,`SystemEntryID`,`DefaultValue`) VALUES (4711,25,'Von_bis',5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'aktueller Monat'); + + + + diff --git a/ReportImp/BeWoAuxilioRitter/BeWoAuxilioRitter.csproj b/ReportImp/BeWoAuxilioRitter/BeWoAuxilioRitter.csproj index 4654974fb..3d5d53a4a 100644 --- a/ReportImp/BeWoAuxilioRitter/BeWoAuxilioRitter.csproj +++ b/ReportImp/BeWoAuxilioRitter/BeWoAuxilioRitter.csproj @@ -33,12 +33,14 @@ false + + @@ -167,6 +169,12 @@ SupportConceptReport.cs + + Component + + + SupportConceptReportReduziert.cs + Component @@ -236,6 +244,9 @@ SupportConceptReport.cs + + SupportConceptReportReduziert.cs + Teamstundenkonto.cs diff --git a/ReportImp/BeWoAuxilioRitter/CustomReportCreator.cs b/ReportImp/BeWoAuxilioRitter/CustomReportCreator.cs index 2bb310624..997b4ed12 100644 --- a/ReportImp/BeWoAuxilioRitter/CustomReportCreator.cs +++ b/ReportImp/BeWoAuxilioRitter/CustomReportCreator.cs @@ -184,21 +184,21 @@ namespace BeWoAuxilioRitter public override XtraReport CreateSupportConceptReport(IList c2sOids, long? employeeOid, long? teamOid, long? catOid, int? expiredMonths, bool archivedSupportConcepts, DateTime? startDate, DateTime? endDate) { - //if (!startDate.HasValue && !endDate.HasValue) - // { - var lSupportConceptReport = new Hilfeplanuebersicht(); - lSupportConceptReport.SetReportDataSource(SupportConceptListRO.Create(c2sOids, employeeOid, teamOid, catOid, expiredMonths, archivedSupportConcepts, startDate, endDate)); + if (!startDate.HasValue && !endDate.HasValue) + { + var lSupportConceptReport = new Hilfeplanuebersicht(); + lSupportConceptReport.SetReportDataSource(SupportConceptListRO.Create(c2sOids, employeeOid, teamOid, catOid, expiredMonths, archivedSupportConcepts, startDate, endDate)); - return lSupportConceptReport as XtraReport; - //} - // Bis die falschen Werte von CB behoben wurden vorübergehend einen alternativen Report erstellen, wenn Datumsabfragen gemacht werden, wo bestimmte Felder ausgeblendet sind - //else - // { - // var lSupportConceptReport = new SupportConceptReportReduziert(); - // lSupportConceptReport.SetReportDataSource(SupportConceptListRO.Create(c2sOids, employeeOid, teamOid, catOid, expiredMonths, archivedSupportConcepts, startDate, endDate)); + return lSupportConceptReport as XtraReport; + } + //Bis die falschen Werte von CB behoben wurden vorübergehend einen alternativen Report erstellen, wenn Datumsabfragen gemacht werden, wo bestimmte Felder ausgeblendet sind + else + { + var lSupportConceptReport = new SupportConceptReportReduziert(); + lSupportConceptReport.SetReportDataSource(SupportConceptListRO.Create(c2sOids, employeeOid, teamOid, catOid, expiredMonths, archivedSupportConcepts, startDate, endDate)); - // return lSupportConceptReport as XtraReport; - //} + return lSupportConceptReport as XtraReport; + } } } } diff --git a/ReportImp/BeWoAuxilioRitter/SupportConceptReport.Designer.cs b/ReportImp/BeWoAuxilioRitter/SupportConceptReport.Designer.cs index b1be45b45..dda9fcbba 100644 --- a/ReportImp/BeWoAuxilioRitter/SupportConceptReport.Designer.cs +++ b/ReportImp/BeWoAuxilioRitter/SupportConceptReport.Designer.cs @@ -36,6 +36,7 @@ namespace BeWoAuxilioRitter DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -65,7 +66,6 @@ namespace BeWoAuxilioRitter this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleNotApprovedAndExpiringNext4Months = new DevExpress.XtraReports.UI.FormattingRule(); this.ruleNotApprovedAndExpiringNext8Months = new DevExpress.XtraReports.UI.FormattingRule(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -107,7 +107,7 @@ namespace BeWoAuxilioRitter this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.tcQuoteGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -115,10 +115,11 @@ namespace BeWoAuxilioRitter this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -422,10 +423,6 @@ namespace BeWoAuxilioRitter this.ruleNotApprovedAndExpiringNext8Months.Formatting.BackColor = System.Drawing.Color.LightBlue; this.ruleNotApprovedAndExpiringNext8Months.Name = "ruleNotApprovedAndExpiringNext8Months"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SupportConceptListRO); - // // PageHeader // this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -669,7 +666,7 @@ namespace BeWoAuxilioRitter this.xrTableCell45, this.xrTableCell46, this.xrTableCell47, - this.xrTableCell48, + this.tcQuoteGesamt, this.xrTableCell57, this.xrTableCell49, this.xrTableCell50, @@ -801,14 +798,14 @@ namespace BeWoAuxilioRitter this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell47.Weight = 0.0887097288065158D; // - // xrTableCell48 + // tcQuoteGesamt // - this.xrTableCell48.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.StylePriority.UseBorders = false; - this.xrTableCell48.StylePriority.UseTextAlignment = false; - this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell48.Weight = 0.08870972754682778D; + this.tcQuoteGesamt.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.tcQuoteGesamt.Name = "tcQuoteGesamt"; + this.tcQuoteGesamt.StylePriority.UseBorders = false; + this.tcQuoteGesamt.StylePriority.UseTextAlignment = false; + this.tcQuoteGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.tcQuoteGesamt.Weight = 0.10820558926416884D; // // xrTableCell57 // @@ -818,7 +815,7 @@ namespace BeWoAuxilioRitter this.xrTableCell57.StylePriority.UseBorders = false; this.xrTableCell57.StylePriority.UseTextAlignment = false; this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell57.Weight = 0.13440865878766972D; + this.xrTableCell57.Weight = 0.12984670738860527D; // // xrTableCell49 // @@ -827,7 +824,7 @@ namespace BeWoAuxilioRitter this.xrTableCell49.StylePriority.UseBorders = false; this.xrTableCell49.StylePriority.UseTextAlignment = false; this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell49.Weight = 0.1559140767180916D; + this.xrTableCell49.Weight = 0.140980166399815D; // // xrTableCell50 // @@ -882,6 +879,10 @@ namespace BeWoAuxilioRitter this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell54.Weight = 0.13525699097924734D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SupportConceptListRO); + // // Hilfeplanuebersicht // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -905,10 +906,12 @@ namespace BeWoAuxilioRitter this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -984,7 +987,7 @@ namespace BeWoAuxilioRitter private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; + private DevExpress.XtraReports.UI.XRTableCell tcQuoteGesamt; private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; diff --git a/ReportImp/BeWoAuxilioRitter/SupportConceptReport.cs b/ReportImp/BeWoAuxilioRitter/SupportConceptReport.cs index 05807e2b5..d239cec4b 100644 --- a/ReportImp/BeWoAuxilioRitter/SupportConceptReport.cs +++ b/ReportImp/BeWoAuxilioRitter/SupportConceptReport.cs @@ -19,6 +19,9 @@ namespace BeWoAuxilioRitter public void SetReportDataSource(SupportConceptListRO pRO) { + decimal zeitFkGesamt = 0; + decimal zeitNFkGesamt = 0; + foreach (var sc in pRO.SupportConceptDetailList) { var servicerecords = DAOFactory.SearchDAO.FindServiceRecords(null, sc.CostBearer2SupportConceptOid); @@ -30,10 +33,12 @@ namespace BeWoAuxilioRitter if (sr.Employee.IsQualified.HasValue && sr.Employee.IsQualified.Value) { zeitFk += sr.RoundedDuration; + zeitFkGesamt += sr.RoundedDuration; } else { zeitNFk += sr.RoundedDuration; + zeitNFkGesamt += sr.RoundedDuration; } } if (zeitFk > 0) @@ -47,6 +52,14 @@ namespace BeWoAuxilioRitter sc.Custom1 = "100 %"; } } + + if (zeitNFkGesamt > 0 || zeitFkGesamt > 0) + { + var quoteGesamt = zeitFkGesamt / (zeitNFkGesamt + zeitFkGesamt); + tcQuoteGesamt.Text = String.Format("{0:0.0}%", (100 * quoteGesamt)); + } + + this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.Designer.cs b/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.Designer.cs new file mode 100644 index 000000000..f538616da --- /dev/null +++ b/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.Designer.cs @@ -0,0 +1,881 @@ +using BeWo.Report.ReportObjects; +namespace BeWoAuxilioRitter +{ + partial class SupportConceptReportReduziert + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleNotApprovedAndExpiringNext4Months = new DevExpress.XtraReports.UI.FormattingRule(); + this.ruleNotApprovedAndExpiringNext8Months = new DevExpress.XtraReports.UI.FormattingRule(); + this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.PageFooter = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.approvedText = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.tcQuoteGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell(); + this.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(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo1, + this.xrLabel1}); + this.ReportHeader.HeightF = 75F; + this.ReportHeader.Name = "ReportHeader"; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(1109F, 23F); + this.xrPageInfo1.StylePriority.UseFont = false; + // + // xrLabel1 + // + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(1109F, 25F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Hilfeplanübersicht"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1}); + this.DetailReport.DataMember = "SupportConceptDetailList"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.Detail1.HeightF = 20F; + this.Detail1.Name = "Detail1"; + // + // xrTable2 + // + this.xrTable2.BackColor = System.Drawing.Color.Transparent; + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 7F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(1109F, 20F); + this.xrTable2.StylePriority.UseBackColor = false; + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell18, + this.xrTableCell19, + this.xrTableCell36, + this.xrTableCell20, + this.xrTableCell21, + this.xrTableCell22, + this.xrTableCell26, + this.xrTableCell27, + this.xrTableCell56, + this.xrTableCell28, + this.xrTableCell29, + this.xrTableCell30, + this.xrTableCell31, + this.xrTableCell32, + this.xrTableCell33, + this.xrTableCell34}); + this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext4Months); + this.xrTableRow2.FormattingRules.Add(this.ruleNotApprovedAndExpiringNext8Months); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell18 + // + this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.CustomerLastName")}); + this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.Text = "Name"; + this.xrTableCell18.Weight = 0.17029052837898256D; + this.xrTableCell18.WordWrap = false; + // + // xrTableCell19 + // + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.CustomerFirstName")}); + this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.Text = "Vorname"; + this.xrTableCell19.Weight = 0.23993179269538245D; + this.xrTableCell19.WordWrap = false; + // + // xrTableCell36 + // + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Costbearer")}); + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Text = "xrTableCell36"; + this.xrTableCell36.Weight = 0.23216129704712818D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.StartDate", "{0:dd/MM/yyyy}")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell20.Weight = 0.18349999091299496D; + // + // xrTableCell21 + // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.EndDate", "{0:dd/MM/yyyy}")}); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.Text = "xrTableCell21"; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell21.Weight = 0.145777621367704D; + // + // xrTableCell22 + // + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSTotal", "{0:0.00}")}); + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.Text = "xrTableCell22"; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell22.Weight = 0.13651655606528579D; + // + // xrTableCell26 + // + this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.OpenWeeks", "{0:0.00}")}); + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.StylePriority.UseTextAlignment = false; + this.xrTableCell26.Text = "xrTableCell26"; + this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell26.Weight = 0.16055352390135408D; + // + // xrTableCell27 + // + this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.DurationPercentage", "{0:0}%")}); + this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.StylePriority.UseFont = false; + this.xrTableCell27.StylePriority.UseTextAlignment = false; + this.xrTableCell27.Text = "xrTableCell27"; + this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell27.Weight = 0.091349423732524554D; + // + // xrTableCell56 + // + this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Custom1")}); + this.xrTableCell56.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell56.Multiline = true; + this.xrTableCell56.Name = "xrTableCell56"; + this.xrTableCell56.StylePriority.UseFont = false; + this.xrTableCell56.StylePriority.UseTextAlignment = false; + this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell56.Weight = 0.11142541478797531D; + // + // xrTableCell28 + // + this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.TotalWeeks", "{0:0.00}")}); + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "xrTableCell28"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell28.Weight = 0.133710500154541D; + // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.WeeksPassed", "{0:0.00}")}); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.Text = "xrTableCell29"; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell29.Weight = 0.14517488487060853D; + // + // xrTableCell30 + // + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekSoll", "{0:0.00}")}); + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.Text = "xrTableCell30"; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell30.Weight = 0.15224914713984677D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekIst", "{0:0.00}")}); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.Text = "xrTableCell31"; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell31.Weight = 0.1522488154781535D; + // + // xrTableCell32 + // + this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.DiffPerWeekAmount", "{0:c}")}); + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.Text = "xrTableCell32"; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell32.Weight = 0.20761195211596387D; + // + // xrTableCell33 + // + this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.approvedText")}); + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Weight = 0.22698983569643971D; + // + // xrTableCell34 + // + this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.OpenMonths", "{0:0.00}")}); + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.StylePriority.UseBorders = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.Text = "xrTableCell34"; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell34.Weight = 0.13840751413540875D; + // + // ruleNotApprovedAndExpiringNext4Months + // + this.ruleNotApprovedAndExpiringNext4Months.Condition = "[IsApproved] == False And [OpenMonths] < 4"; + this.ruleNotApprovedAndExpiringNext4Months.DataMember = "SupportConceptDetailList"; + this.ruleNotApprovedAndExpiringNext4Months.Formatting.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); + this.ruleNotApprovedAndExpiringNext4Months.Name = "ruleNotApprovedAndExpiringNext4Months"; + // + // ruleNotApprovedAndExpiringNext8Months + // + this.ruleNotApprovedAndExpiringNext8Months.Condition = "[IsApproved] == False And [OpenMonths] < 8 And [OpenMonths] >= 4"; + this.ruleNotApprovedAndExpiringNext8Months.DataMember = "SupportConceptDetailList"; + this.ruleNotApprovedAndExpiringNext8Months.Formatting.BackColor = System.Drawing.Color.LightBlue; + this.ruleNotApprovedAndExpiringNext8Months.Name = "ruleNotApprovedAndExpiringNext8Months"; + // + // PageHeader + // + this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.PageHeader.HeightF = 42F; + this.PageHeader.Name = "PageHeader"; + this.PageHeader.StylePriority.UseBorderColor = false; + this.PageHeader.StylePriority.UseTextAlignment = false; + this.PageHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrTable1 + // + this.xrTable1.BackColor = System.Drawing.Color.LightSteelBlue; + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(1109F, 42F); + this.xrTable1.StylePriority.UseBackColor = false; + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell2, + this.xrTableCell35, + this.xrTableCell3, + this.xrTableCell4, + this.xrTableCell5, + this.xrTableCell9, + this.xrTableCell10, + this.xrTableCell55, + this.xrTableCell11, + this.xrTableCell12, + this.xrTableCell13, + this.xrTableCell14, + this.xrTableCell15, + this.xrTableCell16, + this.xrTableCell17}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.Text = "Name"; + this.xrTableCell1.Weight = 0.16641350311506351D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "Vorname"; + this.xrTableCell2.Weight = 0.23446921959683992D; + // + // xrTableCell35 + // + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Text = "Kostenträger"; + this.xrTableCell35.Weight = 0.22687564331673138D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Text = "Start"; + this.xrTableCell3.Weight = 0.17932222607188864D; + // + // xrTableCell4 + // + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Text = "Ende"; + this.xrTableCell4.Weight = 0.14245865202679098D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Text = "gesamte FLS"; + this.xrTableCell5.Weight = 0.13340827380814141D; + // + // xrTableCell9 + // + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Text = "Restzeit in Wochen"; + this.xrTableCell9.Weight = 0.15689811071234514D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Text = "Heute"; + this.xrTableCell10.Weight = 0.089269612164975D; + // + // xrTableCell55 + // + this.xrTableCell55.Multiline = true; + this.xrTableCell55.Name = "xrTableCell55"; + this.xrTableCell55.Text = "Assis-tenz / FK"; + this.xrTableCell55.Weight = 0.10888857101193653D; + // + // xrTableCell11 + // + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Text = "Wochen gesamt"; + this.xrTableCell11.Weight = 0.13066628119830248D; + // + // xrTableCell12 + // + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "Wochen bisher"; + this.xrTableCell12.Weight = 0.13066628360729798D; + // + // xrTableCell13 + // + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Text = "FLS/Woche Soll"; + this.xrTableCell13.Weight = 0.1599859268146562D; + // + // xrTableCell14 + // + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Text = "FLS/Woche Ist"; + this.xrTableCell14.Weight = 0.14878268254386506D; + // + // xrTableCell15 + // + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Text = "Differenz pro Woche x €/Std"; + this.xrTableCell15.Weight = 0.20288548698789807D; + // + // xrTableCell16 + // + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Text = "bewilligt oder nicht bewilligt"; + this.xrTableCell16.Weight = 0.22182145262578157D; + // + // xrTableCell17 + // + this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.Text = "Restzeit (Monate)"; + this.xrTableCell17.Weight = 0.13525699097924732D; + // + // PageFooter + // + this.PageFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2}); + this.PageFooter.HeightF = 35.00001F; + this.PageFooter.Name = "PageFooter"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(976.9999F, 17.00001F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(131.9999F, 18F); + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; + // + // approvedText + // + this.approvedText.DataMember = "SupportConceptDetailList"; + this.approvedText.Expression = "Iif([IsApproved], \'bewilligt\' , \'nicht bewilligt\')"; + this.approvedText.Name = "approvedText"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 20F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable3}); + this.GroupFooter1.HeightF = 20F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // xrTable3 + // + this.xrTable3.BackColor = System.Drawing.Color.Transparent; + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 0, 100F); + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3}); + this.xrTable3.SizeF = new System.Drawing.SizeF(1109F, 20F); + this.xrTable3.StylePriority.UseBackColor = false; + this.xrTable3.StylePriority.UseBorders = false; + this.xrTable3.StylePriority.UseFont = false; + this.xrTable3.StylePriority.UsePadding = false; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell37, + this.xrTableCell38, + this.xrTableCell39, + this.xrTableCell40, + this.xrTableCell41, + this.xrTableCell42, + this.xrTableCell46, + this.xrTableCell47, + this.tcQuoteGesamt, + this.xrTableCell57, + this.xrTableCell49, + this.xrTableCell50, + this.xrTableCell51, + this.xrTableCell52, + this.xrTableCell53, + this.xrTableCell54}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 1D; + // + // xrTableCell37 + // + this.xrTableCell37.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.StylePriority.UseBorders = false; + this.xrTableCell37.StylePriority.UseFont = false; + this.xrTableCell37.Weight = 0.16536971475278167D; + this.xrTableCell37.WordWrap = false; + // + // xrTableCell38 + // + this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.Weight = 0.23299857615324848D; + this.xrTableCell38.WordWrap = false; + // + // xrTableCell39 + // + this.xrTableCell39.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.Weight = 0.22545278162411186D; + // + // xrTableCell40 + // + this.xrTableCell40.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell40.Weight = 0.17819728022148496D; + // + // xrTableCell41 + // + this.xrTableCell41.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseBorders = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell41.Weight = 0.14156512651128173D; + // + // xrTableCell42 + // + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSTotal")}); + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.IgnoreNullValues = true; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell42.Summary = xrSummary1; + this.xrTableCell42.Text = "xrTableCell42"; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell42.Weight = 0.13257147787001944D; + // + // xrTableCell46 + // + this.xrTableCell46.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.StylePriority.UseBorders = false; + this.xrTableCell46.StylePriority.UseTextAlignment = false; + this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell46.Weight = 0.15591422839649188D; + // + // xrTableCell47 + // + this.xrTableCell47.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell47.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.StylePriority.UseBorders = false; + this.xrTableCell47.StylePriority.UseFont = false; + this.xrTableCell47.StylePriority.UseTextAlignment = false; + this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell47.Weight = 0.0887097288065158D; + // + // tcQuoteGesamt + // + this.tcQuoteGesamt.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.tcQuoteGesamt.Name = "tcQuoteGesamt"; + this.tcQuoteGesamt.StylePriority.UseBorders = false; + this.tcQuoteGesamt.StylePriority.UseTextAlignment = false; + this.tcQuoteGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.tcQuoteGesamt.Weight = 0.10820513861074137D; + // + // xrTableCell57 + // + this.xrTableCell57.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell57.Multiline = true; + this.xrTableCell57.Name = "xrTableCell57"; + this.xrTableCell57.StylePriority.UseBorders = false; + this.xrTableCell57.StylePriority.UseTextAlignment = false; + this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell57.Weight = 0.12984712354205374D; + // + // xrTableCell49 + // + this.xrTableCell49.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrTableCell49.Name = "xrTableCell49"; + this.xrTableCell49.StylePriority.UseBorders = false; + this.xrTableCell49.StylePriority.UseTextAlignment = false; + this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell49.Weight = 0.140980200899794D; + // + // xrTableCell50 + // + this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekSoll")}); + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.StylePriority.UseTextAlignment = false; + xrSummary2.FormatString = "{0:0.00}"; + xrSummary2.IgnoreNullValues = true; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell50.Summary = xrSummary2; + this.xrTableCell50.Text = "xrTableCell50"; + this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell50.Weight = 0.14784933254317598D; + // + // xrTableCell51 + // + this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.FLSPerWeekIst")}); + this.xrTableCell51.Name = "xrTableCell51"; + this.xrTableCell51.StylePriority.UseTextAlignment = false; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.IgnoreNullValues = true; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell51.Summary = xrSummary3; + this.xrTableCell51.Text = "xrTableCell51"; + this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell51.Weight = 0.14433663740184527D; + // + // xrTableCell52 + // + this.xrTableCell52.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell52.Name = "xrTableCell52"; + this.xrTableCell52.StylePriority.UseBorders = false; + this.xrTableCell52.StylePriority.UseTextAlignment = false; + this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell52.Weight = 0.20512567053695868D; + // + // xrTableCell53 + // + this.xrTableCell53.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell53.Name = "xrTableCell53"; + this.xrTableCell53.StylePriority.UseBorders = false; + this.xrTableCell53.Weight = 0.21958125875743176D; + // + // xrTableCell54 + // + this.xrTableCell54.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell54.Name = "xrTableCell54"; + this.xrTableCell54.StylePriority.UseBorders = false; + this.xrTableCell54.StylePriority.UseTextAlignment = false; + this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell54.Weight = 0.13525699097924734D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SupportConceptListRO); + // + // SupportConceptReportReduziert + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.DetailReport, + this.PageHeader, + this.PageFooter, + this.topMarginBand1, + this.bottomMarginBand1, + this.GroupFooter1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.approvedText}); + this.DataSource = this.bindingSource1; + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleNotApprovedAndExpiringNext8Months, + this.ruleNotApprovedAndExpiringNext4Months}); + this.Landscape = true; + this.Margins = new DevExpress.Drawing.DXMargins(30F, 30F, 50F, 20F); + this.PageHeight = 827; + this.PageWidth = 1169; + this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.PageHeaderBand PageHeader; + private DevExpress.XtraReports.UI.PageFooterBand PageFooter; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.CalculatedField approvedText; + private DevExpress.XtraReports.UI.FormattingRule ruleNotApprovedAndExpiringNext8Months; + private DevExpress.XtraReports.UI.FormattingRule ruleNotApprovedAndExpiringNext4Months; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; + private DevExpress.XtraReports.UI.XRTableCell tcQuoteGesamt; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell52; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell53; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell54; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell56; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell55; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; + } +} diff --git a/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.cs b/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.cs new file mode 100644 index 000000000..ebfa993f5 --- /dev/null +++ b/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.cs @@ -0,0 +1,65 @@ +using System; +using System.Drawing; +using System.Collections; +using System.ComponentModel; +using DevExpress.XtraReports.UI; +using BS.Shared.Extensions; +using BeWo.Report.ReportObjects; +using BeWo.Report; +using BeWo.Data.Access; + +namespace BeWoAuxilioRitter +{ + public partial class SupportConceptReportReduziert : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public SupportConceptReportReduziert() + { + InitializeComponent(); + } + + public void SetReportDataSource(SupportConceptListRO pRO) + { + decimal zeitFkGesamt = 0; + decimal zeitNFkGesamt = 0; + + foreach (var sc in pRO.SupportConceptDetailList) + { + var servicerecords = DAOFactory.SearchDAO.FindServiceRecords(null, sc.CostBearer2SupportConceptOid); + decimal zeitFk = 0; + decimal zeitNFk = 0; + decimal quote = 1; + foreach (var sr in servicerecords) + { + if (sr.Employee.IsQualified.HasValue && sr.Employee.IsQualified.Value) + { + zeitFk += sr.RoundedDuration; + zeitFkGesamt += sr.RoundedDuration; + } + else + { + zeitNFk += sr.RoundedDuration; + zeitNFkGesamt += sr.RoundedDuration; + } + } + if (zeitFk > 0) + { + //quote = zeitNFk / zeitFk; + quote = zeitFk / (zeitNFk + zeitFk); + sc.Custom1 = String.Format("{0:0.0}%", (100 * quote)); + } + else if (zeitNFk > 0 ) + { + sc.Custom1 = "100 %"; + } + } + + if (zeitNFkGesamt > 0 || zeitFkGesamt > 0) + { + var quoteGesamt = zeitFkGesamt / (zeitNFkGesamt + zeitFkGesamt); + tcQuoteGesamt.Text = String.Format("{0:0.0}%", (100 * quoteGesamt)); + } + + this.bindingSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.resx b/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.resx new file mode 100644 index 000000000..d58980a38 --- /dev/null +++ b/ReportImp/BeWoAuxilioRitter/SupportConceptReportReduziert.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Service/Dienstplanung/DienstplanungsManager.cs b/Service/Dienstplanung/DienstplanungsManager.cs index 0417bdb9d..b06118856 100644 --- a/Service/Dienstplanung/DienstplanungsManager.cs +++ b/Service/Dienstplanung/DienstplanungsManager.cs @@ -578,7 +578,7 @@ namespace BeWo.Service.Dienstplanung var doppelteEintraege = empDienste .GroupBy(e => new { e.EmployeeOid, e.Zeile, e.Datum }) .Where(g => g.Count() > 1) // Nur welche, die es mehr als einmal gibt - .SelectMany(g => g.Skip(1)) // Lässt das erste Element jeder Gruppe weg, damit beim Löschen der Doppelten einer übrig bleibt + .SelectMany(g => g.Skip(1)) // Lässt das erste Element weg, damit beim Löschen der Doppelten einer übrig bleibt .ToList(); if (doppelteEintraege != null && doppelteEintraege.Count > 0) { diff --git a/Service/Plugins/OperationService.cs b/Service/Plugins/OperationService.cs index f36126f86..360fa2770 100644 --- a/Service/Plugins/OperationService.cs +++ b/Service/Plugins/OperationService.cs @@ -334,9 +334,16 @@ namespace BeWo.Service.Plugins // ValueListEntryType.SupportConceptIndividualGoalCategoryType // }; - // var goals = cb2Sc.SupportConcept.ValueList.Where(v => vlist.Contains(v.Entry.Type)).ToList(); + // var goals = cb2Sc.SupportConcept.ValueList.Where(v => vlist.Contains(v.Entry.Type)).Select(v => v.Entry).ToList(); // if (goals.Count > 0) // { + // foreach (var tb in list) + // { + // if (tb.Parent != null) + // { + // tb.Parent.Name = String.Format(" {0}", tb.Parent.Name); + // } + // } // var allMainGoals = DAOFactory.SearchDAO.FindValueListEntries(new List() { ValueListEntryType.SupportConceptGoalCategoryType, ValueListEntryType.SupportConceptGoalType }); // Dictionary dict = new Dictionary(); @@ -344,16 +351,55 @@ namespace BeWo.Service.Plugins // { // dict.Add(item.Oid.Value, item); // } - - // long oid = 1000000; // foreach (var item in goals) // { - // var ziel = item.Entry; - // TextModuleDC tm = new TextModuleDC(); - // tm.Text = ziel.Value; - // tm.Name = ziel.Value; - // tm.TextModuleOid = oid++; - // list.Add(tm); + // if (!dict.ContainsKey(item.Oid.Value)) + // { + // dict.Add(item.Oid.Value, item); + // } + // } + + // var zielKategorie = new TextModuleDC(); + // zielKategorie.Name = "Ziele"; + // zielKategorie.TextModuleOid = 1000000; + // zielKategorie.IsParent = true; + // list.Add(zielKategorie); + + // var entryOid2TextbausteinDict = new Dictionary(); + + // long oid = 1000001; + // foreach (var item in goals) + // { + // var path = new List(); + // path.Add(item); + // var parentpath = GetAllParentGoalCategoies(dict, item); + // path.AddRange(parentpath); + // //Der Pfad enthält den Gesamten Pfad vom Kind zum Obersten Vater Knoten und muss rückwärts durchlaufen werden + // for (int i = path.Count - 1; i >= 0; i--) + // { + // var ziel = path[i]; + // if (!entryOid2TextbausteinDict.ContainsKey(ziel.Oid.Value)) + // { + // TextModuleDC tm = new TextModuleDC(); + // tm.Text = ziel.Value; + // tm.Name = ziel.Value; + // tm.TextModuleOid = oid++; + // if (ziel.ParentOid.HasValue && entryOid2TextbausteinDict.ContainsKey(ziel.ParentOid.Value)) + // { + // var parent = entryOid2TextbausteinDict[ziel.ParentOid.Value]; + // parent.IsParent = true; + // tm.Parent = parent; + // } + // else + // { + // //an die oberste Kategorie hängen + // tm.Parent = zielKategorie; + // } + // entryOid2TextbausteinDict.Add(ziel.Oid.Value, tm); + // list.Add(tm); + // } + // } + // } // } //} @@ -361,14 +407,14 @@ namespace BeWo.Service.Plugins return list; } - public static IEnumerable GetAllParentGoalCategoies(Dictionary goalCategoryDict, ValueListEntryDC goal) + private static List GetAllParentGoalCategoies(Dictionary goalCategoryDict, ValueListEntry goal) { - IList path = new List(); + var path = new List(); if (goal.ParentOid.HasValue && goalCategoryDict.ContainsKey(goal.ParentOid.Value)) { - ValueListEntryDC parentCat = goalCategoryDict[goal.ParentOid.Value]; + var parentCat = goalCategoryDict[goal.ParentOid.Value]; while (parentCat != null) { diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index becda8d3a..8724eeecb 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -350,7 +350,7 @@ namespace BeWo.Service.Plugins //t = "3226307161"; // Roman Roger Puth //t = "3522103738"; // AWO Münsterland-Recklinghausen //t = "5592509446"; // Kontakt Verein für psychosoziale Hilfen e.V - //t = "5344902949"; // SHK Service GmbH SBD + t = "5344902949"; // SHK Service GmbH SBD //t = "1422963536"; // Malteser-Johanniter-Johanneshaus gGmbH //t = "5433105975"; // aha e.V. //t = "1701920223"; // SKFM Monheim @@ -370,7 +370,7 @@ namespace BeWo.Service.Plugins //t = "1062385308"; // Aidshilfe Fulda //t = "3208082132"; // Klinikum Werra-Meißner GmbH //t = "7164646882"; // Diakonisches Werk im Ev. Kirchenkreis Dinslaken - Ambulant Begleitetes Wohnen - t = "1143768898"; // Diakonisches Werk im Ev. Kirchenkreis Dinslaken - Soziotherapie + //t = "1143768898"; // Diakonisches Werk im Ev. Kirchenkreis Dinslaken - Soziotherapie //t = "8164797250"; // Diakonisches Werk im Ev. Kirchenkreis Dinslaken - Ambulante Jugendhilfe JUDI //t = "4431610343"; // B-B-C-Terwort GmbH //t = "2235342307"; // Suchtkrankenhilfe Ostfriesland @@ -405,7 +405,7 @@ namespace BeWo.Service.Plugins //t = "6203102637"; // BeWo Neuss-Lauth u. Lauth GbR //t = "7060431533"; // Arche Tecklenburg e.V. //t = "1159580198"; // Wendepunkt Velbert gGmbH - t = "5094575560"; // Christopherus Haus MID + //t = "5094575560"; // Christopherus Haus MID //t = "5261046426"; // SelbstWerk EN / Bettina Heckrodt return t; diff --git a/Service/Plugins/QueryService.cs b/Service/Plugins/QueryService.cs index 3fe85325c..5c06c7dbd 100644 --- a/Service/Plugins/QueryService.cs +++ b/Service/Plugins/QueryService.cs @@ -1,7 +1,9 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using BeWo.Data.Access; +using BeWo.Service.Configuration; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; @@ -10,9 +12,24 @@ namespace BeWo.Service.Plugins { public class QueryService : AbstractIDSpecificDefaultClass { - public virtual List GetAllQueriesOfType(QueryType pType) + private AppSettings appSettings = null; + + public AppSettings AppSettings + { + get + { + if (appSettings == null) + { + appSettings = AppSettings.CreateSettings(); + } + return appSettings; + } + } + + + public virtual List GetAllQueriesOfType(QueryType pType) { - return DAOFactory.SearchDAO.FindQuery(pType).Select( + var list = DAOFactory.SearchDAO.FindQuery(pType).Select( q => { QueryDC queryDC = new QueryDC @@ -32,11 +49,12 @@ namespace BeWo.Service.Plugins List parameter = new List(); foreach (var item in q.Parameter) { - var param = new QueryParamDC - { - QueryParameterOid = item.Oid, - ParamType = item.Type, - Name = item.Name + var param = new QueryParamDC + { + QueryParameterOid = item.Oid, + ParamType = item.Type, + Name = item.Name, + DefaultValue = item.DefaultValue }; if (item.Type == QueryParameterType.Custom) @@ -50,7 +68,21 @@ namespace BeWo.Service.Plugins queryDC.Parameter = parameter; return queryDC; }).ToList(); + + return list.Where(q => CheckQueryRights(q)).ToList(); } + private bool CheckQueryRights(QueryDC query) + { + if (query.Oid > 1000) + { + if (query.Title.Contains("Unterschrift") || query.Title.Contains("Monatsunterschrift")) + { + return AppSettings.ShowSignatures; + } + } + + return true; + } } } \ No newline at end of file diff --git a/Service/ServiceImplementations/QueryServiceImp.cs b/Service/ServiceImplementations/QueryServiceImp.cs index cf24a3ab6..123de077e 100644 --- a/Service/ServiceImplementations/QueryServiceImp.cs +++ b/Service/ServiceImplementations/QueryServiceImp.cs @@ -176,7 +176,19 @@ namespace BeWo.Service.ServiceImplementations if (item.Value is DateTimeSpan) { DateTimeSpan dts = (DateTimeSpan)item.Value; + if (!String.IsNullOrEmpty(item.DefaultValue) && item.DefaultValue.ToLower().Contains("aktueller monat")) + { + DateTime aktuellerMonat = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + if (dts.StartDate == DateTime.MinValue) + { + dts.StartDate = aktuellerMonat; + } + if (dts.EndDate.Date == DateTime.MaxValue.Date) + { + dts.EndDate = aktuellerMonat.AddMonths(1).AddDays(-1); + } + } string[] itemNames = item.Name.Split(new[] { '_' }); newsql = newsql.Replace(":" + GetParamterKeyName(itemNames[0]), String.Format("{0:yyyy-MM-dd}", dts.StartDate)); diff --git a/Shared/DataContracts/QueryParamDC.cs b/Shared/DataContracts/QueryParamDC.cs index 0f04520eb..4ae1ba696 100644 --- a/Shared/DataContracts/QueryParamDC.cs +++ b/Shared/DataContracts/QueryParamDC.cs @@ -24,5 +24,9 @@ namespace BS.Shared.DataContracts [DataMember] public long? QueryParameterOid { get; set; } + + [DataMember] + public string DefaultValue { get; set; } + } } \ No newline at end of file