report und Zeiterfassung sekunden anpassung
This commit is contained in:
Waldi
2
.gitignore
vendored
2
.gitignore
vendored
@@ -200,3 +200,5 @@
|
||||
/ReportImp/RessourceEV/obj
|
||||
/ReportImp/ProfEggersStiftung/bin
|
||||
/ReportImp/ProfEggersStiftung/obj
|
||||
/ReportImp/PraunheimerWerkstaettenGmbh/obj
|
||||
/ReportImp/PraunheimerWerkstaettenGmbh/bin
|
||||
|
||||
19
BeWo.sln
19
BeWo.sln
@@ -361,6 +361,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RessourceEV", "ReportImp\Re
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfEggersStiftung", "ReportImp\ProfEggersStiftung\ProfEggersStiftung.csproj", "{E660E5A0-8516-4B5B-B3DB-6D46D630F065}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PraunheimerWerkstaettenGmbh", "ReportImp\PraunheimerWerkstaettenGmbh\PraunheimerWerkstaettenGmbh.csproj", "{BCCF055F-CF10-43D6-B618-136665D2A687}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|.NET = Debug|.NET
|
||||
@@ -2644,6 +2646,22 @@ Global
|
||||
{E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E660E5A0-8516-4B5B-B3DB-6D46D630F065}.Release|x86.Build.0 = Release|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Debug|.NET.ActiveCfg = Debug|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Debug|.NET.Build.0 = Debug|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Release|.NET.ActiveCfg = Release|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Release|.NET.Build.0 = Release|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -2819,5 +2837,6 @@ Global
|
||||
{0F408C44-8D84-4A58-9E3A-C6DE30DC0AF2} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{703E37E6-1219-490D-BCBD-7258DAB4239A} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{E660E5A0-8516-4B5B-B3DB-6D46D630F065} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
{BCCF055F-CF10-43D6-B618-136665D2A687} = {D8A691C5-146D-4613-86CC-438F02FE9106}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@@ -1032,7 +1032,7 @@
|
||||
</dxg:GridColumn>
|
||||
|
||||
<!--############## Header von Minuten auf Dauer Gewechselt #################################-->
|
||||
<dxg:GridColumn FieldName="RoundedDuration" AllowEditing="False" Header="Dauer" x:Name="RoundedDHeader" Width="65">
|
||||
<dxg:GridColumn FieldName="RoundedDurationAnzeige" AllowEditing="False" Header="Dauer" x:Name="RoundedDHeader" Width="65">
|
||||
<dxg:GridColumn.EditSettings>
|
||||
<dxe:TextEditSettings DisplayFormat="0.##"></dxe:TextEditSettings>
|
||||
</dxg:GridColumn.EditSettings>
|
||||
|
||||
@@ -435,18 +435,18 @@ namespace BeWo.ViewModel
|
||||
var time = _StartTime;
|
||||
|
||||
|
||||
|
||||
// beim addend er zeit / dadurch das dateTime und Startime gleich sind werden diese zusammen gerechnet und das löst den fehler aus.
|
||||
//also inprinzip nur date zurück geben und kuken was danach passiert
|
||||
|
||||
// dadurch das eine neuentwicklung stattgefunden hat, scheint dieser bereich nicht mehr nötig zu sein
|
||||
//if (date != null && time != null)
|
||||
//{
|
||||
// date = date.Value.AddHours(time.Value.Hour);
|
||||
// date = date.Value.AddMinutes(time.Value.Minute);
|
||||
// date = date.Value.AddSeconds(time.Value.Second);
|
||||
//}
|
||||
if (date != null && time != null)
|
||||
{
|
||||
if(date.Value.Second != time.Value.Second)
|
||||
date = date.Value.AddSeconds(time.Value.Second);
|
||||
}
|
||||
|
||||
return date;
|
||||
return date; // date
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1088,11 +1088,17 @@ namespace BeWo.ViewModel
|
||||
{
|
||||
date = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedDayName(_Date.Value.DayOfWeek) + ", " + _Date.Value.ToShortDateString();
|
||||
}
|
||||
else {
|
||||
|
||||
if (_EditableEndDate.Value.Date != _Date.Value.Date)
|
||||
{
|
||||
date = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedDayName(_Date.Value.DayOfWeek) + ", " + _Date.Value.ToShortDateString() + " " + time + " - " + _EditableEndDate.Value.ToShortDateString() + " " + endtime;
|
||||
else {
|
||||
if (_EditableEndDate.HasValue) {
|
||||
if (_EditableEndDate.Value.Date != _Date.Value.Date)
|
||||
{
|
||||
date = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedDayName(_Date.Value.DayOfWeek) + ", " + _Date.Value.ToShortDateString() + " " + time + " - " + _EditableEndDate.Value.ToShortDateString() + " " + endtime;
|
||||
}
|
||||
else
|
||||
{
|
||||
time = time + " - " + endtime;
|
||||
date = DateTimeFormatInfo.CurrentInfo.GetAbbreviatedDayName(_Date.Value.DayOfWeek) + ", " + _Date.Value.ToShortDateString() + " " + time;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1217,6 +1223,21 @@ namespace BeWo.ViewModel
|
||||
}
|
||||
}
|
||||
|
||||
public decimal RoundedDurationAnzeige
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitMonatJahr)
|
||||
{
|
||||
return _RoundedDuration/60;
|
||||
}
|
||||
else
|
||||
{
|
||||
return _RoundedDuration;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public decimal RoundedDuration
|
||||
{
|
||||
get { return _RoundedDuration; }
|
||||
@@ -2021,7 +2042,7 @@ namespace BeWo.ViewModel
|
||||
{
|
||||
var dates = DateTime.Parse("1." + OnlyMonth + OnlyYear);
|
||||
|
||||
var StartDatetime = new DateTime(dates.Year, dates.Month,1,0,0,0);
|
||||
var StartDatetime = new DateTime(dates.Year, dates.Month,1,0,0,1);
|
||||
|
||||
pDataContract.Start = StartDatetime;
|
||||
|
||||
@@ -2029,7 +2050,7 @@ namespace BeWo.ViewModel
|
||||
|
||||
if (_DurationMonthYearGes != 0)
|
||||
{
|
||||
RoundedDuration = DurationMonthYearGes.Value;
|
||||
RoundedDuration = DurationMonthYearGes.Value * 60;
|
||||
}
|
||||
|
||||
_DurationSTD = 0;
|
||||
@@ -2154,10 +2175,10 @@ namespace BeWo.ViewModel
|
||||
}
|
||||
|
||||
var dates = DateTime.Parse("1." + _OnlyMonth + _OnlyYear);
|
||||
var StartDatetime = new DateTime(dates.Year, dates.Month, 1, 0, 0, 0);
|
||||
var StartDatetime = new DateTime(dates.Year, dates.Month, 1, 0, 0, 1);
|
||||
|
||||
StoreDirtyInformation(
|
||||
AreDifferent(DataContract.End, StartDatetime.AddHours((double)duration)) ||
|
||||
AreDifferent(DataContract.End, StartDatetime.AddHours((double)duration).AddSeconds(1)) ||
|
||||
AreDifferent(DataContract.Start, StartDatetime), "TIME");
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{BCCF055F-CF10-43D6-B618-136665D2A687}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>PraunheimerWerkstaettenGmbh</RootNamespace>
|
||||
<AssemblyName>5562845955_Reports</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>..\..\Host\bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>..\..\Host\bin\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="ServicesOverviewReport.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ServicesOverviewReport.Designer.cs">
|
||||
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Properties\licenses.licx" />
|
||||
<EmbeddedResource Include="ServicesOverviewReport.resx">
|
||||
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Data\Data.csproj">
|
||||
<Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
|
||||
<Name>Data</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Report\Report.csproj">
|
||||
<Project>{40d8b312-ea64-49e3-a31a-5e57ed4d5654}</Project>
|
||||
<Name>Report</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Service\Service.csproj">
|
||||
<Project>{094331c3-ecee-4c89-bbfd-4c9ded89f0ef}</Project>
|
||||
<Name>Service</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Shared\Shared.csproj">
|
||||
<Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
|
||||
<Name>Shared</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
@@ -0,0 +1,36 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("PraunheimerWerkstaettenGmbh")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("PraunheimerWerkstaettenGmbh")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
|
||||
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
|
||||
[assembly: Guid("bccf055f-cf10-43d6-b618-136665d2a687")]
|
||||
|
||||
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
|
||||
//
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
|
||||
// übernehmen, indem Sie "*" eingeben:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
@@ -0,0 +1 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
1174
ReportImp/PraunheimerWerkstaettenGmbh/ServicesOverviewReport.Designer.cs
generated
Normal file
1174
ReportImp/PraunheimerWerkstaettenGmbh/ServicesOverviewReport.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,35 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.ComponentModel;
|
||||
using DevExpress.XtraReports.UI;
|
||||
using BeWo.Report.ReportObjects;
|
||||
using BeWo.Report;
|
||||
|
||||
namespace PraunheimerWerkstaettenGmbh
|
||||
{
|
||||
public partial class Stundenzettel : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<ServicesOverviewRO>
|
||||
{
|
||||
public Stundenzettel()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public void SetReportDataSource(ServicesOverviewRO pRO)
|
||||
{
|
||||
DateTime dt = DateTime.Now.Date.AddHours(pRO.TotalFLS);
|
||||
|
||||
|
||||
lblGeleisteteStunden.Text = String.Format("(geleistete Std.: {0} Std. {1:00} Min.)", dt.TimeOfDay.Hours,dt.TimeOfDay.Minutes);
|
||||
|
||||
foreach (var sr in pRO.Services)
|
||||
{
|
||||
DateTime dt2 = DateTime.Now.Date.AddMinutes(sr.Minutes);
|
||||
|
||||
sr.Notice2 = String.Format("{0}:{1:00}", dt2.TimeOfDay.Hours, dt2.TimeOfDay.Minutes);
|
||||
}
|
||||
|
||||
pRO.CalculateFLSSollIst();
|
||||
this.bindingSource1.DataSource = pRO;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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>21, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -143,7 +143,8 @@ namespace BeWo.Service.Plugins
|
||||
//t = "3549726254"; // Socia Köln
|
||||
//t = "4595275645"; // Eigenständig Hennef
|
||||
// t = "7381352241"; // Ressource e.V.
|
||||
t = "7912635399"; //Prof Eggers Stiftung
|
||||
//t = "7912635399"; //Prof Eggers Stiftung
|
||||
t = "5562845955";//Praunheimer WerkstaettenGmbh
|
||||
|
||||
return t;
|
||||
#else
|
||||
|
||||
@@ -924,6 +924,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
dc.InsUser = item.InsUser;
|
||||
|
||||
dc.DurationInStunden = item.DurationInStunden;
|
||||
dc.ServiceRecordFormat = item.ServiceRecordFormat;
|
||||
|
||||
CompactCustomerDC customerDC = null;
|
||||
if (item.Customer != null)
|
||||
@@ -2400,7 +2401,8 @@ namespace BeWo.Service.ServiceImplementations
|
||||
dc.InsUser = sr.InsUser;
|
||||
|
||||
dc.DurationInStunden = sr.DurationInStunden;
|
||||
|
||||
dc.ServiceRecordFormat = sr.ServiceRecordFormat;
|
||||
|
||||
dc.GroupEmployeeCount = sr.GroupEmployeeCount;
|
||||
dc.GroupPersonCount = sr.GroupPersonCount;
|
||||
dc.GroupRoundedDuration = sr.GroupRoundedDuration;
|
||||
@@ -2462,6 +2464,7 @@ namespace BeWo.Service.ServiceImplementations
|
||||
dc.InsUser = sr.InsUser;
|
||||
dc.DurationInStunden = sr.DurationInStunden;
|
||||
dc.SignatureOid = sr.SignatureOid;
|
||||
dc.ServiceRecordFormat = sr.ServiceRecordFormat;
|
||||
|
||||
//Customer -----------------
|
||||
dc.Customer = new CompactCustomerDC();
|
||||
|
||||
Reference in New Issue
Block a user