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

cb

Browse Source
This commit is contained in:
Christian
2017-12-15 10:47:43 +01:00
parent 8316409d81
commit 5d82fcfe75
22 changed files with 175 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BeWo/View/Controls/SingleSupportConceptSelectionControl.xaml
View File

@@ -3,7 +3,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localsearch="clr-namespace:BeWo.View.Search"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
mc:Ignorable="d">
<Grid Background="{DynamicResource SupportConceptListBrush}" MouseDown="btnSelectSupportConcept_Click" x:Name="mainGrid">
@@ -38,7 +39,7 @@
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" FontSize="12" x:Name="supportConceptText" Margin="3 2" Text="{Binding SupportConceptName}" VerticalAlignment="Center" Foreground="{Binding NodeForegroundBrush}" />
<TextBlock Grid.Row="2" Grid.ColumnSpan="2" FontSize="12" Foreground="#FFA0A0A0" x:Name="costBearerText" Margin="3 2" Text="{Binding CostBearerName}" VerticalAlignment="Center" />
<Button Grid.Column="2" Grid.RowSpan="3" x:Name="btnSelectSupportConcept"
ToolTip="Hilfeplan auswählen" Tag="{Binding}" Width="26" Height="Auto" Click="btnSelectSupportConcept_Click" Margin="0">
ToolTip="{markup:Translate Hilfeplan auswählen}" Tag="{Binding}" Width="26" Height="Auto" Click="btnSelectSupportConcept_Click" Margin="0">
<Border Grid.RowSpan="2" Margin="0" HorizontalAlignment="Center" VerticalAlignment="Center" >
<Canvas VerticalAlignment="Center" HorizontalAlignment="Center" Width="20" Height="20" Margin="0,0,0,0" >
<Ellipse x:Name="lupe1" Stroke="#FFFFFFFF" Height="14" Width="14" StrokeThickness="2" Fill="{x:Null}" />

1
BeWo/View/Detail/Report/ServicesReportView.xaml.cs
View File

@@ -135,6 +135,7 @@ namespace BeWo.View.Detail.Report
//}
this.combobox_month.SelectedIndex = monthIdx;
var years = new List<int>();
years.Add(DateTime.Now.Year + 1);
for (int i = 0; i <= 10; i++)
{
years.Add(DateTime.Now.Year - i);

13
BeWo/View/Detail/ServiceRecordGroupEditView.xaml.cs
View File

@@ -562,6 +562,19 @@ namespace BeWo.View.Detail
private void UpdateServiceRecordGroup()
{
int newCount = 0;
foreach (var serviceRecordDc in _Group.ServiceRecordList)
{
if (!serviceRecordDc.ServiceRecordOid.HasValue)
{
newCount++;
}
}
if (newCount == _Group.ServiceRecordList.Count)
{
return;
}
var dcsToKeep = new Dictionary<string, ServiceRecordDC>();
var dcsToChange = new List<ServiceRecordDC>();
var oldSCs = new Dictionary<long, CompactSupportConceptDC>();

13
BeWo/View/Master/ReportView.xaml.cs
View File

@@ -115,16 +115,21 @@ namespace BeWo.View.Master
private void Show(TabItem pTi)
{
foreach (var i in this._OpenViews)
{
i.Key.Content = null;
}
foreach (var i in this._OpenViews)
{
if (i.Key == pTi)
{
pTi.Content = this._OpenViews[pTi];
}
else
{
i.Key.Content = null;
}
//else
//{
// i.Key.Content = null;
//}
}
}

5
BeWo/View/Master/SchedulerMasterView.xaml
View File

@@ -35,14 +35,15 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Rectangle Fill="{DynamicResource ResourceContentBrush}" Height="6" />
<Grid x:Name="grid_root" Grid.IsSharedSizeScope="True" Grid.Row="1" Margin="5,3,5,5" Opacity="0" >
<Grid x:Name="grid_root" Grid.IsSharedSizeScope="True" Grid.Row="1" Margin="5,3,5,5" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<localSchedView:NewSchedulerView></localSchedView:NewSchedulerView>
</Grid>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="35" Margin="0,0,0,0" VerticalAlignment="Stretch" Background="#FF000000">
<Border.OpacityMask>

24
BeWo/View/Master/SchedulerMasterView.xaml.cs
View File

@@ -19,21 +19,21 @@ namespace BeWo.View.Master
private void ShowAppointmentScheduler()
{
if (NewSchedulerView != null)
{
return;
}
//if (NewSchedulerView != null)
//{
// return;
//}
NewSchedulerView = Resources["NewSchedulerMain"] as NewSchedulerView;
//NewSchedulerView = Resources["NewSchedulerMain"] as NewSchedulerView;
if (NewSchedulerView == null)
{
return;
}
//if (NewSchedulerView == null)
//{
// return;
//}
grid_root.Children.Add(NewSchedulerView);
var fadein2 = new DoubleAnimation(1, new Duration(TimeSpan.FromSeconds(1)));
grid_root.BeginAnimation(OpacityProperty, fadein2);
//grid_root.Children.Add(NewSchedulerView);
//var fadein2 = new DoubleAnimation(1, new Duration(TimeSpan.FromSeconds(1)));
//grid_root.BeginAnimation(OpacityProperty, fadein2);
}
}
}

6
BeWo/View/Report/Auslastung/AuslastungReportView2.xaml.cs
View File

@@ -61,7 +61,11 @@ namespace BeWo.View.Report.Auslastung
ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
//ThemeManager.SetTheme(docPrevControl, Theme.Office2010Black);
Unloaded += delegate { ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null); docPrevControl.Visibility = Visibility.Collapsed; };
Unloaded += delegate
{
ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null);
//docPrevControl.Visibility = Visibility.Collapsed;
};
}
private void CheckBox_Checked(object sender, RoutedEventArgs e)

6
BeWo/View/Report/Employee/EmployeeHourReportView.xaml.cs
View File

@@ -60,7 +60,11 @@ namespace BeWo.View.Report.Employee
ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
//ThemeManager.SetTheme(docPrevControl, Theme.Office2010Black);
Unloaded += delegate { ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null); docPrevControl.Visibility = Visibility.Collapsed; };
Unloaded += delegate
{
ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, null);
//docPrevControl.Visibility = Visibility.Collapsed;
};
}
private void CheckBox_Checked(object sender, RoutedEventArgs e)

60
BeWo/ownChat/ChatDokumentationsView.xaml.cs
View File

@@ -264,38 +264,44 @@ namespace BeWo.ownChat
{
foreach (var cus in _compactCustomer)
{
var dcs = new ServiceRecordDC();
dcs.Start = firstTime;
dcs.End = lastTime;
dcs.Employee = emp;
dcs.Customer = cus;
dcs.SupportConcept = HoleHilfeplanAusListe(scList, cus, firstTime, lastTime);
dcs.GroupEmployeeCount = _compactEmployee.Count;
dcs.GroupPersonCount = _compactCustomer.Count;
if (BeWoApp.AppSettings.IsEndDateVisible)
var sc = HoleHilfeplanAusListe(scList, cus, firstTime, lastTime);
if (sc != null)
{
dcs.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitEndDatum;
}
else if (BeWoApp.AppSettings.IsOnlyYearMonthVisible)
{
dcs.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitMonatJahr;
}
else
{
dcs.ServiceRecordFormat = ServiceRecordFormate.OriginaleZeiterfassung;
}
var dcs = new ServiceRecordDC();
dcs.Start = firstTime;
dcs.End = lastTime;
dcs.Employee = emp;
dcs.Customer = cus;
dcs.SupportConcept =
HoleHilfeplanAusListe(scList, cus, firstTime, lastTime);
dcs.GroupEmployeeCount = _compactEmployee.Count;
dcs.GroupPersonCount = _compactCustomer.Count;
dcs.DurationInStunden = ZeiterfassungsDauer.Minuten;
if (BeWoApp.AppSettings.IsEndDateVisible)
{
dcs.ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitEndDatum;
}
else if (BeWoApp.AppSettings.IsOnlyYearMonthVisible)
{
dcs.ServiceRecordFormat =
ServiceRecordFormate.ZeiterfassungMitMonatJahr;
}
else
{
dcs.ServiceRecordFormat = ServiceRecordFormate.OriginaleZeiterfassung;
}
dcs.DurationInStunden = ZeiterfassungsDauer.Minuten;
if (dcs.SupportConcept.CostBearerList != null &&
dcs.SupportConcept.CostBearerList.Count > 0)
{
dcs.CostBearer = dcs.SupportConcept.CostBearerList[0].Organisation;
}
if (dcs.SupportConcept.CostBearerList != null &&
dcs.SupportConcept.CostBearerList.Count > 0)
{
dcs.CostBearer = dcs.SupportConcept.CostBearerList[0].Organisation;
}
ServiceListRecordDC.Add(dcs);
ServiceListRecordDC.Add(dcs);
}
}
}

12
BeWo/ownChat/ChatServiceCustomer.xaml.cs
View File

@@ -368,7 +368,7 @@ namespace BeWo.ownChat
var pwStaerke = BeWoUtils.CheckPasswordSecurity(TXTPasswort.Text);
if (BeWoApp.AppSettings.IsPasswordSecurityActiv && (pwStaerke == PasswortSecurityStrength.SehrSchwach || pwStaerke == PasswortSecurityStrength.Schwach))
{
string failure = "Das Passwort ist zu schwach!";
string failure = "Das Passwort ist zu schwach! Das Passwort sollte mindestens 8 Zeichen lang sein und Sonderzeichen, Ziffern oder Großbuchstaben enthalten.";
MessageBox.Show(failure, "Erstellen des Passworts fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
@@ -384,9 +384,11 @@ namespace BeWo.ownChat
s.SetBenutzerPasswortChatAppCode(customerOid.Value, TXTBenutzerName.Text,
TXTPasswort.Text));
EndWaiting();
BeWoUtils.OwnChatSynchronisationVeranlassen();
MessageBox.Show("Benutzername und Passwort wurden erfolgreich gespeichert.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
BeWoUtils.OwnChatSynchronisationVeranlassen();
}
else
@@ -409,7 +411,13 @@ namespace BeWo.ownChat
StartWaiting();
List<string> parameter = new List<string>();
#if DEBUG
parameter.Add("5473568546");
#else
parameter.Add(BeWoApp.Tenant);
#endif
parameter.Add(BeWoApp.Mandator.Apikey);
parameter.Add(TXTBenutzerName.Text);

4
BeWo/ownChat/ChatView.xaml.cs
View File

@@ -182,7 +182,7 @@ namespace BeWo.ownChat
}
else
{
MessageBox.Show("Sie haben diesen Klienten nicht in Ihrer Liste.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
MessageBox.Show("Der/die ausgewählte Klient/in wurde nicht gefunden.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
}
}
else
@@ -192,7 +192,7 @@ namespace BeWo.ownChat
}
else
{
MessageBox.Show("Es kann nur im Chat der Klienten dokumentiert werden.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
MessageBox.Show("Es können nur Nachrichten von KlientInnen dokumentiert werden.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
}
}

9
Data/Access/SearchDAO.cs
View File

@@ -615,6 +615,15 @@ namespace BeWo.Data.Access
return null;
}
public IList<Customer> FindCustomersWithPersonOids(IEnumerable<long> pPersonOid)
{
return CreateCriteriaIsActive<Customer>()
.CreateAlias(Customer.PropertyName_Person, "p", JoinType.InnerJoin)
.Add(Restrictions.In("p." + BeWoEntityBase.PropertyName_Oid, pPersonOid.ToArray()))
.List<Customer>();
}
public IList<Person> GetActivePersonsWithType(PersonType type)
{
return CreateCriteriaIsActive<Person>()

1
Report/ReportObjects/ServicesOverviewRO.cs
View File

@@ -501,7 +501,6 @@ namespace BeWo.Report.ReportObjects
var cb2scDC = cb2sc.MapToNewDC();
if (cb2sc.CostBearer != null)
{

1
ReportImp/ApiBerlin/Translation/TranslationDictionary.cs
View File

@@ -46,6 +46,7 @@ namespace ApiBerlin.Translation
AddOrReplaceTranslation(dict, "Weiteren Kostenträger hinzufügen", "Weitere Kostenübernahme hinzufügen");
AddOrReplaceTranslation(dict, "<Kein Hilfeplan ausgewählt>", "<Keine Bewilligung ausgewählt>");
return dict;

1
ReportImp/BeWoRichartz/Properties/licenses.licx
View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

54
ReportImp/BeWoRichartz/ServicesOverviewReport.Designer.cs generated
View File

@@ -45,14 +45,13 @@ namespace BeWoRichartz
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.lblFLSPerWeek = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
@@ -82,6 +81,7 @@ namespace BeWoRichartz
this.customerCountField = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -255,17 +255,10 @@ namespace BeWoRichartz
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.20996435548972622D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
@@ -276,7 +269,7 @@ namespace BeWoRichartz
this.xrLabel21,
this.xrLabel20,
this.xrLabel18,
this.xrLabel19,
this.lblFLSPerWeek,
this.xrLabel16,
this.xrLabel17,
this.xrLabel15,
@@ -333,18 +326,16 @@ namespace BeWoRichartz
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.Text = "FLS wöchentl.:";
//
// xrLabel19
// lblFLSPerWeek
//
this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.00}")});
this.xrLabel19.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(466.0001F, 164.2709F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(102.0417F, 18F);
this.xrLabel19.StylePriority.UseBorders = false;
this.xrLabel19.StylePriority.UseFont = false;
this.lblFLSPerWeek.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblFLSPerWeek.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.lblFLSPerWeek.LocationFloat = new DevExpress.Utils.PointFloat(466.0001F, 164.2709F);
this.lblFLSPerWeek.Name = "lblFLSPerWeek";
this.lblFLSPerWeek.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblFLSPerWeek.SizeF = new System.Drawing.SizeF(102.0417F, 18F);
this.lblFLSPerWeek.StylePriority.UseBorders = false;
this.lblFLSPerWeek.StylePriority.UseFont = false;
//
// xrLabel16
//
@@ -468,9 +459,6 @@ namespace BeWoRichartz
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
@@ -478,9 +466,6 @@ namespace BeWoRichartz
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
@@ -488,9 +473,6 @@ namespace BeWoRichartz
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
@@ -552,7 +534,7 @@ namespace BeWoRichartz
// lblFlsRateFactorTotal
//
this.lblFlsRateFactorTotal.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblFlsRateFactorTotal.BorderWidth = 1;
this.lblFlsRateFactorTotal.BorderWidth = 1F;
this.lblFlsRateFactorTotal.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.lblFlsRateFactorTotal.LocationFloat = new DevExpress.Utils.PointFloat(364.9994F, 47.29169F);
this.lblFlsRateFactorTotal.Multiline = true;
@@ -596,7 +578,7 @@ namespace BeWoRichartz
// lblFlsGesamt
//
this.lblFlsGesamt.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.lblFlsGesamt.BorderWidth = 1;
this.lblFlsGesamt.BorderWidth = 1F;
this.lblFlsGesamt.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.lblFlsGesamt.LocationFloat = new DevExpress.Utils.PointFloat(364.9994F, 22F);
this.lblFlsGesamt.Name = "lblFlsGesamt";
@@ -661,6 +643,10 @@ namespace BeWoRichartz
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -688,7 +674,7 @@ namespace BeWoRichartz
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.SnapGridSize = 9F;
this.Version = "13.1";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -741,7 +727,7 @@ namespace BeWoRichartz
private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS;
private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel lblFLSPerWeek;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;

20
ReportImp/BeWoRichartz/ServicesOverviewReport.cs
View File

@@ -41,8 +41,28 @@ namespace BeWoRichartz
lblFlsGesamt.Text = String.Format("{0:0.##}", pRO.TotalFLMBillable/60);
lblFlsRateFactorTotal.Text = String.Format("{0:0.##}", (pRO.TotalFLMBillable/60)*1.2);
}
if (IstBewilligt(pRO))
{
lblFLSPerWeek.Text = String.Format("{0:0.00}", pRO.ApprovedFLSPerWeek);
}
else
{
lblFLSPerWeek.Text = "";
}
bindingSource1.DataSource = pRO;
}
private bool IstBewilligt(ServicesOverviewRO pRo)
{
if (pRo.CostBearer2SupportConceptList.Count > 0)
{
if (pRo.CostBearer2SupportConceptList[0].ApprovedStartDate.HasValue)
{
return true;
}
}
return false;
}
}
}

4
Service/Plugins/PluginLoader.cs
View File

@@ -102,7 +102,7 @@ namespace BeWo.Service.Plugins
//t = "4690407894"; // Bleib im Leben
//t = "2576513996"; // TRIAS
//t = "2509786400"; // LH Stade
//t = "8677523325"; // BeWo Richartz
t = "8677523325"; // BeWo Richartz
//t = "1765854593"; // Mein Betreutes Wohnen
//t = "6802909544"; // Lebenshilfe Coburg
//t = "9417634361"; // Synprax
@@ -163,7 +163,7 @@ namespace BeWo.Service.Plugins
//t = "7803602698"; // Taubblindendienst
//t = "5518600303"; //Wetterleuchten e.V.
//t = "4096649015"; // AWO Dortmund
t = "3614251071"; // Pusteblume
//t = "3614251071"; // Pusteblume
return t;
#else
if (MultitenancyOperationContextExt.Current != null)

6
Service/ServiceContracts/ICustomerService.cs
View File

@@ -445,7 +445,11 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
List<CompactCustomerDC> GetCompactCustomersById(IEnumerable<long> pCustomerOids);
[FaultContract(typeof(BeWoFault))]
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactCustomerDC> GetCompactCustomersByPersonOids(IEnumerable<long> personOids);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<ValueListEntryDC> GetSupportConceptGoalParents(IEnumerable<long> pParentItemOids);

19
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -2297,7 +2297,24 @@ namespace BeWo.Service.ServiceImplementations
}
}
public List<ValueListEntryDC> GetSupportConceptGoalParents(IEnumerable<long> pParentItemOids)
public List<CompactCustomerDC> GetCompactCustomersByPersonOids(IEnumerable<long> personOids)
{
try
{
var result = new List<CompactCustomerDC>();
var customers = DAOFactory.SearchDAO.FindCustomersWithPersonOids(personOids);
result.AddRange(MapperFactory.CompactCustomerDC_Customer.MapToNewDCs(customers));
return result;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public List<ValueListEntryDC> GetSupportConceptGoalParents(IEnumerable<long> pParentItemOids)
{
try
{

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

@@ -1,6 +1,7 @@
using System;
using System.ComponentModel;
using System.Windows.Media;
using BS.Shared.Translation;
namespace BS.Shared.DataContracts
{
@@ -40,7 +41,7 @@ namespace BS.Shared.DataContracts
{
if (this.SupportConceptTreeNodeDC == null)
{
return "<Kein Hilfeplan ausgewählt>";
return Translator.Translate("<Kein Hilfeplan ausgewählt>");
}
if (this.SupportConceptTreeNodeDC.Customer != null)

2
Shared/Translation/Translator.cs
View File

@@ -48,7 +48,7 @@ namespace BS.Shared.Translation
//}
////return input;
//return "TRANSLATED";
// return "TRANSLATED";
if (instance != null)
{