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

GEsamtstunden/Monat und von bis bargeldverwaltung

Browse Source
This commit is contained in:
Waldi
2016-10-06 14:45:14 +02:00
parent aba7bfd457
commit e06c9e8cbd
22 changed files with 218 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BeWo/Core/BeWoUtils.cs
View File

@@ -1679,10 +1679,14 @@ namespace BeWo.Core
var zeitraum = (DateTime) variablen["zeitraum"];
var objectOid = Convert.ToInt64(variablen["objectoid"]);
var objectTid = (TableID) Enum.Parse(typeof (TableID), variablen["objecttid"].ToString());
var endzeitraum = (DateTime)variablen["endzeitraum"];
var kasse = (BargeldkassenDC) variablen["bargeldkasse"];
ServiceFacade.DoReportServiceAsync(strom => strom.CreateKassenbuchReport(zeitraum, kasse, objectOid, objectTid), ms => BeWoApp.MainControl.Dispatch(() => ShowReportWindow(ms, documentPreview, title)));
ServiceFacade.DoReportServiceAsync(strom => strom.CreateKassenbuchReportImZeitraum(zeitraum,endzeitraum, kasse, objectOid, objectTid), ms => BeWoApp.MainControl.Dispatch(() => ShowReportWindow(ms, documentPreview, title)));
break;
case ReportEnum.ZahlungsbelegEnum:

9
BeWo/ServiceProxy/Generated.cs
View File

@@ -5584,6 +5584,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IReportService/CreateKassenbuchReportBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.IO.MemoryStream CreateKassenbuchReport(System.DateTime zeitraum, BS.Shared.DataContracts.BargeldkassenDC bargeldkasse, long objectOid, BS.Shared.TableID objectTid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IReportService/CreateKassenbuchReportImZeitraum", ReplyAction="http://tempuri.org/IReportService/CreateKassenbuchReportImZeitraumResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IReportService/CreateKassenbuchReportImZeitraumBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.IO.MemoryStream CreateKassenbuchReportImZeitraum(System.DateTime zeitraumStart, System.DateTime zeitraumEnde, BS.Shared.DataContracts.BargeldkassenDC bargeldkasse, long objectOid, BS.Shared.TableID objectTid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IReportService/CreateKassenbelegReport", ReplyAction="http://tempuri.org/IReportService/CreateKassenbelegReportResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IReportService/CreateKassenbelegReportBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.IO.MemoryStream CreateKassenbelegReport(BS.Shared.DataContracts.BargeldtransaktionDC transaktion, long objectOid, BS.Shared.TableID objectTid);
@@ -5641,6 +5645,11 @@ namespace BeWo.ServiceProxy
return base.Channel.CreateKassenbuchReport(zeitraum, bargeldkasse, objectOid, objectTid);
}
public System.IO.MemoryStream CreateKassenbuchReportImZeitraum(System.DateTime zeitraumStart, System.DateTime zeitraumEnde, BS.Shared.DataContracts.BargeldkassenDC bargeldkasse, long objectOid, BS.Shared.TableID objectTid)
{
return base.Channel.CreateKassenbuchReportImZeitraum(zeitraumStart, zeitraumEnde, bargeldkasse, objectOid, objectTid);
}
public System.IO.MemoryStream CreateKassenbelegReport(BS.Shared.DataContracts.BargeldtransaktionDC transaktion, long objectOid, BS.Shared.TableID objectTid)
{
return base.Channel.CreateKassenbelegReport(transaktion, objectOid, objectTid);

13
BeWo/View/BargeldkassenView.xaml
View File

@@ -221,10 +221,19 @@
</StackPanel>
<StackPanel Grid.Column="3" Grid.Row="1" HorizontalAlignment="Right" Orientation="Horizontal">
<ComboBox x:Name="KassenbuchMonatsCB" Margin="3" ItemsSource="{Binding Path=MonatsComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
<Label Content="Startdatum" VerticalAlignment="Center"/>
<dxe:DateEdit x:Name="KassenBuchStartCB" Height="23" Margin="3" EditValue="{Binding Path=PreselectedStartDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False" />
<Label Content="Enddatum" VerticalAlignment="Center"/>
<dxe:DateEdit x:Name="KassenBuchEndCB" Height="23" Margin="3" EditValue="{Binding Path=PreselectedEndDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False"/>
<!--<ComboBox x:Name="KassenbuchMonatsCB" Margin="3" ItemsSource="{Binding Path=MonatsComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
SelectedItem="{Binding Path=PreselectedMonth, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}"/>
<ComboBox x:Name="KassenbuchJahresCB" Margin="3" ItemsSource="{Binding Path=JahresComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
SelectedItem="{Binding Path=PreselectedYear, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}"/>
SelectedItem="{Binding Path=PreselectedYear, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}"/>-->
<TextBlock Margin="3" FontSize="14" VerticalAlignment="Center" PreviewMouseLeftButtonDown="KlassenbuchLinkOnPreviewMouseLeftButtonDown" Tag="{Binding}" IsEnabled="{Binding Path=Bargeldtransaktionen.VMList.Count, Converter={StaticResource CollectionCountToBoolConverter}, UpdateSourceTrigger=PropertyChanged}">
<Hyperlink x:Name="LinkKassenbuchDrucken" TargetName="_NewWindow" Style="{StaticResource HyperlinkStyle}">

40
BeWo/View/BargeldkassenView.xaml.cs
View File

@@ -31,6 +31,20 @@ namespace BeWo.View
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public BargeldkassenVM SelectedBargeldkasse { get; set; }
public static DateTime PreselectedStartDate
{
get { return new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);; }
}
public static DateTime PreselectedEndDate
{
get
{
return new DateTime(DateTime.Now.Year, DateTime.Now.Month,DateTime.DaysInMonth(DateTime.Now.Year,DateTime.Now.Month));
}
}
public static int PreselectedMonth
{
get { return DateTime.Now.Month; }
@@ -117,14 +131,17 @@ namespace BeWo.View
NewBargeldtransaktion = new BargeldtransaktionsVM(new BargeldtransaktionDC());
InitRights();
InitRights();
ReloadViewModel();
if (tabcontrol_bargeldkassen != null && tabcontrol_bargeldkassen.SelectedIndex == -1)
{
tabcontrol_bargeldkassen.SelectedIndex = 0;
}
}
private void InitRights()
@@ -155,6 +172,7 @@ namespace BeWo.View
darfBargeldTransaktionenBearbeitenAsDefaultBoolean = editRightAsDefaultBoolean;
darfBargeldTransaktionenLoeschen = deleteRight;
darfBargeldTransaktionenAnlegen = createRight;
}
private void ReloadViewModel()
@@ -238,15 +256,21 @@ namespace BeWo.View
var parentStackPanel = (StackPanel) textBlock.Parent;
var kinder = parentStackPanel.Children;
var monatsCombobox = (ComboBox) kinder[0];
var jahresCombobox = (ComboBox) kinder[1];
var startzeitraum = (DateEdit)kinder[1];
var endzeitraum = (DateEdit) kinder[3];
//var monatsCombobox = (ComboBox) kinder[0];
//var jahresCombobox = (ComboBox) kinder[1];
var monat = Convert.ToInt32(monatsCombobox.SelectedItem);
var jahr = Convert.ToInt32(jahresCombobox.SelectedItem);
//var monat = Convert.ToInt32(monatsCombobox.SelectedItem);
//var jahr = Convert.ToInt32(jahresCombobox.SelectedItem);
//var jahr = Convert.ToInt32(jahresCombobox.DateTime.Year);
//var monat = Convert.ToInt32(jahresCombobox.DateTime.Month);
var zeitraum = new DateTime(jahr, monat, 1);
//var zeitraum = new DateTime(jahr, monat, 1);
BeWoUtils.ShowReport("Kassenbuch", null, new Dictionary<String, Object> { { "bargeldkasse", kasse }, { "zeitraum", zeitraum }, { "objectoid", kasse.ObjectOid }, { "objecttid", kasse.ObjectTid } }, ReportEnum.KassenbuchReportEnum);
BeWoUtils.ShowReport("Kassenbuch", null, new Dictionary<String, Object> { { "bargeldkasse", kasse }, { "zeitraum", startzeitraum.DateTime }, { "endzeitraum", endzeitraum.DateTime }, { "objectoid", kasse.ObjectOid }, { "objecttid", kasse.ObjectTid } }, ReportEnum.KassenbuchReportEnum);
}
private void ButtonBargeldtransaktionDeleteClick(object sender, RoutedEventArgs e)

19
BeWo/View/Detail/EmployeeView.xaml
View File

@@ -395,6 +395,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center">Vertragsbeginn</Label>
<Label Grid.Column="0" Grid.Row="1" Margin="3" VerticalAlignment="Center">Befristet bis</Label>
@@ -402,10 +403,11 @@
<Label Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Center">Stundensatz</Label>
<Label Grid.Column="0" Grid.Row="4" Margin="3" VerticalAlignment="Center">FLS/Woche</Label>
<Label Grid.Column="0" Grid.Row="5" Margin="3" VerticalAlignment="Center">Gesamtstunden/Woche</Label>
<Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
<Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
<Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Probezeit (Tage)</Label>
<Label Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
<Label Grid.Column="0" Grid.Row="6" Margin="3" VerticalAlignment="Center">Gesamtstunden/Monat</Label>
<Label Grid.Column="0" Grid.Row="7" Margin="3" VerticalAlignment="Center">Arbeitstage pro Woche</Label>
<Label Grid.Column="0" Grid.Row="8" Margin="3" VerticalAlignment="Center">Urlaubstage</Label>
<Label Grid.Column="0" Grid.Row="9" Margin="3" VerticalAlignment="Center">Probezeit (Tage)</Label>
<Label Grid.Column="0" Grid.Row="10" Margin="3" VerticalAlignment="Center">Künd.-frist (Tage)</Label>
<Label Grid.Column="3" Grid.Row="0" Margin="3" VerticalAlignment="Center">Bemerkungen</Label>
@@ -415,10 +417,11 @@
<dxe:TextEdit MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="3" Height="23" Margin="3" EditValue="{Binding Path=HourlyRate, UpdateSourceTrigger=PropertyChanged}"/>
<dxe:TextEdit MaskType="Numeric" Mask="########0.000" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="4" Margin="3" Height="23" EditValue="{Binding Path=WeeklyFLS, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" EditValue="{Binding Path=WeeklyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" EditValue="{Binding Path=MonthlyTotalHours, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" MaxValue="7" IsFloatValue="False" Grid.Column="1" Grid.Row="7" Margin="3" Height="23" EditValue="{Binding Path=WeeklyDays, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:TextEdit MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Grid.Column="1" Grid.Row="8" Margin="3" Height="23" EditValue="{Binding Path=LeaveDays, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="9" Margin="3" Height="23" EditValue="{Binding Path=ProbationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<dxe:SpinEdit MinValue="0" IsFloatValue="False" Grid.Column="1" Grid.Row="10" Margin="3" Height="23" EditValue="{Binding Path=CancellationPeriod, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Grid.Column="3" Grid.Row="1" Grid.RowSpan="8" Margin="3" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Left" ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True" AutoWordSelection="True" />

4
BeWo/View/Report/Auslastung/AuslastungListView.xaml.cs
View File

@@ -30,6 +30,7 @@ namespace BeWo.View.Report.Auslastung
decimal flsApproved = 0;
decimal flsTotal = 0;
decimal hoursTotal = 0;
decimal monthlyHoursTotal = 0;
if (AuslastungRows != null)
{
@@ -37,6 +38,9 @@ namespace BeWo.View.Report.Auslastung
{
if (item.AuslastungAnalysisEmployee.WeeklyTotalHours.HasValue)
hoursTotal += item.AuslastungAnalysisEmployee.WeeklyTotalHours.Value;
if (item.AuslastungAnalysisEmployee.MonthlyTotalHours.HasValue)
monthlyHoursTotal += item.AuslastungAnalysisEmployee.MonthlyTotalHours.Value;
foreach (var detailRow in item.DetailRows)
{
if (detailRow.RowType == AuslastungRowTypes.Detail)

21
BeWo/ViewModel/ContractVM.cs
View File

@@ -20,6 +20,7 @@ namespace BeWo.ViewModel
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static string PropertyName_LeaveDays = "LeaveDays";
public static string PropertyName_Notice = "Notice";
public static string PropertyName_EmploymentType = "EmploymentType";
@@ -28,6 +29,7 @@ namespace BeWo.ViewModel
private decimal? _LeaveDays;
private decimal? _WeeklyTotalHours;
private decimal? _MonthlyTotalHours;
private decimal? _WeeklyFLS;
private decimal? _HourlyRate;
private DateTime? _EntryDate;
@@ -136,6 +138,23 @@ namespace BeWo.ViewModel
}
}
public decimal? MonthlyTotalHours
{
get { return this._MonthlyTotalHours; }
set
{
if (this.AreDifferent(this._MonthlyTotalHours, value))
{
this._MonthlyTotalHours = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.MonthlyTotalHours, value), PropertyName_MonthlyTotalHours);
this.FirePropertyChanged(PropertyName_MonthlyTotalHours);
}
}
}
public decimal? WeeklyFLS
{
get { return this._WeeklyFLS; }
@@ -273,6 +292,7 @@ namespace BeWo.ViewModel
this._WeeklyDays = pDataContract.WeeklyDays;
this._WeeklyFLS = pDataContract.WeeklyFLS;
this._WeeklyTotalHours = pDataContract.WeeklyTotalHours;
_MonthlyTotalHours = pDataContract.MonthlyTotalHours;
this._Notice = pDataContract.Notice;
this._EmploymentType = pDataContract.EmploymentType;
}
@@ -289,6 +309,7 @@ namespace BeWo.ViewModel
pDataContract.WeeklyDays = this._WeeklyDays;
pDataContract.WeeklyFLS = this._WeeklyFLS;
pDataContract.WeeklyTotalHours = this._WeeklyTotalHours;
pDataContract.MonthlyTotalHours = _MonthlyTotalHours;
pDataContract.Notice = this._Notice;
pDataContract.EmploymentType = this._EmploymentType;

1
BeWo/ViewModel/EmployeeVM.cs
View File

@@ -72,6 +72,7 @@ namespace BeWo.ViewModel
public static string PropertyName_Town = "Town";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static String PropertyName_EmployeeColor = "EmployeeColor";
public static String PropertyName_EmployeeBrush = "EmployeeBrush";
public static string PropertyName_EmployeeImage = "EmployeeImage";

13
Data/Entities/Contract.cs
View File

@@ -17,12 +17,14 @@ namespace BeWo.Data.Entities
public static string PropertyName_HourlyRate = "HourlyRate";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static string PropertyName_MonthlyTotalHours = "MonthlyTotalHours";
public static string PropertyName_LeaveDays = "LeaveDays";
public static string PropertyName_EmployeeOid = "EmployeeOid";
public static string PropertyName_EmploymentType = "EmploymentType";
private decimal? _LeaveDays;
private decimal? _WeeklyTotalHours;
private decimal? _MonthlyTotalHours;
private decimal? _WeeklyFLS;
private decimal? _HourlyRate;
private DateTime? _EntryDate;
@@ -71,6 +73,17 @@ namespace BeWo.Data.Entities
}
}
public virtual decimal? MonthlyTotalHours
{
get { return _MonthlyTotalHours; }
set
{
if (base.AreDifferent(_MonthlyTotalHours, value))
_MonthlyTotalHours = value;
}
}
public virtual decimal? WeeklyFLS
{
get { return _WeeklyFLS; }

1
Data/Mappings/Contract.hbm.xml
View File

@@ -16,6 +16,7 @@
<property column="HourlyRate" type="Decimal" name="HourlyRate" />
<property column="WeeklyFLS" type="Decimal" name="WeeklyFLS" />
<property column="WeeklyTotalHours" type="Decimal" name="WeeklyTotalHours" />
<property column="MonthlyTotalHours" type="Decimal" name="MonthlyTotalHours" />
<property column="LeaveDays" type="Decimal" name="LeaveDays" />
<property column="EntryDate" type="DateTime" name="EntryDate" />
<property column="ContractEndDate" type="DateTime" name="ContractEndDate" />

14
Report/DefaultReports/KassenbuchReport.Designer.cs generated
View File

@@ -54,6 +54,7 @@
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblZeitraum = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -155,6 +156,7 @@
// TopMargin
//
this.TopMargin.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblZeitraum,
this.xrLabel2,
this.xrLabel1,
this.xrLabel3});
@@ -182,7 +184,7 @@
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 52.66666F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 47.33333F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 30F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "[ReportTitle]";
//
@@ -330,6 +332,15 @@
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.KassenbuchRO);
//
// lblZeitraum
//
this.lblZeitraum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.lblZeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 82.66666F);
this.lblZeitraum.Name = "lblZeitraum";
this.lblZeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblZeitraum.SizeF = new System.Drawing.SizeF(650F, 33.79166F);
this.lblZeitraum.StylePriority.UseFont = false;
//
// KassenbuchReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -378,5 +389,6 @@
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRLabel lblZeitraum;
}
}

7
Report/DefaultReports/KassenbuchReport.cs
View File

@@ -16,8 +16,11 @@ namespace BeWo.Report.DefaultReports
{
pRO.Transaktionen = pRO.Transaktionen.OrderBy(o => o.Belegdatum).ToList();
}
bindingSource1.DataSource = pRO;
pRO.ReportTitle = string.Format("Kassenbuch \"{0}\" {1}", pRO.Kassenname,(pRO.Beguenstigter == null ? string.Empty : string.Format(" von {0}", pRO.Beguenstigter)));
lblZeitraum.Text = string.Format("{0} - {1}", pRO.StartZeitraum.ToString("dd. MMMM yyyy"),
pRO.EndZeitraum.ToString("dd. MMMM yyyy"));
bindingSource1.DataSource = pRO;
}
}
}

1
Report/Report.csproj
View File

@@ -332,6 +332,7 @@
</EmbeddedResource>
<EmbeddedResource Include="DefaultReports\KassenbuchReport.resx">
<DependentUpon>KassenbuchReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DefaultReports\KalenderMonatsformatReport.resx">
<DependentUpon>KalenderMonatsformatReport.cs</DependentUpon>

35
Report/ReportObjects/KassenbuchRO.cs
View File

@@ -17,6 +17,8 @@ namespace BeWo.Report.ReportObjects
public string Kassenname { get; set; }
public string Beguenstigter { get; set; }
public string ReportTitle { get; set; }
public DateTime StartZeitraum { get; set; }
public DateTime EndZeitraum { get; set; }
public static KassenbuchRO Create(DateTime pZeitraum, BargeldkassenDC pBargeldkasse, BeWoEntityBase pBeguenstigter)
{
@@ -50,6 +52,39 @@ namespace BeWo.Report.ReportObjects
ReportTitle = string.Format("Kassenbuch \"{0}\" {1}{2}", pBargeldkasse.Kassenname, pZeitraum.ToString("MMMM yyyy"), (pBeguenstigter == null ? string.Empty : string.Format(" von {0}", beguenstigter)))
};
}
public static KassenbuchRO Create(DateTime pStartZeitraum,DateTime pEndZeitraum, BargeldkassenDC pBargeldkasse, BeWoEntityBase pBeguenstigter)
{
var beguenstigter = string.Empty;
if (pBeguenstigter is Customer)
{
var customer = (Customer)pBeguenstigter;
beguenstigter = customer.Person.FirstNameLastName;
}
var t = pBargeldkasse.Bargeldtransaktionen.Where(w => w.Zahlungsdatum != null && w.Zahlungsdatum.Value >= pStartZeitraum && w.Zahlungsdatum <= pEndZeitraum).OrderByDescending(o => o.Zahlungsdatum).Select(tDC => new ZeilenObjekt
{
Einzahlung = tDC.Zahlungstyp == Zahlungstyp.Einzahlung && tDC.Betrag != null ? tDC.Betrag.Value : 0,
Auszahlung = tDC.Zahlungstyp == Zahlungstyp.Auszahlung && tDC.Betrag != null ? tDC.Betrag.Value : 0,
Bestand = tDC.Transaktionskassenbestand.Value,
Belegdatum = tDC.Zahlungsdatum.Value,
Notiz = tDC.Notice
}).ToList();
var ersteTransaktion = pBargeldkasse.Bargeldtransaktionen.OrderBy(o => o.Zahlungsdatum).ToList()[0];
return new KassenbuchRO
{
Kassenname = pBargeldkasse.Kassenname,
Beguenstigter = beguenstigter,
StartZeitraum = pStartZeitraum,
EndZeitraum = pEndZeitraum,
Transaktionen = t,
Anfangsbestand = ersteTransaktion.Transaktionskassenbestand.Value - ersteTransaktion.Betrag.Value * (ersteTransaktion.Zahlungstyp == Zahlungstyp.Einzahlung ? 1 : -1)
};
}
}
public struct ZeilenObjekt

4
ReportService/ServiceContracts/IReportService.cs
View File

@@ -23,6 +23,10 @@ namespace ReportingService.ServiceContracts
[OperationContract]
MemoryStream CreateKassenbuchReport(DateTime zeitraum, BargeldkassenDC bargeldkasse, long objectOid, TableID objectTid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
MemoryStream CreateKassenbuchReportImZeitraum(DateTime zeitraumStart, DateTime zeitraumEnde, BargeldkassenDC bargeldkasse, long objectOid, TableID objectTid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
MemoryStream CreateKassenbelegReport(BargeldtransaktionDC transaktion, long objectOid, TableID objectTid);

7
ReportService/ServiceImplementations/ReportServiceImp.cs
View File

@@ -41,6 +41,13 @@ namespace ReportingService.ServiceImplementations
return CreateReportStream(new KassenbuchReport(), KassenbuchRO.Create(zeitraum, bargeldkasse, beguenstigter));
}
public MemoryStream CreateKassenbuchReportImZeitraum(DateTime zeitraumStart, DateTime zeitraumEnde, BargeldkassenDC bargeldkasse, long objectOid, TableID objectTid)
{
var beguenstigter = LoadToBargeldkasseRelatedObject(objectTid, objectOid);
return CreateReportStream(new KassenbuchReport(), KassenbuchRO.Create(zeitraumStart, zeitraumEnde, bargeldkasse, beguenstigter));
}
public MemoryStream CreateKassenbelegReport(BargeldtransaktionDC transaktion, long objectOid, TableID objectTid)
{
var beguenstigter = LoadToBargeldkasseRelatedObject(objectTid, objectOid);

2
Service/DCEntityMapper/ContractDC_Contract.cs
View File

@@ -22,6 +22,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.WeeklyDays = 5;
pDataContract.WeeklyFLS = pEntity.WeeklyFLS;
pDataContract.WeeklyTotalHours = pEntity.WeeklyTotalHours;
pDataContract.MonthlyTotalHours = pEntity.MonthlyTotalHours;
pDataContract.Notice = pEntity.Notice;
if (pEntity.EmploymentType != null)
@@ -45,6 +46,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.WeeklyDays = pDataContract.WeeklyDays;
pEntity.WeeklyFLS = pDataContract.WeeklyFLS;
pEntity.WeeklyTotalHours = pDataContract.WeeklyTotalHours;
pEntity.MonthlyTotalHours = pDataContract.MonthlyTotalHours;
pEntity.Notice = pDataContract.Notice;
pEntity.Oid = pDataContract.ContractOid;

3
Service/ServiceImplementations/AnalysisServiceImp.cs
View File

@@ -1536,6 +1536,9 @@ namespace BeWo.Service.ServiceImplementations
if (contract != null && contract.WeeklyFLS.HasValue)
empDC.WeeklyTotalHours = contract.WeeklyTotalHours;
if (contract != null && contract.MonthlyTotalHours.HasValue)
empDC.MonthlyTotalHours = contract.MonthlyTotalHours;
IList<ServiceRecord> serviceRecords = null;
if (startDate != null && endDate != null)

56
Service/ServiceImplementations/DownloadServiceImp.cs
View File

@@ -191,24 +191,25 @@ namespace BeWo.Service.ServiceImplementations
"Urlaubstage", // 12
"FLS/Woche", // 13
"Gesamtstunden/Woche", // 14
"Arbeitstage pro Woche", // 15
"Eintrittsdatum", // 16
"Gesamtstunden/Monat", // 15
"Arbeitstage pro Woche", // 16
"Eintrittsdatum", // 17
"Versicherungsnummer",
"Stundensatz",
"Telefon",
"Mobil", // 20
"Mobil", // 21
"Mail",
"private Mail",
"Fax",
"Strasse",
"PLZ", // 25
"PLZ", // 26
"Ort",
"Kontonummer",
"Bankleitzahl",
"Bank",
"BIC", // 30
"BIC", // 31
"IBAN",
"Bemerkung" // 32
"Bemerkung" // 33
};
string[][] lContent = new string[lEmployees.Count][];
@@ -293,23 +294,28 @@ namespace BeWo.Service.ServiceImplementations
lContent[iRowCount][14] = lastContract.WeeklyTotalHours.Value.ToStringNullCheck();
}
if (lastContract.MonthlyTotalHours.HasValue)
{
lContent[iRowCount][15] = lastContract.MonthlyTotalHours.Value.ToStringNullCheck();
}
var wd = lastContract.WeeklyDays ?? 5;
if (wd == 0)
wd = 5;
lContent[iRowCount][15] = String.Format("{0}", wd);
lContent[iRowCount][16] = String.Format("{0}", wd);
lContent[iRowCount][16] = lastContract.EntryDate.DoIfNotNull(d => d.ToShortDateString());
lContent[iRowCount][17] = lastContract.EntryDate.DoIfNotNull(d => d.ToShortDateString());
}
lContent[iRowCount][17] = lEmployees[iRowCount].InsuranceNumber;
lContent[iRowCount][18] = lEmployees[iRowCount].InsuranceNumber;
if (lastContract != null)
{
if (lastContract.HourlyRate.HasValue)
{
lContent[iRowCount][18] = lastContract.HourlyRate.Value.ToStringNullCheck();
lContent[iRowCount][19] = lastContract.HourlyRate.Value.ToStringNullCheck();
}
}
foreach (var iContact in lEmployees[iRowCount].Person.Contacts)
@@ -317,40 +323,40 @@ namespace BeWo.Service.ServiceImplementations
switch (iContact.Type)
{
case ContactType.business_Phone:
lContent[iRowCount][19] = iContact.Value;
break;
case ContactType.business_MobilePhone:
lContent[iRowCount][20] = iContact.Value;
break;
case ContactType.business_Mail:
case ContactType.business_MobilePhone:
lContent[iRowCount][21] = iContact.Value;
break;
case ContactType.private_Mail:
case ContactType.business_Mail:
lContent[iRowCount][22] = iContact.Value;
break;
case ContactType.business_Fax:
case ContactType.private_Mail:
lContent[iRowCount][23] = iContact.Value;
break;
case ContactType.business_Fax:
lContent[iRowCount][24] = iContact.Value;
break;
}
}
if (lEmployees[iRowCount].Person.Address != null)
{
lContent[iRowCount][24] = lEmployees[iRowCount].Person.Address.Street;
lContent[iRowCount][25] = lEmployees[iRowCount].Person.Address.PostalCode;
lContent[iRowCount][26] = lEmployees[iRowCount].Person.Address.Town;
lContent[iRowCount][25] = lEmployees[iRowCount].Person.Address.Street;
lContent[iRowCount][26] = lEmployees[iRowCount].Person.Address.PostalCode;
lContent[iRowCount][27] = lEmployees[iRowCount].Person.Address.Town;
}
if (lEmployees[iRowCount].Person.BankAccount != null)
{
lContent[iRowCount][27] = lEmployees[iRowCount].Person.BankAccount.AccountNumber;
lContent[iRowCount][28] = lEmployees[iRowCount].Person.BankAccount.BankCode;
lContent[iRowCount][29] = lEmployees[iRowCount].Person.BankAccount.BankName;
lContent[iRowCount][30] = lEmployees[iRowCount].Person.BankAccount.Bic;
lContent[iRowCount][31] = lEmployees[iRowCount].Person.BankAccount.IBAN;
lContent[iRowCount][28] = lEmployees[iRowCount].Person.BankAccount.AccountNumber;
lContent[iRowCount][29] = lEmployees[iRowCount].Person.BankAccount.BankCode;
lContent[iRowCount][30] = lEmployees[iRowCount].Person.BankAccount.BankName;
lContent[iRowCount][31] = lEmployees[iRowCount].Person.BankAccount.Bic;
lContent[iRowCount][32] = lEmployees[iRowCount].Person.BankAccount.IBAN;
}
lContent[iRowCount][32] = lEmployees[iRowCount].Notice;
lContent[iRowCount][33] = lEmployees[iRowCount].Notice;
}

3
Shared/DataContracts/ClientPartials/AuslastungAnalysisEmployeeDC.cs
View File

@@ -18,6 +18,9 @@ namespace BS.Shared.DataContracts.Reports
if (WeeklyTotalHours.HasValue)
name += String.Format(" {0:0.##} Std.", WeeklyTotalHours);
if(MonthlyTotalHours.HasValue)
name += String.Format(" {0:0.##} Std.", MonthlyTotalHours);
}

3
Shared/DataContracts/ContractDC.cs
View File

@@ -18,6 +18,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public decimal? WeeklyTotalHours { get; set; }
[DataMember]
public decimal? MonthlyTotalHours { get; set; }
[DataMember]
public decimal? WeeklyFLS { get; set; }

3
Shared/DataContracts/Reports/AuslastungAnalysisEmployeeDC.cs
View File

@@ -26,6 +26,9 @@ namespace BS.Shared.DataContracts.Reports
[DataMember]
public decimal? WeeklyTotalHours { get; set; }
[DataMember]
public decimal? MonthlyTotalHours { get; set; }
[DataMember]
public decimal TotalFLM { get; set; }