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

This commit is contained in:
2023-09-05 12:59:55 +02:00
12 changed files with 3744 additions and 2 deletions

View File

@@ -84,6 +84,12 @@
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</Compile>
<Compile Include="Reporting\CustomerRelations.cs" />
<Compile Include="FKPlanung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="FKPlanung.designer.cs">
<DependentUpon>FKPlanung.cs</DependentUpon>
</Compile>
<Compile Include="Reporting\KannAllesWeissAllesRO.cs" />
<Compile Include="Reporting\Klienteninformationen.cs" />
<Compile Include="Reporting\KlientUmfeldPerson1.cs" />
@@ -99,6 +105,12 @@
<Compile Include="SbdRechnung.Designer.cs">
<DependentUpon>SbdRechnung.cs</DependentUpon>
</Compile>
<Compile Include="FSJPlanung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="FSJPlanung.designer.cs">
<DependentUpon>FSJPlanung.cs</DependentUpon>
</Compile>
<Compile Include="SBListe.cs">
<SubType>Component</SubType>
</Compile>
@@ -160,10 +172,16 @@
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FKPlanung.resx">
<DependentUpon>FKPlanung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SbdRechnung.resx">
<DependentUpon>SbdRechnung.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FSJPlanung.resx">
<DependentUpon>FSJPlanung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SBListe.resx">
<DependentUpon>SBListe.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -0,0 +1,42 @@
using System;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using DevExpress.XtraReports.UI;
using System.Data;
using AWOMuensterlandRecklinghausen.Reporting;
using System.Linq;
namespace AWOMuensterlandRecklinghausen
{
public partial class FKPlanung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
public FKPlanung()
{
InitializeComponent();
}
public void SetReportDataSource(QueryRO pRO)
{
KannAllesWeissAllesRO ro = KannAllesWeissAllesRO.Create();
foreach (var relation in ro.AllCustomerRelations)
{
if (relation.Custom1 == null)
relation.Custom1 = "";
if (relation.Klient != null && relation.Klient.CustomerCareTypes != null)
{
foreach (var betreuungsart in relation.Klient.CustomerCareTypes)
{
if (!(relation.Klient.CustomerCareTypes.Last().ValueListEntryOid == betreuungsart.ValueListEntryOid))
relation.Custom1 += betreuungsart.DisplayName + ", ";
else
relation.Custom1 += betreuungsart.DisplayName;
}
}
}
this.bindingSource1.DataSource = ro;
}
}
}

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -0,0 +1,50 @@
using System;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using DevExpress.XtraReports.UI;
using System.Data;
using AWOMuensterlandRecklinghausen.Reporting;
using System.Linq;
namespace AWOMuensterlandRecklinghausen
{
public partial class FSJPlanung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
public FSJPlanung()
{
InitializeComponent();
}
public void SetReportDataSource(QueryRO pRO)
{
KannAllesWeissAllesRO ro = KannAllesWeissAllesRO.Create();
foreach (var relation in ro.AllCustomerRelations)
{
if (relation.Custom1 == null)
relation.Custom1 = "";
if (relation.Klient != null && relation.Klient.CustomerCareTypes != null)
{
foreach (var betreuungsart in relation.Klient.CustomerCareTypes)
{
if (!(relation.Klient.CustomerCareTypes.Last().ValueListEntryOid == betreuungsart.ValueListEntryOid))
relation.Custom1 += betreuungsart.DisplayName + ", ";
else
relation.Custom1 += betreuungsart.DisplayName;
}
}
if (relation.Custom2 == null)
relation.Custom2 = "";
if (relation.Schulbegleitung != null && relation.Schulbegleitung.DateOfBirth.HasValue)
{
if (relation.Schulbegleitung.DateOfBirth.Value.AddYears(18) >= DateTime.Now)
relation.Custom2 = "Ja";
}
}
this.bindingSource1.DataSource = ro;
}
}
}

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -34,6 +34,11 @@ namespace AWOMuensterlandRecklinghausen.Reporting
public string Schulbegleiterinfo { get; set; } // Mitarbeiterkommentar
public string Hilfeplaninfo { get; set; } // Hilfeplankommentar
public string Custom1 { get; set; }
public string Custom2 { get; set; }
public string Custom3 { get; set; }
public string Custom4 { get; set; }
public string Custom5 { get; set; }
}
}

View File

@@ -18,7 +18,11 @@ namespace AWOMuensterlandRecklinghausen.Reporting
{
public DateTime Berichtsdatum { get; set; }
public List<CustomerRelations> AllCustomerRelations { get; set; }
public string Custom1 { get; set; }
public string Custom2 { get; set; }
public string Custom3 { get; set; }
public string Custom4 { get; set; }
public string Custom5 { get; set; }
// 1. Alle Customer holen und für Perfomance auch direkt alle Hilfepläne
// 2. Für jeden einzelnen Customer alle Infos suchen und ins Dictionary speichern
// 2.1 Klientenkontaktdaten setzen
@@ -135,6 +139,8 @@ namespace AWOMuensterlandRecklinghausen.Reporting
cr.Klienteninformationen.GeplanteStunden = VarfieldHelper.GetKlientenVarfields(customer, 25);
if (customer.CustomerVarFields.Count >= 13)
cr.Klienteninformationen.Ab = VarfieldHelper.GetKlientenVarfields(customer, 26);
if (customer.CustomerVarFields.Count >= 14)
cr.Klienteninformationen.LeitungInfo = VarfieldHelper.GetKlientenVarfields(customer, 27);
}
//if (customer.LastName == "Coerdt")
//Console.WriteLine("Test");

View File

@@ -30,6 +30,7 @@ namespace AWOMuensterlandRecklinghausen.Reporting
public string PlanSchule { get; set; }
public string GeplanteStunden { get; set; }
public string Ab { get; set; }
public string LeitungInfo { get; set; }
}
}

View File

@@ -65,6 +65,9 @@ namespace AWOMuensterlandRecklinghausen.Reporting
case 26: // ab
valueAsString = string.Format("{0:dd.MM.yyyy}", vv.VarFieldValue as DateTime?);
break;
case 27: // Leitung/Info
valueAsString = vv.VarFieldValue.ToString();
break;
}
}

View File

@@ -19,7 +19,7 @@ namespace BeWo.Service.Plugins
{
public class SupportConceptAnalysisCreator : AbstractIDSpecificDefaultClass<SupportConceptAnalysisCreator>
{
private Dictionary<long, List<ServiceRecordDC>> _cs2ServiceRecords = null;
protected Dictionary<long, List<ServiceRecordDC>> _cs2ServiceRecords = null;
public virtual List<SupportConceptOverviewDC> GetSupportConceptAnalysis(IList<long> c2sOids, long? employeeOid, long? teamOid, DateTime? appointedDate,
int? expiredMonths, bool showArchivedScs)