diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index f21cb4db4..ad17b02a3 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -5096,6 +5096,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 8c1d3da42..bbfc7fb77 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -3954,7 +3954,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string ProvokeJsonError() { - return "\r\n\r\n \r\n \r\n \r\n \r\n HTML 5 Boilerplate\r\n \r\n \r\n \r\n\t\r\n \r\n"; + return "lkasdjf lkjasdlkf jjasldfljk ajksldf "; } } diff --git a/BeWoPlanerMobil/Controllers/ReportController.cs b/BeWoPlanerMobil/Controllers/ReportController.cs index 8b694313c..b5503d423 100644 --- a/BeWoPlanerMobil/Controllers/ReportController.cs +++ b/BeWoPlanerMobil/Controllers/ReportController.cs @@ -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; diff --git a/BeWoPlanerMobil/Models/AbstractModel.cs b/BeWoPlanerMobil/Models/AbstractModel.cs index a2d77034a..dc1e57a9b 100644 --- a/BeWoPlanerMobil/Models/AbstractModel.cs +++ b/BeWoPlanerMobil/Models/AbstractModel.cs @@ -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); } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Customer/Customer.cshtml b/BeWoPlanerMobil/Views/Customer/Customer.cshtml index 57ae27d73..6e6033a0f 100644 --- a/BeWoPlanerMobil/Views/Customer/Customer.cshtml +++ b/BeWoPlanerMobil/Views/Customer/Customer.cshtml @@ -180,854 +180,885 @@ { var inputDisabled = !AbstractModel.HasRightToEditCustomers ? "disabled" : string.Empty; -
-
-
-
-
- Eigenschaften +
+
+
+
+
+ Eigenschaften +
+
+
+
+
+
+ Vorname +
+
+ +
+ Dieses Feld darf nicht leer sein! +
-
-
-
-
-
- Vorname -
-
- -
- Dieses Feld darf nicht leer sein! -
+
+
+
+
+
+
+
+ Nachname +
+
+ +
+ Dieses Feld darf nicht leer sein! +
+
+
+
+
+
+
+
+
+ Geburtstag +
+
+ +
+
+
-
-
-
-
-
- Nachname -
-
- -
- Dieses Feld darf nicht leer sein! -
+
+
+
+
+
+
+
+ Geschlecht
-
-
-
-
-
-
- Geburtstag -
-
- -
-
- -
-
-
-
-
-
-
-
-
-
- Geschlecht -
-
- @{ - var selectedMale = Model.SelectedJsonCustomer.CustomerSex == Sex.Male ? "selected" : string.Empty; - var selectedFemale = Model.SelectedJsonCustomer.CustomerSex == Sex.Female ? "selected" : string.Empty; - var selectedDiverse = Model.SelectedJsonCustomer.CustomerSex == Sex.Divers ? "selected" : string.Empty; - var selectedNull = Model.SelectedJsonCustomer.CustomerSex is null ? "selected" : string.Empty; - } + @{ + var selectedMale = Model.SelectedJsonCustomer.CustomerSex == Sex.Male ? "selected" : string.Empty; + var selectedFemale = Model.SelectedJsonCustomer.CustomerSex == Sex.Female ? "selected" : string.Empty; + var selectedDiverse = Model.SelectedJsonCustomer.CustomerSex == Sex.Divers ? "selected" : string.Empty; + var selectedNull = Model.SelectedJsonCustomer.CustomerSex is null ? "selected" : string.Empty; + } - -
-
+
-
-
-
-
- Adresse -
-
-
-
-
-
- Adresszusatz -
-
- +
+
+
+
+
+
+ Adresse +
+
+
+
+
+
+ Adresszusatz
+
-
-
-
-
-
- Straße -
-
- +
+
+
+
+
+
+
+ Straße
+
-
-
-
-
-
- PLZ -
-
- +
+
+
+
+
+
+
+ PLZ
+
-
-
-
-
-
- Ort -
-
- +
+
+
+
+
+
+
+ Ort
+
-
-
-
-
- Rechnungsadresse -
-
-
-
-
-
- Name -
-
- +
+
+
+
+
+
+ Rechnungsadresse +
+
+
+
+
+
+ Name
+
-
-
-
-
-
- Straße -
-
- +
+
+
+
+
+
+
+ Straße
+
-
-
-
-
-
- PLZ -
-
- +
+
+
+
+
+
+
+ PLZ
+
-
-
-
-
-
- Ort -
-
- +
+
+
+
+
+
+
+ Ort
+
-
-
-
-
- Kontakt -
-
-
-
-
-
- Handy -
-
- -
- -
-
-
-
-
-
-
-
-
- Telefon -
-
- -
- -
-
-
-
-
-
-
-
-
- Fax -
-
- -
-
-
-
-
-
-
-
- Mail -
-
- -
- -
-
-
-
-
+
+
+
+
+
+
+ Kontakt
-
- -
-
-
-
-
Kommentar
-
-
-
-
- -
-
-
-
- - @if(AbstractModel.HasRightToEditCustomers) - { -
- -
- } - -
-
-
- - - @if(Model.SelectedJsonCustomer.ReferenceNumbers.Any()) - { -
-
-
-
- +
+
+
+
+
+ Handy +
-
-
-
-
-
- + + +
+
+
+
+
+ Telefon +
+
+ +
+ +
+
+
+
+
+
+
+
+
+ Fax +
+
+ +
+
+
+
+
+
+
+
+ Mail +
+
+ +
+ +
+
+
+
+ + + + +
+
+
+
+
Kommentar
+
+
+
+
+ +
+
+
+
+ + @if(AbstractModel.HasRightToEditCustomers) + { +
+ +
+ } + +
+
+
+ + + @if(Model.SelectedJsonCustomer.ReferenceNumbers.Any()) + { +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ + + + + + + + @foreach(var x in Model.SelectedJsonCustomer.ReferenceNumbers) + { + + + + + } + +
+ Kostenträger + + Aktenzeichen +
+ @x.Costbearer + + @x.ReferenceNumber +
+
+
+
+
+
+ } + + + @if(Model.SelectedJsonCustomer.Umfeldpersonen.Any()) + { +
+
+
+
+ +
+
+ +
+
+
+
+
+ @foreach(var umfeldPerson in Model.SelectedJsonCustomer.Umfeldpersonen) + { +
+
+
+ +
+
+ +
+
+
+
+
+
+
+ Rolle: +
+
+ @umfeldPerson.Rolle +
+
+
+
+ Adresse: +
+
+ @umfeldPerson.StrNameNr
@umfeldPerson.PLZOrt +
+
+
+
+ Tel.: +
+
+ @umfeldPerson.TelNr +
+
+
+
+ Mobil: +
+
+ @umfeldPerson.Mobil +
+
+
+
+ E-Mail: +
+
+ @umfeldPerson.EMail +
+
+
+
+ Fax: +
+
+ @umfeldPerson.Fax +
+
+
+
+
+
+ } +
+
+
+
+
+ } + + + @if(Model.SelectedJsonCustomer.Organisations.Any()) + { +
+
+
+
+ +
+
+ +
+
+
+
+
+ @foreach(var organisation in Model.SelectedJsonCustomer.Organisations) + { +
+
+
+ +
+
+ +
+
+
+
+
+
+
+ Ansprechpartner +
+
+ @organisation.ContactPerson +
+
+
+
+ Rolle +
+
+ @organisation.Role +
+
+
+
+ Adresse +
+
+ @organisation.StreetName + @if(!string.IsNullOrEmpty(organisation.StreetName) && !string.IsNullOrEmpty(organisation.ZipCode2Town)) + { +
+ } + @organisation.ZipCode2Town +
+
+
+
+ Tel.: +
+
+ @organisation.PhoneNumber +
+
+
+
+ Fax: +
+
+ @organisation.FaxNumber +
+
+
+
+ E-Mail: +
+
+ @organisation.Email +
+
+
+
+ Internet: +
+
+ @organisation.Website +
+
+
+
+ Info +
+
+ @organisation.Info +
+
+
+
+ Notiz +
+
+ @organisation.Notice +
+
+
+
+
+
+ } +
+
+
+
+
+ } + +
+
+
+
+ +
+
+ +
+
+
+
+
+ @Html.Partial("DocumentPartial", Model) +
+
+
+
+
+ + + @if(AbstractModel.IsAllowedToSeeMedikamentenliste) + { +
+
+
+
Medikamentenverordnungen
+
+
+
+
+
+ @Html.DropDownListFor(m => m.SelectedReportType, Model.ReportTypeItems, new { @class = "custom-select", id = "report-type-select", onchange = "changeReportTypeSelection()" }) +
+
+ @{ + var showReportBtnDisabledValue = Model.SelectedReportType == CustomerReportType.Historie ? "disabled" : string.Empty; + } + +
+
+ @if(!(Model.SelectedCustomer is null)) + { + var displayValue = Model.SelectedReportType == CustomerReportType.Historie ? string.Empty : "d-none"; + + - - + - @foreach(var x in Model.SelectedJsonCustomer.ReferenceNumbers) + @foreach(var list in Model.SelectedCustomer.Medikamentenverordnungslisten.Where(w => !w.Gueltig)) + { + var listName = $"{(list.MedListType ? "Medikamentenverordnungsliste" : "Bedarfsmedikamentenverordnungsliste")} vom {list.ErstellDatum}"; + var name = $"{listName} von {list.Ersteller}"; + + + + + + } + +
- Kostenträger + + Liste - Aktenzeichen + + Ersteller
+ @listName + + @list.Ersteller + + + +
+ } +
+
+
+
+
+
+ } + + + @if(AbstractModel.HasRightToViewDiagnosen && (Model.SelectedJsonCustomer.HasDiagnosen || Model.SelectedJsonCustomer.HasDisabilities || Model.SelectedJsonCustomer.HasSchwebi)) + { +
+
+
+
+ +
+
+ +
+
+
+
+ @{ + var hasDiagnosen = Model.SelectedJsonCustomer.HasDiagnosen; + var hasDisabilities = Model.SelectedJsonCustomer.HasDisabilities; + var diagnosenCol = hasDiagnosen && hasDisabilities ? "col-lg-6" : "col-lg-12"; + var schwebiCol = hasDiagnosen ? "col-lg-6" : "col-lg-12"; + } +
+ @if(hasDiagnosen) + { +
+
Diagnosen
+ + + + + + + + + @foreach(var code2Text in Model.SelectedJsonCustomer.ICD10Diagnosen) { - - + + + + } + + + + + + + + + +
ICD10Beschreibung
- @x.Costbearer - - @x.ReferenceNumber - @code2Text.Key@code2Text.Value
Medikation@Model.SelectedCustomer.Medication
Bemerkungen@Model.SelectedCustomer.Diagnosis
+
+ } + @if(Model.SelectedJsonCustomer.HasSchwebi) + { +
+
Schwerbehindertenausweis
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Aust. Vers. -amt@Model.SelectedJsonCustomer.SchwebiAusstAmt
Ausweis unbefristet gültig@Model.SelectedJsonCustomer.SchwebiIsUnlimited
Ausweis gültig von@Model.SelectedJsonCustomer.SchwebiGueltigVon
Ausweis gültig bis@Model.SelectedJsonCustomer.SchwebiGueltigBis
Beiblatt gültig bis@Model.SelectedJsonCustomer.SchwebiBeiblattGueltigBis
Grad der Behinderung@Model.SelectedJsonCustomer.SchwebiGradDerBehinderung
Merkzeichen@Model.SelectedJsonCustomer.SchwebiMerkzeichen
Behinderungsart@Model.SelectedJsonCustomer.SchwebiBehinderungsart
Pflegegrad@Model.SelectedJsonCustomer.SchwebiPflegegrad
Aktenzeichen@Model.SelectedJsonCustomer.SchwebiAktenzeichen
+
+ } +
+ @if(Model.SelectedJsonCustomer.HasDisabilities) + { +
+
+
Behinderungen
+ + + @foreach(var behinderung in Model.SelectedCustomer.Disabilities) + { + + }
@behinderung.DisplayName
-
+ }
- } +
+
+ } - - @if(Model.SelectedJsonCustomer.Umfeldpersonen.Any()) - { -
-
-
-
- -
-
- -
-
-
-
-
- @foreach(var umfeldPerson in Model.SelectedJsonCustomer.Umfeldpersonen) - { -
-
-
- -
-
- -
-
-
-
-
-
-
- Rolle: -
-
- @umfeldPerson.Rolle -
-
-
-
- Adresse: -
-
- @umfeldPerson.StrNameNr
@umfeldPerson.PLZOrt -
-
-
-
- Tel.: -
-
- @umfeldPerson.TelNr -
-
-
-
- Mobil: -
-
- @umfeldPerson.Mobil -
-
-
-
- E-Mail: -
-
- @umfeldPerson.EMail -
-
-
-
- Fax: -
-
- @umfeldPerson.Fax -
-
-
-
-
-
- } -
-
-
+ @{ + var isRelatedCustomer = Model.SelectedCustomerOid.HasValue && Model.Employee.RelatedCustomers.Any(cer => cer.Customer.CustomerOid.Equals(Model.SelectedCustomerOid.Value)); + + var isAllowedToViewBargeldkassen = AbstractModel.HasRightToViewAllCustomersBargeldkassen || (isRelatedCustomer && AbstractModel.HasRightToViewOwnCustomersBargeldkassen); + } + + @* Bargeldverwaltung *@ + @if(Html.IsInDebugMode() && isAllowedToViewBargeldkassen && !(Model.Bargeldkassen is null) && Model.Bargeldkassen.Any()) + { + +
+
+
+
+ +
+
+
- } - - - @if(Model.SelectedJsonCustomer.Organisations.Any()) - { -
-
-
-
- -
-
- -
-
-
-
-
- @foreach(var organisation in Model.SelectedJsonCustomer.Organisations) - { -
-
-
- -
-
- -
-
-
-
-
-
-
- Ansprechpartner -
-
- @organisation.ContactPerson -
-
-
-
- Rolle -
-
- @organisation.Role -
-
-
-
- Adresse -
-
- @organisation.StreetName - @if(!string.IsNullOrEmpty(organisation.StreetName) && !string.IsNullOrEmpty(organisation.ZipCode2Town)) - { -
- } - @organisation.ZipCode2Town -
-
-
-
- Tel.: -
-
- @organisation.PhoneNumber -
-
-
-
- Fax: -
-
- @organisation.FaxNumber -
-
-
-
- E-Mail: -
-
- @organisation.Email -
-
-
-
- Internet: -
-
- @organisation.Website -
-
-
-
- Info -
-
- @organisation.Info -
-
-
-
- Notiz -
-
- @organisation.Notice -
-
-
-
-
-
- } -
-
-
-
-
- } - -
-
-
-
- -
-
- -
-
-
-
-
- @Html.Partial("DocumentPartial", Model) -
+
+
+
+ @Html.Partial("CustomerBargeldkassen", Model)
- - - @if(Html.IsInDebugMode() && AbstractModel.IsAllowedToSeeMedikamentenliste) - { -
-
-
-
Medikamentenverordnungen
-
-
-
-
-
- @Html.DropDownListFor(m => m.SelectedReportType, Model.ReportTypeItems, new { @class = "custom-select", id = "report-type-select", onchange = "changeReportTypeSelection()" }) -
-
- @{ - var showReportBtnDisabledValue = Model.SelectedReportType == CustomerReportType.Historie ? "disabled" : string.Empty; - } - -
-
- @if(!(Model.SelectedCustomer is null)) - { - var displayValue = Model.SelectedReportType == CustomerReportType.Historie ? string.Empty : "d-none"; - - - - - - - - - - - @foreach(var list in Model.SelectedCustomer.Medikamentenverordnungslisten.Where(w => !w.Gueltig)) - { - var listName = $"{(list.MedListType ? "Medikamentenverordnungsliste" : "Bedarfsmedikamentenverordnungsliste")} vom {list.ErstellDatum}"; - var name = $"{listName} von {list.Ersteller}"; - - - - - - } - -
- Liste - - Ersteller -
- @listName - - @list.Ersteller - - - -
- } -
-
-
-
-
-
- } - - - @if(AbstractModel.HasRightToViewDiagnosen && (Model.SelectedJsonCustomer.HasDiagnosen || Model.SelectedJsonCustomer.HasDisabilities || Model.SelectedJsonCustomer.HasSchwebi)) - { -
-
-
-
- -
-
- -
-
-
-
- @{ - var hasDiagnosen = Model.SelectedJsonCustomer.HasDiagnosen; - var hasDisabilities = Model.SelectedJsonCustomer.HasDisabilities; - var diagnosenCol = hasDiagnosen && hasDisabilities ? "col-lg-6" : "col-lg-12"; - var schwebiCol = hasDiagnosen ? "col-lg-6" : "col-lg-12"; - } -
- @if(hasDiagnosen) - { -
-
Diagnosen
- - - - - - - - - @foreach(var code2Text in Model.SelectedJsonCustomer.ICD10Diagnosen) - { - - - - - } - - - - - - - - - -
ICD10Beschreibung
@code2Text.Key@code2Text.Value
Medikation@Model.SelectedCustomer.Medication
Bemerkungen@Model.SelectedCustomer.Diagnosis
-
- } - @if(Model.SelectedJsonCustomer.HasSchwebi) - { -
-
Schwerbehindertenausweis
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Aust. Vers. -amt@Model.SelectedJsonCustomer.SchwebiAusstAmt
Ausweis unbefristet gültig@Model.SelectedJsonCustomer.SchwebiIsUnlimited
Ausweis gültig von@Model.SelectedJsonCustomer.SchwebiGueltigVon
Ausweis gültig bis@Model.SelectedJsonCustomer.SchwebiGueltigBis
Beiblatt gültig bis@Model.SelectedJsonCustomer.SchwebiBeiblattGueltigBis
Grad der Behinderung@Model.SelectedJsonCustomer.SchwebiGradDerBehinderung
Merkzeichen@Model.SelectedJsonCustomer.SchwebiMerkzeichen
Behinderungsart@Model.SelectedJsonCustomer.SchwebiBehinderungsart
Pflegegrad@Model.SelectedJsonCustomer.SchwebiPflegegrad
Aktenzeichen@Model.SelectedJsonCustomer.SchwebiAktenzeichen
-
- } -
- @if(Model.SelectedJsonCustomer.HasDisabilities) - { -
-
-
Behinderungen
- - - @foreach(var behinderung in Model.SelectedCustomer.Disabilities) - { - - - - } - -
@behinderung.DisplayName
-
-
- } -
-
-
-
- } - - @{ - var isRelatedCustomer = Model.SelectedCustomerOid.HasValue && Model.Employee.RelatedCustomers.Any(cer => cer.Customer.CustomerOid.Equals(Model.SelectedCustomerOid.Value)); - - var isAllowedToViewBargeldkassen = AbstractModel.HasRightToViewAllCustomersBargeldkassen || (isRelatedCustomer && AbstractModel.HasRightToViewOwnCustomersBargeldkassen); - } - - @* Bargeldverwaltung *@ - @if(Html.IsInDebugMode() && isAllowedToViewBargeldkassen && !(Model.Bargeldkassen is null) && Model.Bargeldkassen.Any()) - { - -
-
-
-
- -
-
- -
-
-
-
-
- @Html.Partial("CustomerBargeldkassen", Model) -
-
-
-
-
- } - - @* Abwesenheiten *@ - @if(AbstractModel.HasRightToViewCustomerAbsenceTimes) - { -
-
-
-
- -
-
- -
-
-
-
- -
-
- @Html.Partial("CustomerAbsenceTimePartial", Model) -
-
-
-
-
- } -
} + + @* Abwesenheiten *@ + @if(AbstractModel.HasRightToViewCustomerAbsenceTimes) + { +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ @Html.Partial("CustomerAbsenceTimePartial", Model) +
+
+
+
+
+ } + + @*Betreuung*@ + @{ + var hasRelatedEmployees = Model.SelectedCustomer?.RelatedEmployees.Any() ?? false; + var hasRelatedTeams = Model.SelectedCustomer?.RelatedTeams.Any() ?? false; + } + + @if(Html.IsInDebugMode() && AbstractModel.HasRightToViewBetreuung && (hasRelatedEmployees || hasRelatedTeams)) + { +
+
+
+
+ +
+
+ +
+
+
+
+
+ @Html.Partial("CustomerBetreuungPartial", Model) +
+
+
+
+
+ } + +
+ } }
diff --git a/BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml new file mode 100644 index 000000000..84cd9867e --- /dev/null +++ b/BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml @@ -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; +*@ + + + +@if(hasRelatedEmployees && Model.SelectedCustomer != null) +{ +
Betreuung
+
+ @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}" : ""; +
+
+
+
+
+ Betreuer +
+
+ @relation.Employee +
+
+
+
+ Rolle +
+
+ @relation.RelationRole.DisplayName +
+
+ @if(!string.IsNullOrWhiteSpace(start)) + { +
+
+ Startdatum +
+
+ @start +
+
+ } + + @if(!string.IsNullOrWhiteSpace(end)) + { +
+
+ Enddatum +
+
+ @end +
+
+ } + + @if(!string.IsNullOrWhiteSpace(relation.Notice)) + { +
+
+ Erläuterung +
+
+ @relation.Notice +
+
+ } +
+
+
+ } +
+} + +@*Teams*@ +@if(hasRelatedTeams && Model.SelectedCustomer != null) +{ +
Teams
+ + foreach(var teamRelation in Model.SelectedCustomer.RelatedTeams) + { +
+
+
+ Team +
+
+ @teamRelation.Team.Name +
+
+
+ } +} \ No newline at end of file diff --git a/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs b/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs index 6fc2e69f6..8d274436a 100644 --- a/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs +++ b/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs @@ -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(); }