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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Alexandra
2024-04-15 16:02:01 +02:00
parent 79b9f08c24 d91daa1bc0
commit cf8279df5e
11 changed files with 87 additions and 10766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BeWo/View/HomeView.xaml.cs
View File

@@ -518,6 +518,22 @@ namespace BeWo.View
#if DEBUG
var loginControl = new ChatController.LoginControl();
var loginWindow = new Window
{
WindowStartupLocation = WindowStartupLocation.CenterScreen,
ResizeMode = ResizeMode.NoResize,
Title = "",
Height = 500,
Width = 700
};
var grid = new Grid();
grid.AddChild(loginControl);
loginWindow.Content = grid;
loginWindow.Show();
// ToDo: LoginControl dazwischen setzen im Debug-Modus
#else
var x1 = _login.AnmeldevorgangDurchFuehren();

4
BeWoPlanerMobil/Views/Customer/Customer.cshtml
View File

@@ -883,8 +883,8 @@
var isAllowedToViewBargeldkassen = AbstractModel.HasRightToViewAllCustomersBargeldkassen || (isRelatedCustomer && AbstractModel.HasRightToViewOwnCustomersBargeldkassen);
@* Bargeldverwaltung TODO: NOCH NICHT FERTIG! *@
if(Html.IsInDebugMode() && isAllowedToViewBargeldkassen)
@* Bargeldverwaltung *@
if(isAllowedToViewBargeldkassen)
{
@* ----- Bargeldverwaltung ----- *@
<div class="col-12 my-3">

2
BeWoPlanerMobil/Views/Customer/CustomerReportPartial.cshtml
View File

@@ -34,7 +34,7 @@
settings.Name = "customerReportViewer";
settings.Width = Unit.Percentage(100);
settings.Height = Unit.Percentage(100);
settings.MobileMode = true;// !Html.IsInDebugMode();
settings.MobileMode = true;
settings.SettingsMobile.ReaderMode = true;
settings.ClientSideEvents.Init = "customerReportViewerInit";
}).Bind(Model.Report).GetHtml()

2
ReportImp/KollegiumEv/KollegiumEv.csproj
View File

@@ -31,6 +31,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -39,6 +40,7 @@
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

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

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

53
ReportImp/KollegiumEv/RechnungAssistenzstunden.Designer.cs generated
View File

@@ -31,6 +31,7 @@ namespace KollegiumEv
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RechnungAssistenzstunden));
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
@@ -74,17 +75,17 @@ namespace KollegiumEv
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -170,7 +171,7 @@ namespace KollegiumEv
//
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Times New Roman", 11F);
this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0.006612142F, 210F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -180,7 +181,7 @@ namespace KollegiumEv
//
// xrLabel16
//
this.xrLabel16.Font = new System.Drawing.Font("Times New Roman", 11F);
this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0.006612142F, 235F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -212,7 +213,7 @@ namespace KollegiumEv
//
// xrLabel19
//
this.xrLabel19.Font = new System.Drawing.Font("Times New Roman", 11F);
this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0.006612142F, 260F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -222,7 +223,7 @@ namespace KollegiumEv
//
// lblKostenzusage
//
this.lblKostenzusage.Font = new System.Drawing.Font("Times New Roman", 13F, System.Drawing.FontStyle.Bold);
this.lblKostenzusage.Font = new DevExpress.Drawing.DXFont("Times New Roman", 13F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblKostenzusage.LocationFloat = new DevExpress.Utils.PointFloat(0.006612142F, 310.4583F);
this.lblKostenzusage.Multiline = true;
this.lblKostenzusage.Name = "lblKostenzusage";
@@ -293,7 +294,7 @@ namespace KollegiumEv
//
// xrLabel12
//
this.xrLabel12.Font = new System.Drawing.Font("Times New Roman", 11F);
this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Times New Roman", 11F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 185F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -303,7 +304,8 @@ namespace KollegiumEv
//
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(498.9166F, 41.06F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
@@ -316,7 +318,8 @@ namespace KollegiumEv
//
// xrLabel7
//
this.xrLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(498.9166F, 86.78919F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
@@ -329,7 +332,8 @@ namespace KollegiumEv
//
// xrLabel8
//
this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(573.7706F, 86.78919F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
@@ -342,7 +346,8 @@ namespace KollegiumEv
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(498.9202F, 24.06F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -392,7 +397,7 @@ namespace KollegiumEv
//
this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable6});
this.Detail3.Font = new System.Drawing.Font("Times New Roman", 13F);
this.Detail3.Font = new DevExpress.Drawing.DXFont("Times New Roman", 13F);
this.Detail3.HeightF = 25F;
this.Detail3.Name = "Detail3";
this.Detail3.StylePriority.UseFont = false;
@@ -422,7 +427,7 @@ namespace KollegiumEv
this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart", "{0:MMMM yyyy}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription", "{0:MMMM yyyy}")});
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell40.StylePriority.UseBorderColor = false;
@@ -484,7 +489,7 @@ namespace KollegiumEv
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.GroupFooter1.Font = new System.Drawing.Font("Times New Roman", 13F);
this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 13F);
this.GroupFooter1.HeightF = 50F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
@@ -575,10 +580,6 @@ namespace KollegiumEv
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell4.Weight = 0.53175768793474365D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -613,12 +614,16 @@ namespace KollegiumEv
//
// xrPictureBox1
//
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(485.375F, 0F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(182.6248F, 148.6458F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// RechnungAssistenzstunden
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -631,19 +636,21 @@ namespace KollegiumEv
this.ReportHeader});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.Font = new System.Drawing.Font("Times New Roman", 12F);
this.Font = new DevExpress.Drawing.DXFont("Times New Roman", 12F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 74, 30, 80);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 74F, 30F, 80F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

13
ReportImp/KollegiumEv/RechnungAssistenzstunden.cs
View File

@@ -24,7 +24,18 @@ namespace KollegiumEv
{
pRO.CustomerSalutation = "Herrn";
}
foreach (var sip in pRO.ServiceInvoicePeriods)
{
foreach (var item in sip.ServiceInvoiceItems)
{
if (item.RateFactor != null && !item.RateFactor.Contains("%"))
item.ServiceDescription = string.Format("{0:dd.MM.yyyy} (Fehlkontakte)", item.AccountingPeriodStart);
else
item.ServiceDescription = string.Format("{0:dd.MM.yyyy}", item.AccountingPeriodStart);
}
}
//if (start.Month == end.Month && start.Year == end.Year)
//{
// lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);

10739
ReportImp/KollegiumEv/RechnungAssistenzstunden.resx
View File

File diff suppressed because one or more lines are too long

9
ReportImp/KollegiumEv/RechnungFls.cs
View File

@@ -20,6 +20,15 @@ namespace KollegiumEv
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
foreach (var sip in pRO.ServiceInvoicePeriods)
{
foreach (var item in sip.ServiceInvoiceItems)
{
if (item.RateFactor != null && !item.RateFactor.Contains("%"))
item.ServiceDescription += " (Fehlkontakte)";
}
}
if (pRO.CustomerSalutation == "Herr")
{
pRO.CustomerSalutation = "Herrn";

7
ReportImp/PflegedienstWessel/Invoicing/CustomInvoiceCreation.cs
View File

@@ -194,7 +194,12 @@ namespace PflegedienstWessel.Invoicing
var cat = DAOFactory.SearchDAO.FindServiceCategoryByName(catName);
if (cat != null)
{
var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
List<CostRatePeriodDC> crps = new List<CostRatePeriodDC>();
if (iServiceRecord.ServiceDescription.CostRatePeriods.Count == 0)
crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
else
crps = iServiceRecord.ServiceDescription.CostRatePeriods;
var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, start);
if (cp != null && cp.CostRateValue.HasValue)
preisLeistung = (decimal)cp.CostRateValue;

7
ReportImp/PflegedienstWessel/Invoicing/CustomPersBudget24InvoiceCreation.cs
View File

@@ -47,7 +47,12 @@ namespace PflegedienstWessel.Invoicing
var cat = DAOFactory.SearchDAO.FindServiceCategoryByName(catName);
if (cat != null)
{
var crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
List<CostRatePeriodDC> crps = new List<CostRatePeriodDC>();
if (iServiceRecord.ServiceDescription.CostRatePeriods.Count == 0)
crps = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cat.CostRatePeriods);
else
crps = iServiceRecord.ServiceDescription.CostRatePeriods;
var cp = crps.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, start);
if (cp != null && cp.CostRateValue.HasValue)
preisAssistenz = (decimal)cp.CostRateValue;