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

CB, bugfixing neue Version

Browse Source
This commit is contained in:
Christian
2020-10-16 13:02:29 +02:00
parent 32cdbb1097
commit a74869de04
17 changed files with 1969 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BeWo/BeWo.csproj
View File

@@ -116,6 +116,7 @@
<Reference Include="DevExpress.Xpf.Ribbon.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Xpf.Ribbon.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.RichEdit.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Xpf.RichEdit.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Scheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Xpf.Scheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.LightGray.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2010Black.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Xpf.Themes.Office2010Black.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2013.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Xpf.Themes.Office2013.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2016White.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.Xpf.Themes.Office2016White.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

4
BeWo/BeWoApp.xaml.cs
View File

@@ -43,8 +43,8 @@ namespace BeWo
public static LoginControl LoginControl; public static LoginControl LoginControl;
public static MainControl MainControl; public static MainControl MainControl;
public static string ShortVersion = "3";
public static string Version = "Version 2.4.8 Test"; public static string Version = "Version 3.0 TEST";
public static int RenderTier = 0; public static int RenderTier = 0;

22
BeWo/Core/Service/Cache.cs
View File

@@ -352,6 +352,28 @@ namespace BeWo.Core.Service
return ve; return ve;
} }
public void AddGoalEntry(ValueListEntryDC newdc)
{
if (newdc.ValueListEntryOid.HasValue)
{
var ve = GetGoalEntry(newdc.ValueListEntryOid.Value);
if (ve == null || !ve.ValueListEntryOid.HasValue)
{
if (mValueListEntryDict != null)
{
if (!mValueListEntryDict.ContainsKey(newdc.Type))
{
mValueListEntryDict[newdc.Type] = new List<ValueListEntryDC>();
}
mValueListEntryDict[newdc.Type].Add(newdc);
}
}
}
}
public ValueListEntryDC GetValueListEntry(ValueListEntryType type, long oid) public ValueListEntryDC GetValueListEntry(ValueListEntryType type, long oid)
{ {
if (mValueListEntryDict == null || !mValueListEntryDict.ContainsKey(type)) if (mValueListEntryDict == null || !mValueListEntryDict.ContainsKey(type))

1
BeWo/Core/Service/GoalService.cs
View File

@@ -284,6 +284,7 @@ namespace BeWo.Core.Service
public static void RecursiveSynchronousSCValueListEntrySave(SupportConceptGoalTreeItem treeItem) public static void RecursiveSynchronousSCValueListEntrySave(SupportConceptGoalTreeItem treeItem)
{ {
var neuerDC = ServiceFacade.DoValueListServiceSync(s => s.InsertNewValueListEntry(treeItem.GoalEntryVM.CommitToDataContract())); var neuerDC = ServiceFacade.DoValueListServiceSync(s => s.InsertNewValueListEntry(treeItem.GoalEntryVM.CommitToDataContract()));
Cache.GetInstance().AddGoalEntry(neuerDC);
InsertedGoals.Add(neuerDC); InsertedGoals.Add(neuerDC);
treeItem.GoalEntryVM = new ValueListEntryVM(neuerDC); treeItem.GoalEntryVM = new ValueListEntryVM(neuerDC);
treeItem.GoalEntryDC = neuerDC; treeItem.GoalEntryDC = neuerDC;

8
BeWo/LoginControl.xaml.cs
View File

@@ -41,7 +41,7 @@ namespace BeWo
private String GETSERVER_URL = "https://support.bewoplaner.de/api/getserver.php?k={0}&t=1"; private String GETSERVER_URL = "https://support.bewoplaner.de/api/getserver.php?k={0}&t=1";
private String GETSTATUSMESSAGE_URL = "https://support.bewoplaner.de/api/getstate.php?k={0}&t=1"; private String GETSTATUSMESSAGE_URL = "https://support.bewoplaner.de/api/getstate.php?k={0}&t=1&v={1}";
private String GETNETMESSAGE_URL = "https://support.bewoplaner.de/api/getxmlstate.php?k={0}&t=1"; private String GETNETMESSAGE_URL = "https://support.bewoplaner.de/api/getxmlstate.php?k={0}&t=1";
@@ -760,19 +760,19 @@ namespace BeWo
if (!isNet45OrNewer) if (!isNet45OrNewer)
{ {
if (!CheckStatusMessage(profile, String.Format(GETNETMESSAGE_URL, profile.Tenant))) if (!CheckStatusMessage(profile, String.Format(GETNETMESSAGE_URL, profile.Tenant, BeWoApp.Version)))
{ {
return; return;
} }
} }
#if DEBUG #if DEBUG
if (!CheckStatusMessage(profile, String.Format(GETNETMESSAGE_URL, profile.Tenant))) if (!CheckStatusMessage(profile, String.Format(GETSTATUSMESSAGE_URL, profile.Tenant, BeWoApp.ShortVersion)))
{ {
return; return;
} }
#else #else
if (!CheckStatusMessage(profile, String.Format(GETSTATUSMESSAGE_URL, profile.Tenant))) if (!CheckStatusMessage(profile, String.Format(GETSTATUSMESSAGE_URL, profile.Tenant, BeWoApp.Version)))
{ {
return; return;
} }

2
BeWo/View/Detail/Report/FlexibleReportEntryDetail.xaml
View File

@@ -23,7 +23,7 @@
<dxg:GridColumn FieldName="CustomerString" Header="Klient" Width="125" AllowEditing="False" /> <dxg:GridColumn FieldName="CustomerString" Header="Klient" Width="125" AllowEditing="False" />
<dxg:GridColumn FieldName="SupportConceptString" Header="Hilfeplan" Width="130" AllowEditing="False" /> <dxg:GridColumn FieldName="SupportConceptString" Header="Hilfeplan" Width="130" AllowEditing="False" />
<dxg:GridColumn FieldName="Organisation" Header="Kostenträger" Width="125" AllowEditing="False" /> <dxg:GridColumn FieldName="Organisation" Header="Kostenträger" Width="125" AllowEditing="False" />
<dxg:GridColumn x:Name="ColumnDauer" FieldName="IstStunden" Header="Dauer" Width="100" AllowEditing="False"> <dxg:GridColumn x:Name="ColumnDauer" FieldName="IstArbeitszeitStunden" Header="Dauer" Width="100" AllowEditing="False">
<dxg:GridColumn.EditSettings> <dxg:GridColumn.EditSettings>
<dxe:DateEditSettings/> <dxe:DateEditSettings/>
</dxg:GridColumn.EditSettings> </dxg:GridColumn.EditSettings>

28
BeWo/View/Detail/Report/FlexibleReportView.xaml
View File

@@ -52,11 +52,11 @@
<Label Content="Enddatum:" Grid.Column="2" VerticalAlignment="Center" /> <Label Content="Enddatum:" Grid.Column="2" VerticalAlignment="Center" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" /> <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="3" x:Name="datePickerEndDate" HorizontalAlignment="Left" Width="120" Margin="3,0,0,0" />
<Button Content="Aktualisieren" Grid.Column="5" Margin="5,0,0,0" Click="buttonRefresh_Click" /> <Button Content="Aktualisieren" Grid.Column="5" Margin="5,0,0,0" Click="buttonRefresh_Click" />
<Button Content="Feldauswahl anzeigen" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonShowOptions" Click="ButtonShowOptions_Click" /> <Button Content="{markup:Translate Feldauswahl anzeigen}" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonShowOptions" Click="ButtonShowOptions_Click" />
<Button Content="Ansicht speichern" Grid.Column="10" Margin="5,0,0,0" x:Name="ButtonLayoutSave" Click="ButtonLayoutSave_Click" /> <Button Content="{markup:Translate Bericht speichern}" Grid.Column="10" Margin="5,0,0,0" x:Name="ButtonLayoutSave" Click="ButtonLayoutSave_Click" />
<Button Content="Ansicht bearbeiten" Grid.Column="11" Margin="5,0,0,0" x:Name="ButtonLayoutEdit" Click="ButtonLayoutEdit_Click" /> <Button Content="{markup:Translate Bericht bearbeiten}" Grid.Column="11" Margin="5,0,0,0" x:Name="ButtonLayoutEdit" Click="ButtonLayoutEdit_Click" />
<Button Content="Ansicht laden" Grid.Column="12" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" /> <Button Content="{markup:Translate Bericht laden}" Grid.Column="12" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" />
<Button Content="Ansicht drucken" Grid.Column="13" Margin="5,0,0,0" x:Name="ButtonLayoutPrint" Click="ButtonLayoutPrint_Click" /> <Button Content="{markup:Translate Bericht drucken}" Grid.Column="13" Margin="5,0,0,0" x:Name="ButtonLayoutPrint" Click="ButtonLayoutPrint_Click" />
</Grid> </Grid>
<!-- ############################################### Mittlere Zeile ###############################################--> <!-- ############################################### Mittlere Zeile ###############################################-->
<Grid Grid.Row="1"> <Grid Grid.Row="1">
@@ -79,8 +79,8 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!--<CheckBox Content="Reduzierte Ansicht" Margin="5,5,0,0" Grid.Column="4" x:Name="checkReduzierteAnsicht"/>--> <!--<CheckBox Content="Reduzierte Ansicht" Margin="5,5,0,0" Grid.Column="4" x:Name="checkReduzierteAnsicht"/>-->
<CheckBox Content="Differenz Balken einblenden" Grid.Column="7" Margin="5,5,0,0" x:Name="checkBoxDataPer" Checked="CheckDataBarPerChanged" Unchecked="CheckDataBarPerChanged"/> <CheckBox Content="Differenz Balken einblenden" Grid.Column="7" Margin="5,5,0,0" x:Name="checkBoxDataPer" Checked="CheckDataBarPerChanged" Unchecked="CheckDataBarPerChanged" Visibility="Collapsed"/>
<CheckBox Content="Prozentuale Abweichung Balken einblenden" Grid.Column="8" Margin="5,5,0,0" x:Name="checkBoxData" Checked="CheckDataBarChanged" Unchecked="CheckDataBarChanged"/> <CheckBox Content="Prozentuale Abweichung Balken einblenden" Grid.Column="8" Margin="5,5,0,0" x:Name="checkBoxData" Checked="CheckDataBarChanged" Unchecked="CheckDataBarChanged" Visibility="Collapsed"/>
<CheckBox Content="Diagramm einblenden" Grid.Column="9" Margin="5,5,0,0" x:Name="checkBoxChart" Checked="CheckChartChanged" Unchecked="CheckChartChanged"/> <CheckBox Content="Diagramm einblenden" Grid.Column="9" Margin="5,5,0,0" x:Name="checkBoxChart" Checked="CheckChartChanged" Unchecked="CheckChartChanged"/>
</Grid> </Grid>
<!-- ############################################### Untere Zeile ###############################################--> <!-- ############################################### Untere Zeile ###############################################-->
@@ -139,23 +139,23 @@
<dxpg:PivotGridField x:Name="FlexibleLeistung" FieldName="Leistung" Area="FilterArea" Width="200" Caption="Leistung" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleLeistung" FieldName="Leistung" Area="FilterArea" Width="200" Caption="Leistung" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleOrganisation" FieldName="Organisation" Area="FilterArea" Width="200" Caption="Kostenträger" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleOrganisation" FieldName="Organisation" Area="FilterArea" Width="200" Caption="Kostenträger" AllowedAreas="All" DisplayFolder="Zeilen" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitMinIst" FieldName="IstArbeitszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleArbeitszeitMinIst" FieldName="IstArbeitszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitStdIst" FieldName="IstArbeitszeitStunden" Area="DataArea" Width="80" Caption="{markup:Translate Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" /> <dxpg:PivotGridField x:Name="FlexibleArbeitszeitStdIst" FieldName="IstArbeitszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitMinSoll" FieldName="SollArbeitszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Soll Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleArbeitszeitMinSoll" FieldName="SollArbeitszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Soll Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleArbeitszeitStdSoll" FieldName="SollArbeitszeitStunden" Area="DataArea" Width="80" Caption="{markup:Translate Soll Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" /> <dxpg:PivotGridField x:Name="FlexibleArbeitszeitStdSoll" FieldName="SollArbeitszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Soll Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitMinIst" FieldName="IstBetreuungszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleBetreuungszeitMinIst" FieldName="IstBetreuungszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitStdIst" FieldName="IstBetreuungszeitStunden" Area="DataArea" Width="80" Caption="{markup:Translate Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" /> <dxpg:PivotGridField x:Name="FlexibleBetreuungszeitStdIst" FieldName="IstBetreuungszeitStunden" Area="DataArea" Width="80" Caption="{markup:Translate Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitMinSoll" FieldName="SollBetreuungszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Soll Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleBetreuungszeitMinSoll" FieldName="SollBetreuungszeitMinuten" Area="FilterArea" Width="60" Caption="{markup:Translate Soll Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetreuungszeitStdSoll" FieldName="SollBetreuungszeitStunden" Area="DataArea" Width="80" Caption="{markup:Translate Soll Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" /> <dxpg:PivotGridField x:Name="FlexibleBetreuungszeitStdSoll" FieldName="SollBetreuungszeitStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Soll Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" />
<dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer" FieldName="Kilometer" Area="FilterArea" Width="200" Caption="Gefahrene Kilometer" AllowedAreas="All" DisplayFolder="Data" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleGefahreneKilometer" FieldName="Kilometer" Area="FilterArea" Width="200" Caption="Gefahrene Kilometer" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleBetrag" FieldName="Betrag" Area="FilterArea" Width="80" Caption="Betrag" AllowedAreas="All" DisplayFolder="Data" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleBetrag" FieldName="Betrag" Area="FilterArea" Width="80" Caption="Betrag" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleStundensatz" FieldName="Stundensatz" Area="FilterArea" Width="80" Caption="Stundensatz" AllowedAreas="All" DisplayFolder="Data" Visible="True" /> <dxpg:PivotGridField x:Name="FlexibleStundensatz" FieldName="Stundensatz" Area="FilterArea" Width="80" Caption="Stundensatz" AllowedAreas="All" DisplayFolder="Data" Visible="True" />
<dxpg:PivotGridField x:Name="FlexibleRundungspotenzial" FieldName="Rundungspotenzial" Area="FilterArea" Width="80" Caption="Rundungspotenzial" AllowedAreas="All" DisplayFolder="Data" Visible="False" /> <dxpg:PivotGridField x:Name="FlexibleRundungspotenzial" FieldName="Rundungspotenzial" Area="FilterArea" Width="80" Caption="Rundungspotenzial" AllowedAreas="All" DisplayFolder="Data" Visible="False" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzArbeitszeitIstSollMin" FieldName="DifferenzArbeitszeitIstSollMinuten" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" /> <dxpg:PivotGridField x:Name="FlexibleDifferenzArbeitszeitIstSollMin" FieldName="DifferenzArbeitszeitIstSollMinuten" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Arbeitszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzArbeitszeitIstSollStd" FieldName="DifferenzArbeitszeitIstSollStunden" Area="DataArea" Width="80" Caption="{markup:Translate Differenz Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" /> <dxpg:PivotGridField x:Name="FlexibleDifferenzArbeitszeitIstSollStd" FieldName="DifferenzArbeitszeitIstSollStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Arbeitszeit Std.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzBetreuungszeitIstSollMin" FieldName="DifferenzBetreuungszeitIstSollMinuten" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" /> <dxpg:PivotGridField x:Name="FlexibleDifferenzBetreuungszeitIstSollMin" FieldName="DifferenzBetreuungszeitIstSollMinuten" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Betreuungszeit Min.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="FlexibleDifferenzBetreuungszeitIstSollStd" FieldName="DifferenzBetreuungszeitIstSollStunden" Area="DataArea" Width="80" Caption="{markup:Translate Differenz Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" /> <dxpg:PivotGridField x:Name="FlexibleDifferenzBetreuungszeitIstSollStd" FieldName="DifferenzBetreuungszeitIstSollStunden" Area="FilterArea" Width="80" Caption="{markup:Translate Differenz Betreuungszeit Std.}" AllowedAreas="All" DisplayFolder="Data" Visible="True" HideEmptyVariationItems="True" />
<dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichungArbeitszeit" UnboundFieldName="ProzAbweichungArbeitszeit" Area="DataArea" Width="80" Caption="{markup:Translate Prozentual Abweichung Arbeitszeit}" AllowedAreas="All" DisplayFolder="Data"/> <dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichungArbeitszeit" UnboundFieldName="ProzAbweichungArbeitszeit" Area="FilterArea" Width="80" Caption="{markup:Translate Prozentual Abweichung Arbeitszeit}" AllowedAreas="All" DisplayFolder="Data"/>
<dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichungBetreuungszeit" UnboundFieldName="ProzAbweichungBetreuungszeit" Area="DataArea" Width="80" Caption="{markup:Translate Prozentual Abweichung Betreuungszeit}" AllowedAreas="All" DisplayFolder="Data"/> <dxpg:PivotGridField x:Name="UFlexibleProzentualeAbweichungBetreuungszeit" UnboundFieldName="ProzAbweichungBetreuungszeit" Area="FilterArea" Width="80" Caption="{markup:Translate Prozentual Abweichung Betreuungszeit}" AllowedAreas="All" DisplayFolder="Data"/>
</dxpg:PivotGridControl.Fields> </dxpg:PivotGridControl.Fields>
</dxpg:PivotGridControl> </dxpg:PivotGridControl>
</dxlc:LayoutGroup> </dxlc:LayoutGroup>

18
BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
View File

@@ -278,13 +278,13 @@ namespace BeWo.View.Detail.Report
if (string.IsNullOrWhiteSpace(control.LayoutName)) if (string.IsNullOrWhiteSpace(control.LayoutName))
{ {
MessageBox.Show("Fehler beim Hinzufügen des Layouts. Der Name darf nicht leer sein.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation); MessageBox.Show("Fehler beim Hinzufügen des Berichts. Der Name darf nicht leer sein.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return; return;
} }
if (liste.Any(x => x.LayoutName == control.LayoutName)) if (liste.Any(x => x.LayoutName == control.LayoutName))
{ {
MessageBox.Show("Fehler beim Hinzufügen des Layouts. Der Name existiert bereits.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation); MessageBox.Show("Fehler beim Hinzufügen des Berichts. Der Name existiert bereits.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return; return;
} }
@@ -295,7 +295,7 @@ namespace BeWo.View.Detail.Report
}; };
ServiceFacade.DoOperationsServiceAsync(s => s.InsertNewFlexibleReportLayout(layout)); ServiceFacade.DoOperationsServiceAsync(s => s.InsertNewFlexibleReportLayout(layout));
MessageBox.Show("Layout erfolgreich hinzugefügt!", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show("Bericht erfolgreich hinzugefügt!", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
beWoWindow.Close(); beWoWindow.Close();
}; };
@@ -304,7 +304,7 @@ namespace BeWo.View.Detail.Report
beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner; beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
beWoWindow.GroupBoxContent = control; beWoWindow.GroupBoxContent = control;
beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow; beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
beWoWindow.rootGroupBox.Header = "Layout speichern"; beWoWindow.rootGroupBox.Header = "Bericht speichern";
beWoWindow.ShowDialog(); beWoWindow.ShowDialog();
} }
@@ -313,7 +313,7 @@ namespace BeWo.View.Detail.Report
var control = new FlexibleReportLayoutListControl(); var control = new FlexibleReportLayoutListControl();
var beWoWindow = new BeWoWindow var beWoWindow = new BeWoWindow
{ {
rootGroupBox = { Header = "Layout Laden" }, rootGroupBox = { Header = "Bericht Laden" },
Height = 500, Height = 500,
Width = 500, Width = 500,
WindowStartupLocation = WindowStartupLocation.CenterOwner, WindowStartupLocation = WindowStartupLocation.CenterOwner,
@@ -330,7 +330,7 @@ namespace BeWo.View.Detail.Report
{ {
if (control.SelectedLayout == null) if (control.SelectedLayout == null)
{ {
MessageBox.Show("Sie haben keine Layouts angelegt/ausgewählt.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation); MessageBox.Show("Sie haben keine Berichte angelegt/ausgewählt.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return; return;
} }
LayoutString = control.SelectedLayout.LayoutString; LayoutString = control.SelectedLayout.LayoutString;
@@ -343,7 +343,7 @@ namespace BeWo.View.Detail.Report
{ {
if (control.SelectedLayout == null) if (control.SelectedLayout == null)
{ {
MessageBox.Show("Sie haben keine Layouts angelegt/ausgewählt.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation); MessageBox.Show("Sie haben keine Berichte angelegt/ausgewählt.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation);
return; return;
} }
LayoutString = control.SelectedLayout.LayoutString; LayoutString = control.SelectedLayout.LayoutString;
@@ -358,7 +358,7 @@ namespace BeWo.View.Detail.Report
var control = new FlexibleReportLayoutListControl(); var control = new FlexibleReportLayoutListControl();
var beWoWindow = new BeWoWindow var beWoWindow = new BeWoWindow
{ {
rootGroupBox = { Header = "Layout(s) bearbeiten" }, rootGroupBox = { Header = "Berichte bearbeiten" },
Height = 500, Height = 500,
Width = 500, Width = 500,
WindowStartupLocation = WindowStartupLocation.CenterOwner, WindowStartupLocation = WindowStartupLocation.CenterOwner,
@@ -477,7 +477,7 @@ namespace BeWo.View.Detail.Report
WindowStartupLocation = WindowStartupLocation.CenterOwner, WindowStartupLocation = WindowStartupLocation.CenterOwner,
GroupBoxContent = new FlexibleReportEntryDetail(selectedEntries, DocTypes), GroupBoxContent = new FlexibleReportEntryDetail(selectedEntries, DocTypes),
Owner = BeWoApp.CurrentBeWo.MainWindow, Owner = BeWoApp.CurrentBeWo.MainWindow,
rootGroupBox = { Header = "Eintrag Details" } rootGroupBox = { Header = Translator.Translate("Zeiterfassung") }
}; };
beWoWindow.ShowDialog(); beWoWindow.ShowDialog();

5
BeWo/ViewModel/SupportConceptVM.cs
View File

@@ -112,6 +112,10 @@ namespace BeWo.ViewModel
foreach (var category in goalList) foreach (var category in goalList)
{ {
if (category.GoalEntryDC.ValueListEntryOid > 596)
{
int test = 0;
}
var item = new SupportConceptGoalTreeItem var item = new SupportConceptGoalTreeItem
{ {
GoalEntryDC = category.GoalEntryDC, GoalEntryDC = category.GoalEntryDC,
@@ -170,6 +174,7 @@ namespace BeWo.ViewModel
item.PropertyChanged += MassnahmeCheckStatusChanged; item.PropertyChanged += MassnahmeCheckStatusChanged;
if (goal.ParentEntry == null || !goal.ParentEntry.ValueListEntryOid.HasValue || !dictOid2TreeItem.ContainsKey(goal.ParentEntry.ValueListEntryOid.Value)) if (goal.ParentEntry == null || !goal.ParentEntry.ValueListEntryOid.HasValue || !dictOid2TreeItem.ContainsKey(goal.ParentEntry.ValueListEntryOid.Value))
//if (goal. == null || !goal.ParentEntry.ValueListEntryOid.HasValue || !dictOid2TreeItem.ContainsKey(goal.ParentEntry.ValueListEntryOid.Value))
{ {
iGoalList.Add(item); iGoalList.Add(item);
} }

1
Model/Changes_2020_10_15_ServiceRecord Betrag.txt Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE `servicerecord` ADD COLUMN Betrag DECIMAL(18,10) NULL DEFAULT NULL;

10
ReportImp/BeWoWalzPaiva/BeWoWalzPaiva.csproj
View File

@@ -80,6 +80,12 @@
<Compile Include="ServiceInvoiceReport.Designer.cs"> <Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon> <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="SettlementReport2.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport2.Designer.cs">
<DependentUpon>SettlementReport2.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs"> <Compile Include="SettlementReport.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
@@ -107,6 +113,10 @@
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon> <DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="SettlementReport2.resx">
<DependentUpon>SettlementReport2.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx"> <EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon> <DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>

1022
ReportImp/BeWoWalzPaiva/SettlementReport2.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

51
ReportImp/BeWoWalzPaiva/SettlementReport2.cs Normal file
View File

@@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.DataContracts;
namespace BeWoWalzPaiva
{
public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
{
public Spitzabrechnung()
{
InitializeComponent();
}
public void SetReportDataSource(Settlement2RO pRO)
{
bool hasRatefactor = false;
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
}
if (!String.IsNullOrWhiteSpace(pRO.RateFactorText2))
{
hasRatefactor = true;
if (pRO.RateFactorText2 == "1,2")
{
pRO.RateFactorText2 = "1,20";
}
}
if (pRO.InvoiceItems != null)
{
foreach (var ii in pRO.InvoiceItems)
{
ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
ii.PeriodStartDate, ii.PeriodEndDate,
ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ",
ii.AmountPerUnit);
}
}
this.bindingSource1.DataSource = pRO;
}
}
}

808
ReportImp/BeWoWalzPaiva/SettlementReport2.resx Normal file
View File

File diff suppressed because one or more lines are too long

4
ReportImp/SabGmbH/Export/CustomDataExporter.cs
View File

@@ -13,6 +13,10 @@ namespace SabGmbH.Export
public override QueryDC CreateQuery(QueryDC query) public override QueryDC CreateQuery(QueryDC query)
{ {
if (query.Oid == 100)
{
return EGeckoExporter.CreateQuery(query);
}
return LohnExporter.CreateQuery(query); return LohnExporter.CreateQuery(query);
} }
} }

15
ReportImp/SabGmbH/Export/EGeckoExporter.cs
View File

@@ -17,7 +17,7 @@ namespace SabGmbH.Export
DateTime dt = DateTime.Now; DateTime dt = DateTime.Now;
DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt); DateTime.TryParse(query.Parameter[0].Value.ToString(), out dt);
query.FileName = String.Format("Export{0:yyyyMM}.csv", dt); query.FileName = String.Format("Export{0:yyyyMM}.xml", dt);
query.QueryResult = GetAbrechnungenString(dt); query.QueryResult = GetAbrechnungenString(dt);
@@ -93,10 +93,17 @@ namespace SabGmbH.Export
belege.AppendChild(CreateBelegElement(doc, row)); belege.AppendChild(CreateBelegElement(doc, row));
} }
//F,0,050,,BEWO,DA,01012016,012016,iBelegNr1,Belegnr1,220001,,,,999.99, "Name AZ Abrechnung 01/2016 LVR",,,EUR,,,,,,,,,,,R,,, //F,0,050,,BEWO,DA,01012016,012016,iBelegNr1,Belegnr1,220001,,,,999.99, "Name AZ Abrechnung 01/2016 LVR",,,EUR,,,,,,,,,,,R,,,
//G,0,1695,,,-999.99,"Name AZ Abrechnung 01/2016 LVR", //G,0,1695,,,-999.99,"Name AZ Abrechnung 01/2016 LVR",
return doc.OuterXml; String formattedXml = "";
using (var sw = new StringWriter())
{
doc.Save(sw);
formattedXml = sw.ToString();
}
return formattedXml;
} }
private static XmlElement CreateBelegElement(XmlDocument doc, DataRow row) private static XmlElement CreateBelegElement(XmlDocument doc, DataRow row)

6
Service/Plugins/PluginLoader.cs
View File

@@ -122,7 +122,7 @@ namespace BeWo.Service.Plugins
//t = "5430005891"; // Marienhospital Eickel //t = "5430005891"; // Marienhospital Eickel
//t = "3265049248"; // Gerdas Pflegedienst //t = "3265049248"; // Gerdas Pflegedienst
//t = "1549622397"; // Kontakt und Krisenhilfe //t = "1549622397"; // Kontakt und Krisenhilfe
t = "4782194565"; // Skm Rheydt //t = "4782194565"; // Skm Rheydt
//t = "7535795843"; // Sozialwerk Dürener Christen //t = "7535795843"; // Sozialwerk Dürener Christen
//t = "6388340414"; // Weitblick //t = "6388340414"; // Weitblick
//t = "0288588964"; // BeWo Marin //t = "0288588964"; // BeWo Marin
@@ -235,7 +235,7 @@ namespace BeWo.Service.Plugins
//t = "8975059766"; // Quer-Fällt-Ein //t = "8975059766"; // Quer-Fällt-Ein
//t = "8928179244"; // ASB Ruhr e.V. Regionalverband //t = "8928179244"; // ASB Ruhr e.V. Regionalverband
//t = "4423043131"; // Die Perspektive e.V. //t = "4423043131"; // Die Perspektive e.V.
//t = "5263375280"; // LH Wolfsburg t = "5263375280"; // LH Wolfsburg
//t = "4900722829"; // Evangelische Kirchengemeinde Bottrop //t = "4900722829"; // Evangelische Kirchengemeinde Bottrop
//t = "9853685258"; // Input //t = "9853685258"; // Input
//t = "7622428090"; // Freie gemeinnützige Beratungsstelle für Psychotherapie e.V. (BfpDus) (Panama) //t = "7622428090"; // Freie gemeinnützige Beratungsstelle für Psychotherapie e.V. (BfpDus) (Panama)
@@ -246,7 +246,7 @@ namespace BeWo.Service.Plugins
//t = "2547623489"; // Sprungbrett //t = "2547623489"; // Sprungbrett
//t = "5076807716"; // Psychosoziale Hilfen Bochum e.V. //t = "5076807716"; // Psychosoziale Hilfen Bochum e.V.
//t ="1601313225"; // Bella Donna //t ="1601313225"; // Bella Donna
t = "5098825926"; // SAB GmbH //t = "5098825926"; // SAB GmbH
return t; return t;
#else #else