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

cb bugfixing

Browse Source
This commit is contained in:
Christian
2020-09-02 18:19:15 +02:00
parent c68f7f8fdc
commit b5f5554dcf
7 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -459,3 +459,7 @@
/ReportImp/RosegGmbH/obj/Release
/ReportImp/VkmHamm2/obj/Debug
/ReportImp/VkmHamm2/obj/Release
/ReportImp/BellaDonna/obj/Debug
/ReportImp/BellaDonna/obj/Release
/ReportImp/PsychosozialeHilfenBochum/obj/Debug
/ReportImp/PsychosozialeHilfenBochum/obj/Release

4
BeWo/View/Detail/Report/SupportConceptsAnalysisView.xaml.cs
View File

@@ -203,11 +203,11 @@ namespace BeWo.View.Detail.Report
long? eOid = null;
long? tOid = null;
if (_SelectedEmployee != null && checkbox_allEmployees.IsChecked == false)
if (_SelectedEmployee != null && checkbox_allEmployees.IsChecked == false && radioEmployeeReport.IsChecked.HasValue && radioEmployeeReport.IsChecked.Value)
{
eOid = _SelectedEmployee.EmployeeOid;
}
if (_SelectedTeam != null && checkbox_all_teams.IsChecked == false)
if (_SelectedTeam != null && checkbox_all_teams.IsChecked == false && radioTeamReport.IsChecked.HasValue && radioTeamReport.IsChecked.Value)
{
tOid = _SelectedTeam.TeamOid;
}

2
Data/Access/SearchDAO.cs
View File

@@ -2343,7 +2343,7 @@ namespace BeWo.Data.Access
.Add(Restrictions.Eq("EmployeeOid", employeeOid))
.Add(Restrictions.And(Restrictions.Lt(SchedulerAppointment.PropertyName_StartDate, end),
Restrictions.Ge(SchedulerAppointment.PropertyName_EndDate, start)))
.UniqueResult<Timesheet>();
.List<Timesheet>().FirstOrDefault();
}
public IList<Timesheet2Mail> FindTimeSheetMails(long timesheetOid, long employeeOid)

2
Data/Data.csproj
View File

@@ -625,7 +625,7 @@
<EmbeddedResource Include="Mappings\RatingType.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<Content Include="Mappings\Timesheet2Mail.hbm.xml" />
<EmbeddedResource Include="Mappings\Timesheet2Mail.hbm.xml" />
<EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>

20
Report/DefaultReports/Finanzauswertung.designer.cs generated
View File

@@ -98,8 +98,6 @@ namespace BeWo.Report.DefaultReports
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.TESTPARAMTER = new DevExpress.XtraReports.Parameters.Parameter();
this.parameter1 = new DevExpress.XtraReports.Parameters.Parameter();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -708,19 +706,6 @@ namespace BeWo.Report.DefaultReports
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// TESTPARAMTER
//
this.TESTPARAMTER.Description = "zrdz";
this.TESTPARAMTER.Name = "TESTPARAMTER";
this.TESTPARAMTER.ValueInfo = "blabla standard";
//
// parameter1
//
this.parameter1.Description = "Parameter1";
this.parameter1.Name = "parameter1";
this.parameter1.Type = typeof(bool);
this.parameter1.ValueInfo = "False";
//
// Finanzauswertung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -737,9 +722,6 @@ namespace BeWo.Report.DefaultReports
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Parameters.AddRange(new DevExpress.XtraReports.Parameters.Parameter[] {
this.TESTPARAMTER,
this.parameter1});
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
@@ -797,8 +779,6 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImBereich;
private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader;
private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader;
private DevExpress.XtraReports.Parameters.Parameter TESTPARAMTER;
private DevExpress.XtraReports.Parameters.Parameter parameter1;
private DevExpress.XtraReports.UI.XRTableCell cellRateFactorHeader;
private DevExpress.XtraReports.UI.XRTableCell cellRateFactor;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;

5
Service/Plugins/PluginLoader.cs
View File

@@ -85,7 +85,7 @@ namespace BeWo.Service.Plugins
//t = "4867997795"; // ADiK Kleve
//t = "3184859776"; // Sergej Becker
//t = "7752610643"; // BWK Gbr
t = "3785623125"; // Betreuwo
//t = "3785623125"; // Betreuwo
//t = "7130228334"; // LH Borken
//t = "4209820830"; // VKM Hamm
//t = "5700328131"; // Betreutes Wohnen St. Ludgerus Essen-Werden
@@ -243,6 +243,9 @@ namespace BeWo.Service.Plugins
//t = "6916712798"; // LH Rodenkirchen Bewo
//t = "6255521162"; // KCM GmbH
//t = "2697528233"; // Diakonisches Werk Wesel
//t = "2547623489"; // Sprungbrett
//t = "5076807716"; // Psychosoziale Hilfen Bochum e.V.
t ="1601313225"; // Bella Donna
return t;
#else

2
Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs
View File

@@ -53,7 +53,7 @@ namespace BS.Shared.DataContracts.Compact
{
get
{
string lResult = this.FirstName + " " + this.LastName + " " + CustomerAlias + " ";
string lResult = this.FirstName + " " + this.LastName + " " + CustomerAlias + " " + AddressString + " " + MainAttendant;
if (this.CostBearerReferenceNumbers != null)
{
lResult += string.Join(" ", this.CostBearerReferenceNumbers.Values.ToArray());