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

AB

Browse Source
This commit is contained in:
Alexandra
2021-08-11 12:06:56 +02:00
parent c41a3d3bad
commit ec4059f282
10 changed files with 110 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
BeWo/View/Detail/PreisView.xaml
View File

@@ -6,14 +6,14 @@
xmlns:localView="clr-namespace:BeWo.View"
xmlns:val="clr-namespace:BeWo.Validation"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v17.1"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
xmlns:Shared="clr-namespace:BS.Shared;assembly=BS.Shared"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<GroupBox Name="root" Header="Aktuell definierte Preise" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
@@ -26,10 +26,13 @@
</Grid.RowDefinitions>
<Label>Bezeichnung</Label>
<TextBox Grid.Column="1" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Name, UpdateSourceTrigger=PropertyChanged}"/>
<Label Grid.Column="2" >Preis</Label>
<dxe:TextEdit Grid.Column="3" MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Height ="23" Margin="3" EditValue="{val:ValidationBinding Path=NewVM.Betrag, UpdateSourceTrigger=PropertyChanged}" />
<Button Name="button_addPreis" Click="Button_addPreis_Click" Grid.Column="4" Height="25" Margin="3,3,3,3" Padding="5 0" IsDefault="True" Content="Hinzufügen" />
<!--<Label Grid.Column="2" >Preis</Label>
<dxe:TextEdit Grid.Column="3" MaskType="Numeric" Mask="########0.00" MaskUseAsDisplayFormat="True" Height ="23" Margin="3" EditValue="{val:ValidationBinding Path=NewVM.Betrag, UpdateSourceTrigger=PropertyChanged}" />-->
<localView:CostRatePeriodControl Grid.Column="3" Grid.ColumnSpan="2" CostRateType="{x:Static Shared:CostRatePeriodType.AmountOfMoney}"
VM="{Binding NewVM.CostRatePeriods}" Foreground="#FF000000"
ValueLabelText="Betrag (€)"
ButtonTooltipText="Neuen Betrag hinzufügen" />
<Button Name="button_addPreis" Click="Button_addPreis_Click" Grid.Column="5" Height="25" Margin="3,3,3,3" Padding="5 0" IsDefault="True" Content="Hinzufügen" />
<dxg:GridControl x:Name="DatagridRegions" Margin="0,10,0,0" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="6" DataSource="{Binding VMList}">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
@@ -51,6 +54,23 @@
<dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
</dxg:GridControl.View>
</dxg:GridControl>
<Popup x:Name="popup_costrateperiods" StaysOpen="false" Placement="MousePoint">
<Border>
<Grid Background="White">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<WrapPanel>
<localView:CostRatePeriodControl CostRateType="{x:Static Shared:CostRatePeriodType.AmountOfMoney}"
VM="{Binding EditVM.CostRatePeriods}" Foreground="#FF000000"
ValueLabelText="Betrag (€)"
ButtonTooltipText="Neuen Betrag hinzufügen" />
</WrapPanel>
<Button Name="button_edit" FontWeight="Normal" HorizontalAlignment="Right" Grid.Row="1" Height="25" Margin="3 3 3 3" Padding="5 0" Click="button_edit_Click" IsDefault="True">Übernehmen</Button>
</Grid>
</Border>
</Popup>
</Grid>
</GroupBox>
</localView:BeWoView>

5
BeWo/View/Detail/PreisView.xaml.cs
View File

@@ -95,5 +95,10 @@ namespace BeWo.View.Detail
ViewModel.AddNewVMToList();
}
}
private void button_edit_Click(object sender, RoutedEventArgs e)
{
popup_costrateperiods.IsOpen = false;
}
}
}

20
Data/Entities/Preis.cs
View File

@@ -12,6 +12,22 @@ namespace BeWo.Data.Entities
private string _Name;
private decimal? _Betrag;
private DateTime? _InsTs;
public static string PropertyName_CostRatePeriods = "CostRatePeriods";
private IList<CostRatePeriod> _CostRatePeriods;
public virtual IList<CostRatePeriod> CostRatePeriods
{
get { return this._CostRatePeriods ?? (this._CostRatePeriods = new List<CostRatePeriod>()); }
set
{
if (this.AreDifferent(this._CostRatePeriods, value))
{
this._CostRatePeriods = value;
}
}
}
public Preis()
{
@@ -62,5 +78,9 @@ namespace BeWo.Data.Entities
}
}
}
public virtual decimal BillableAmount { get; set; }
public virtual bool? DoNotCheckOverlapping { get; set; }
}
}

4
Data/Mappings/Preis.hbm.xml
View File

@@ -17,5 +17,9 @@
<property column="Name" type="string" name="Name" />
<property column="Betrag" type="decimal" name="Betrag" />
<bag name="CostRatePeriods" table="CostRatePeriod" generic="true" cascade="all-delete-orphan" where="ObjectTid = 155" batch-size="250">
<key column="ObjectOid" />
<one-to-many class="BeWo.Data.Entities.CostRatePeriod,BeWo.Data" />
</bag>
</class>
</hibernate-mapping>

16
ReportImp/BUGeVReports/SettlementReport.Designer.cs generated
View File

@@ -65,7 +65,6 @@ namespace BeWo.BUGeVReports.Alt
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
@@ -108,9 +107,10 @@ namespace BeWo.BUGeVReports.Alt
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -404,7 +404,7 @@ namespace BeWo.BUGeVReports.Alt
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
this.xrLabel5.Text = "Sehr geehrte Damen und Herren, TEST 1";
//
// xrLabel4
//
@@ -486,10 +486,6 @@ namespace BeWo.BUGeVReports.Alt
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.Text = "[RecipientOrganisation]\r\n[RecipientStreet]\r\n[RecipientPostCodeAndTown]";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// xrLabel18
//
this.xrLabel18.Font = new System.Drawing.Font("Arial", 10F);
@@ -871,6 +867,10 @@ namespace BeWo.BUGeVReports.Alt
this.GroupFooter2.Name = "GroupFooter2";
this.GroupFooter2.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -890,8 +890,8 @@ namespace BeWo.BUGeVReports.Alt
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

6
ReportImp/BUGeVReports/SettlementReport.resx
View File

@@ -120,10 +120,10 @@
<data name="xrLabel6.Text" xml:space="preserve">
<value>anbei sende ich Ihnen die Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den [AccountingPeriod] hieraus:</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="xrLabel12.Text" xml:space="preserve">
<value>Hiermit wird erklärt, dass die Verpflichtungen aus der Leistungs-, Prüfungs- und Vergütungsvereinbarung nach §§ 123 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben anhand der vorgehaltenen Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können.</value>
</data>
<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>

2
ReportImp/BUGeVReports/SettlementReport2.Designer.cs generated
View File

@@ -199,7 +199,7 @@ namespace BeWo.BUGeVReports
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Sehr geehrte Damen und Herren,";
this.xrLabel5.Text = "Sehr geehrte Damen und Herren, TEST 2";
//
// xrLabel4
//

10
Service/DCEntityMapper/PreisDC_Preis.cs
View File

@@ -23,6 +23,9 @@ namespace BeWo.Service.DCEntityMapper
bDataContract.PreisSystemEntryID = bEntity.SystemEntryID;
bDataContract.Name = bEntity.Name;
bDataContract.Betrag = bEntity.Betrag;
bDataContract.DoNotCheckOverlapping = bEntity.DoNotCheckOverlapping.HasValue && bEntity.DoNotCheckOverlapping.Value;
bDataContract.ActivationType = bEntity.IsActive;
bDataContract.CostRatePeriods = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(bEntity.CostRatePeriods);
return bDataContract;
}
@@ -37,6 +40,13 @@ namespace BeWo.Service.DCEntityMapper
bEntity.Name = bDataContract.Name;
bEntity.Betrag = bDataContract.Betrag;
bEntity.InsTs = bDataContract.PreisInsTs;
bEntity.DoNotCheckOverlapping = bDataContract.DoNotCheckOverlapping;
MapperFactory.CostRatePeriodDC_CostRatePeriod.MergeWithEntitys(bDataContract.CostRatePeriods, bEntity.CostRatePeriods);
foreach (var costRatePeriod in bEntity.CostRatePeriods)
{
costRatePeriod.ObjectTid = TableID.ServiceDescription;
}
return bEntity;
}

10
Service/Plugins/PluginLoader.cs
View File

@@ -21,7 +21,7 @@ namespace BeWo.Service.Plugins
//t = "irgendwaswasesnichtgibt";
//t = "5473568546"; //Interner Chat
t = "2356097460"; // Lebenshilfe Würzburg
// t = "2356097460"; // Lebenshilfe Würzburg
//t = "1234567890"; // Präsentationsdatenbank
//t = "5687373602"; // LH Duisburg
//t = "5509064354"; // LH Duisburg Service Plus
@@ -91,7 +91,7 @@ namespace BeWo.Service.Plugins
//t = "5700328131"; // Betreutes Wohnen St. Ludgerus Essen-Werden
//t = "1907984777"; // Soziale Dienste Katrin Schmidt
//t = "9033246467"; // SKM Menden
//t = "9290510010"; // Soziale Dienste Schilling (ehemals BeWo Schilling)
//t = "9290510010"; // Soziale Dienste Schilling (ehemals BeWo Schilling)
//t = "5251218094"; // KOMO e.V.
//t = "3529871747"; // Vivat gemeinnützige GmbH
//t = "8561513464"; // Caritasverband Wuppertal/Solingen
@@ -224,7 +224,7 @@ namespace BeWo.Service.Plugins
//t = "7817461089"; // FAB e.V. (Familienarbeit und Beratung e.V.)
//t = "5207911843"; // Pro Balance
//t = "8619663355"; // HSH Cologne
t = "1652658918"; // LH Frankfurt Oder
//t = "1652658918"; // LH Frankfurt Oder
//t = "7696927868"; // Kuhring Betreuung
//t = "6251348980"; // BeWo Gün
//t = "6782533512"; // LH Dorsten
@@ -271,7 +271,7 @@ namespace BeWo.Service.Plugins
//t = "8242644560"; // Bewolonia - Fr. Sultan Schulz
//t = "4817284046"; // Verein für Sozialmedizin Stade e.V.
//t = "6323001211"; // ASB Faßbacher Hof gGmbH
//t = "9389386079"; // VARO Sozialagentur
t = "9389386079"; // VARO Sozialagentur
//t = "7951718431"; // Ambulant Betreutes Wohnen Astrid Pulm
//t = "5850903700"; // Alzey Teilhabe
//t = "5929601293"; // Lebenshilfe Duisburg Frühförderung (Projekt heißt LebenshilfeDuisburgAtz)
@@ -280,7 +280,7 @@ namespace BeWo.Service.Plugins
//t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia)
//t = "2387527289"; // Lebenshilfe Duisburg HPFH
//t = "5595701056"; // Domiziel Ansbach
t = "9430188510"; // Pro INTEGRA
//t = "9430188510"; // Pro INTEGRA
//t = "4820371076"; // Zuhause Wohnen Iris Thimm
//t = "1078667960"; // FAM Rhein-Sieg Gbr

28
Shared/DataContracts/PreisDC.cs
View File

@@ -8,7 +8,9 @@ namespace BS.Shared.DataContracts
{
public class PreisDC : IDataContract
{
[DataMember]
private List<CostRatePeriodDC> _CostRatePeriods;
[DataMember]
public long? PreisOid { get; set; }
[DataMember]
@@ -38,6 +40,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public decimal? Betrag { get; set; }
[DataMember]
public decimal BillableAmount { get; set; }
public override string ToString()
{
return Name + " (" + (Betrag.HasValue ? Math.Round(Betrag.Value, 2) : 0) + " Std)";
@@ -57,5 +62,26 @@ namespace BS.Shared.DataContracts
{
return GetType().Name.GetHashCode() ^ PreisOid.GetHashCode();
}
public bool DoNotCheckOverlapping { get; set; }
[DataMember]
public List<CostRatePeriodDC> CostRatePeriods
{
get
{
return this._CostRatePeriods ?? (this._CostRatePeriods = new List<CostRatePeriodDC>());
}
set
{
this._CostRatePeriods = value;
}
}
[DataMember]
public ActivationTypeId ActivationType { get; set; }
}
}