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

PSM Quittierungsbeleg nochmal eingecheckt. Hat wohl beim letzten mal nicht richtig funktioniert.

Browse Source
This commit is contained in:
Lyndon Jetten
2023-12-12 16:27:13 +01:00
parent bf2411b5a3
commit 33dbb85d5a
7 changed files with 946 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -5096,6 +5096,9 @@
<ItemGroup>
<Content Include="Views\Report\QuittierungsbelegsPreviewPartial.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Customer\CustomerBetreuungPartial.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

2
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -3954,7 +3954,7 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public string ProvokeJsonError()
{
return "<!DOCTYPE html>\r\n<html lang=\"en\">\r\n <head>\r\n <meta charset=\"UTF-8\">\r\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\r\n <meta http-equiv=\"X-UA-Compatible\" content=\"ie=edge\">\r\n <title>HTML 5 Boilerplate</title>\r\n <link rel=\"stylesheet\" href=\"style.css\">\r\n </head>\r\n <body>\r\n\t<script src=\"index.js\"></script>\r\n </body>\r\n</html>";
return "lkasdjf lkjasdlkf jjasldfljk ajksldf ";
}
}

1
BeWoPlanerMobil/Controllers/ReportController.cs
View File

@@ -1280,7 +1280,6 @@ namespace BeWoPlanerMobil.Controllers
private string CreateFileName()
{
// Quittierungsbeleg_AlleKlienten_Jetten-Lyndon_LWL_Oktober-01-15-2023.pdf
var fileName = "Quittierungsbeleg_";
var selectedFilter = Model.SelectedFilterItem.FilterEnum;

2
BeWoPlanerMobil/Models/AbstractModel.cs
View File

@@ -208,5 +208,7 @@ namespace BeWoPlanerMobil.Models
public static bool HasRightToViewCustomerAbsenceTimes => CheckRight(UserRightType.Customer_ViewAbsenceTimes);
public static bool HasRightToProvideEmployeeSignatureForOthers => CheckRight(UserRightType.Signature_ProvideMonthlySignatureByProxy);
public static bool HasRightToViewBetreuung => CheckRight(UserRightType.Customer_ViewBetreuung);
}
}

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

File diff suppressed because it is too large Load Diff

125
BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml Normal file
View File

@@ -0,0 +1,125 @@
@using BeWoPlanerMobil.Models;
@model CustomerModel
@{
var hasRelatedEmployees = Model.SelectedCustomer?.RelatedEmployees.Any() ?? false;
var hasRelatedTeams = Model.SelectedCustomer?.RelatedTeams.Any() ?? false;
}
@*
flex: 1 0 0%;
margin-right: 15px;
margin-bottom: 0;
margin-left: 15px;
*@
<style type="text/css">
.card-deck-test .card {
margin-bottom: 15px;
}
@@media (min-width: 576px) {
.card-deck-test {
display: flex;
flex-flow: row wrap;
margin-right: -15px;
margin-left: -15px;
}
.card-deck-test .card {
flex: 1 0 0%;
margin-right: 15px;
margin-bottom: 0;
margin-left: 15px;
}
}
</style>
@if(hasRelatedEmployees && Model.SelectedCustomer != null)
{
<h5>Betreuung</h5>
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4">
@foreach(var relation in Model.SelectedCustomer.RelatedEmployees)
{
var start = relation.StartDate.HasValue ? $"{relation.StartDate.Value:dd.MM.yyyy}" : "";
var end = relation.EndDate.HasValue ? $"{relation.EndDate.Value:dd.MM.yyyy}" : "";
<div class="col mb-3">
<div class="card">
<div class="card-body">
<div class="row mb-3">
<div class="col text-secondary">
Betreuer
</div>
<div class="col">
@relation.Employee
</div>
</div>
<div class="row mb-3">
<div class="col text-secondary">
Rolle
</div>
<div class="col">
@relation.RelationRole.DisplayName
</div>
</div>
@if(!string.IsNullOrWhiteSpace(start))
{
<div class="row mb-3">
<div class="col text-secondary">
Startdatum
</div>
<div class="col">
@start
</div>
</div>
}
@if(!string.IsNullOrWhiteSpace(end))
{
<div class="row mb-3">
<div class="col text-secondary">
Enddatum
</div>
<div class="col">
@end
</div>
</div>
}
@if(!string.IsNullOrWhiteSpace(relation.Notice))
{
<div class="row mb-3">
<div class="col text-secondary">
Erläuterung
</div>
<div class="col">
@relation.Notice
</div>
</div>
}
</div>
</div>
</div>
}
</div>
}
@*Teams*@
@if(hasRelatedTeams && Model.SelectedCustomer != null)
{
<h5>Teams</h5>
foreach(var teamRelation in Model.SelectedCustomer.RelatedTeams)
{
<div class="row">
<div class="row mb-3">
<div class="col text-secondary">
Team
</div>
<div class="col">
@teamRelation.Team.Name
</div>
</div>
</div>
}
}

16
ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs generated
View File

@@ -64,6 +64,7 @@ namespace PSM
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableCell49 = 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.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -126,13 +127,12 @@ namespace PSM
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -582,6 +582,10 @@ namespace PSM
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell49.Weight = 0.44692737430167606D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -998,7 +1002,7 @@ namespace PSM
//
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(188.69F, 235.3333F);
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(188.69F, 235.3331F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
@@ -1364,10 +1368,6 @@ namespace PSM
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1394,10 +1394,10 @@ namespace PSM
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}