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:
HirschleM
2025-12-03 14:24:51 +01:00
parent 2fa24b2f8c e1391bc704
commit 30aeda64ac
29 changed files with 581 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
BeWo/View/Detail/EmployeeView.xaml
View File

@@ -611,16 +611,17 @@
<GroupBox
Grid.Row="0"
Grid.Column="3"
Header="Adresse"
Header="{t:Translate EmployeeViewAdresse}"
Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80" />
<ColumnDefinition Width="90" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
@@ -628,18 +629,24 @@
Grid.Row="0"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
Content="{t:Translate EmployeeViewAdresszusatz}" />
<Label
Grid.Row="1"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Strasse
</Label>
<Label
Grid.Row="1"
Grid.Row="2"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Postleitzahl
</Label>
<Label
Grid.Row="2"
Grid.Row="3"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
@@ -651,18 +658,24 @@
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
Text="{Binding Path=AddressLine1, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="1"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="2"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="3"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=Town, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</GroupBox>
@@ -670,7 +683,7 @@
Grid.Row="1"
Grid.Column="3"
Margin="0,20,0,0"
Header="Kontakt"
Header="{t:Translate EmployeeViewKontakt}"
Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.RowDefinitions>
@@ -681,7 +694,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80" />
<ColumnDefinition Width="90" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

79
BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml
View File

@@ -43,6 +43,16 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@@ -173,7 +183,7 @@
Style="{StaticResource TextEditCurrency}" />
</Grid>
<Label Grid.Row="7" Content="Möbilierung" />
<Label Grid.Row="7" Content="Möblierung" />
<TextBox
Grid.Row="7"
Grid.Column="1"
@@ -184,10 +194,73 @@
<TextBox
Grid.Row="8"
Grid.Column="1"
Style="{StaticResource TextBoxNoticeExtended}"
Style="{StaticResource TextBoxNoticeSmallExtended}"
Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
<StackPanel
<Label Grid.Row="9" Content="Details 1" />
<TextBox
Grid.Row="9"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details1, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="10" Content="Details 2" />
<TextBox
Grid.Row="10"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details2, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="11" Content="Details 3" />
<TextBox
Grid.Row="11"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details3, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="12" Content="Details 4" />
<TextBox
Grid.Row="12"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details4, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="13" Content="Details 5" />
<TextBox
Grid.Row="13"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details5, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="14" Content="Details 6" />
<TextBox
Grid.Row="14"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details6, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="15" Content="Details 7" />
<TextBox
Grid.Row="15"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details7, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="16" Content="Details 8" />
<TextBox
Grid.Row="16"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details8, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="17" Content="Details 9" />
<TextBox
Grid.Row="17"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details9, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="18" Content="Details 10" />
<TextBox
Grid.Row="18"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details10, UpdateSourceTrigger=PropertyChanged}" />
<StackPanel
Grid.Row="19"
Grid.ColumnSpan="2"
Margin="3"
HorizontalAlignment="Right"

90
BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
View File

@@ -109,6 +109,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -232,7 +233,7 @@
<Label
Grid.Row="9"
Grid.Column="0"
Content="Möbilierung" />
Content="Möblierung" />
<TextBox
Grid.Row="9"
Grid.Column="1"
@@ -252,6 +253,93 @@
IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
Style="{StaticResource TextBoxNoticeExtended}"
Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
<StackPanel Grid.Column="4" Grid.RowSpan="13" Orientation="Vertical">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Details 1" />
<TextBox
Grid.Row="0"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details1, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="1" Content="Details 2" />
<TextBox
Grid.Row="1"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details2, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="2" Content="Details 3" />
<TextBox
Grid.Row="2"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details3, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="3" Content="Details 4" />
<TextBox
Grid.Row="3"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details4, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="4" Content="Details 5" />
<TextBox
Grid.Row="4"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details5, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="5" Content="Details 6" />
<TextBox
Grid.Row="5"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details6, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="6" Content="Details 7" />
<TextBox
Grid.Row="6"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details7, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="7" Content="Details 8" />
<TextBox
Grid.Row="7"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details8, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="8" Content="Details 9" />
<TextBox
Grid.Row="8"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details9, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Row="9" Content="Details 10" />
<TextBox
Grid.Row="9"
Grid.Column="1"
Style="{StaticResource TextBoxNotice}"
Text="{Binding Path=Details10, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</StackPanel>
</Grid>
</GroupBox>
<local:WohneinheitGrundrissControl DataContext="{Binding ImageListVM}" Visibility="{Binding Path=DataContext.PermissionWohneinheitGalleryView, ElementName=root_grid, Converter={StaticResource BoolVisibilityConverter}}" />

19
BeWo/ViewModel/EmployeeVM.cs
View File

@@ -65,6 +65,7 @@ namespace BeWo.ViewModel
public static string PropertyName_WeeklyDays = "WeeklyDays";
public static string PropertyName_Profession = "Profession";
public static string PropertyName_Qualifications = "Qualifications";
public static string PropertyName_AddressLine1 = "AddressLine1";
public static string PropertyName_Street = "Street";
public static string PropertyName_TaxClass = "TaxClass";
public static string PropertyName_TaxNumber = "TaxNumber";
@@ -129,6 +130,7 @@ namespace BeWo.ViewModel
private string _Profession;
private ObservableSortCollection<ValueListEntryDC> _Qualifications;
private Sex? _Sex;
private string _AddressLine1;
private string _Street;
private string _TaxClass;
private string _TaxNumber;
@@ -1046,8 +1048,21 @@ namespace BeWo.ViewModel
return _EintragKategorien ?? (_EintragKategorien = new ObservableSortCollection<ValueListEntryDC>(Comparer.ValueListEntryDCComparer));
}
}
public string AddressLine1
{
get { return this._AddressLine1; }
public string Street
set
{
if (this.AreDifferent(this._AddressLine1, value))
{
this._AddressLine1 = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AddressLine1, value), PropertyName_AddressLine1);
this.FirePropertyChanged(PropertyName_AddressLine1);
}
}
}
public string Street
{
get { return _Street; }
@@ -1387,6 +1402,7 @@ namespace BeWo.ViewModel
_PersonnelNumber = pDataContract.PersonnelNumber;
_PostalCode = pDataContract.PostalCode;
_Profession = pDataContract.Profession;
_AddressLine1 = pDataContract.AddressLine1;
_Street = pDataContract.Street;
_TaxNumber = pDataContract.TaxNumber;
_TaxClass = pDataContract.TaxClass;
@@ -1507,6 +1523,7 @@ namespace BeWo.ViewModel
pDataContract.PersonnelNumber = _PersonnelNumber;
pDataContract.PostalCode = _PostalCode;
pDataContract.Profession = _Profession;
pDataContract.AddressLine1 = _AddressLine1;
pDataContract.Street = _Street;
pDataContract.TaxNumber = _TaxNumber;
pDataContract.TaxClass = _TaxClass;

161
BeWo/ViewModel/WohneinheitVM.cs
View File

@@ -32,6 +32,16 @@ namespace BeWo.ViewModel
private string _Zusatznotiz;
private string _Stock;
private ImageListVM _ImageListVM;
private string _Details1;
private string _Details2;
private string _Details3;
private string _Details4;
private string _Details5;
private string _Details6;
private string _Details7;
private string _Details8;
private string _Details9;
private string _Details10;
public WohneinheitVM() : this(new WohneinheitDC())
{
@@ -250,6 +260,136 @@ namespace BeWo.ViewModel
}
}
}
public string Details1
{
get { return _Details1; }
set
{
if (AreDifferent(Details1, value))
{
_Details1 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details1, value), nameof(Details1));
FirePropertyChanged(nameof(Details1));
}
}
}
public string Details2
{
get { return _Details2; }
set
{
if (AreDifferent(Details2, value))
{
_Details2 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details2, value), nameof(Details2));
FirePropertyChanged(nameof(Details2));
}
}
}
public string Details3
{
get { return _Details3; }
set
{
if (AreDifferent(Details3, value))
{
_Details3 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details3, value), nameof(Details3));
FirePropertyChanged(nameof(Details3));
}
}
}
public string Details4
{
get { return _Details4; }
set
{
if (AreDifferent(Details4, value))
{
_Details4 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details4, value), nameof(Details4));
FirePropertyChanged(nameof(Details4));
}
}
}
public string Details5
{
get { return _Details5; }
set
{
if (AreDifferent(Details5, value))
{
_Details5 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details5, value), nameof(Details5));
FirePropertyChanged(nameof(Details5));
}
}
}
public string Details6
{
get { return _Details6; }
set
{
if (AreDifferent(Details6, value))
{
_Details6 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details6, value), nameof(Details6));
FirePropertyChanged(nameof(Details6));
}
}
}
public string Details7
{
get { return _Details7; }
set
{
if (AreDifferent(Details7, value))
{
_Details7 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details7, value), nameof(Details7));
FirePropertyChanged(nameof(Details7));
}
}
}
public string Details8
{
get { return _Details8; }
set
{
if (AreDifferent(Details8, value))
{
_Details8 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details8, value), nameof(Details8));
FirePropertyChanged(nameof(Details8));
}
}
}
public string Details9
{
get { return _Details9; }
set
{
if (AreDifferent(Details9, value))
{
_Details9 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details9, value), nameof(Details9));
FirePropertyChanged(nameof(Details9));
}
}
}
public string Details10
{
get { return _Details10; }
set
{
if (AreDifferent(Details10, value))
{
_Details10 = value;
StoreDirtyInformation(AreDifferent(DataContract.Details10, value), nameof(Details10));
FirePropertyChanged(nameof(Details10));
}
}
}
public ImageListVM ImageListVM
{
get { return _ImageListVM; }
@@ -316,6 +456,17 @@ namespace BeWo.ViewModel
_Mobilierung = pDataContract.Mobilierung;
_Zusatznotiz = pDataContract.Zusatznotiz;
_Stock = pDataContract.Stock;
_Details1 = pDataContract.Details1;
_Details2 = pDataContract.Details2;
_Details3 = pDataContract.Details3;
_Details4 = pDataContract.Details4;
_Details5 = pDataContract.Details5;
_Details6 = pDataContract.Details6;
_Details7 = pDataContract.Details7;
_Details8 = pDataContract.Details8;
_Details9 = pDataContract.Details9;
_Details10 = pDataContract.Details10;
_ImageListVM = new ImageListVM(pDataContract.Grundrisse ?? (pDataContract.Grundrisse = new List<ImageDC>()));
}
@@ -338,6 +489,16 @@ namespace BeWo.ViewModel
bDataContract.Mobilierung = _Mobilierung;
bDataContract.Zusatznotiz = _Zusatznotiz;
bDataContract.Stock = _Stock;
bDataContract.Details1 = _Details1;
bDataContract.Details2 = _Details2;
bDataContract.Details3 = _Details3;
bDataContract.Details4 = _Details4;
bDataContract.Details5 = _Details5;
bDataContract.Details6 = _Details6;
bDataContract.Details7 = _Details7;
bDataContract.Details8 = _Details8;
bDataContract.Details9 = _Details9;
bDataContract.Details10 = _Details10;
bDataContract.Belegungen = null;

1
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -308,6 +308,7 @@
<Compile Include="Controllers\DevToolsController.cs" />
<Compile Include="Controllers\DevExpressSchedulerController.cs" />
<Compile Include="Controllers\ExternalSignatureController.cs" />
<Compile Include="Controllers\SignableController.cs" />
<Compile Include="Controllers\ReportBaseController.cs" />
<Compile Include="Controllers\ReportController.cs" />
<Compile Include="Controllers\ReportViewerController.cs" />

36
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -39,7 +39,7 @@ using ServiceRecordDC = BS.Shared.DataContracts.ServiceRecordDC;
namespace BeWoPlanerMobil.Controllers
{
public class MainController : AbstractBaseController
public class MainController : SignableController
{
public MainController()
{
@@ -1132,33 +1132,29 @@ namespace BeWoPlanerMobil.Controllers
}
[Authorize]
public ActionResult SaveSignature(FormCollection formCollection)
[HttpPost]
public override ActionResult SaveSignature(FormCollection formCollection)
{
try
{
var blob = formCollection[FormCollectionConstants.ServiceRecordSignatureBlobKey];
var date = DateTime.Parse(formCollection[FormCollectionConstants.ServiceRecordSignatureDateKey]);
long.TryParse(formCollection[FormCollectionConstants.ServiceRecordSignatureRecordOidKey], out var serviceRecordOid);
var serviceRecord = GetServiceRecordDC(serviceRecordOid, false);
long.TryParse(formCollection[FormCollectionConstants.ServiceRecordSignatureObjOidKey], out var objectOid);
if(serviceRecordOid < 1 || serviceRecord is null)
if(objectOid <= 0)
{
var message2Log = string.Empty;
return RedirectToAction("Main", "Main", Model);
}
if(serviceRecordOid < 1)
{
message2Log = $"Einzelunterschrift konnte nicht gespeichert werden, da die ServiceRecordOid {serviceRecordOid} ungültig ist.";
}
else if(serviceRecord is null)
{
message2Log = "Einzelunterschrift konnte nicht gespeichert werden, da der Zeiterfassungseintrag im Model nicht gefunden werden konnte.";
}
var serviceRecord = GetServiceRecordDC(objectOid, false);
Log.Error(message2Log);
if(serviceRecord is null)
{
Log.Error("Einzelunterschrift konnte nicht gespeichert werden, da der Zeiterfassungseintrag im Model nicht gefunden werden konnte.");
TempData[TempDataConstants.ErrorMessageKey] = "Beim Speichern der Unterschrift ist ein Fehler aufgetreten. Bitte wenden Sie sich an Ihren Administrator.";
return RedirectToActionPermanent("Main", "Main");
return RedirectToAction("Main", "Main", Model);
}
long? oid;
@@ -1170,14 +1166,14 @@ namespace BeWoPlanerMobil.Controllers
if(!isValid)
{
TempData[TempDataConstants.ErrorMessageKey] = "Das Unterschriftenfeld darf nicht leer sein.";
return RedirectToActionPermanent("Main", "Main");
return RedirectToAction("Main", "Main", Model);
}
oid = OperationsService.InsertSignature(new SignatureDC
{
DataBild = blob,
Zeitstempel = date,
ServiceRecordOid = serviceRecordOid
ServiceRecordOid = objectOid
}).SignatureOid;
}
@@ -1194,8 +1190,8 @@ namespace BeWoPlanerMobil.Controllers
{
Log.Error("Fehler beim Speichern der Einzelunterschrift: " + ex.Message, ex);
}
return RedirectToActionPermanent("Main", "Main");
return RedirectToAction("Main", "Main", Model);
}
[Authorize]

9
BeWoPlanerMobil/Controllers/SignableController.cs Normal file
View File

@@ -0,0 +1,9 @@
using System.Web.Mvc;
namespace BeWoPlanerMobil.Controllers
{
public abstract class SignableController : AbstractBaseController
{
public abstract ActionResult SaveSignature(FormCollection formCollection);
}
}

1
BeWoPlanerMobil/Util/FormCollectionConstants.cs
View File

@@ -31,6 +31,7 @@
public static string BetragKey => "betrag";
public static string ServiceRecordSignatureBlobKey => "service-record-signature-blob";
public static string ServiceRecordSignatureDateKey => "service-record-signature-date";
public static string ServiceRecordSignatureObjOidKey => "signature-obj-oid";
public static string ServiceRecordSignatureRecordOidKey => "service-record-signature-record-oid";
public static string GroupBookingSelectedCb2ScOidsKey => "service-record-group-booking-cb2sc-oids";
public static string GroupBookingSelectedEmployeeOidsKey => "service-record-group-booking-employee-oids";

13
BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerPagePartial.cshtml
View File

@@ -1,5 +1,6 @@
@using BeWoPlanerMobil.Views.DevExpressScheduler
@using BS.Shared.DataContracts
@using DevExpress.Data.Helpers
@using DevExpress.XtraScheduler
@model BeWoPlanerMobil.Models.DevExpressSchedulerModel
@@ -25,14 +26,6 @@
settings.Views.MonthView.AppointmentDisplayOptions.ShowRecurrence = true;
settings.Views.MonthView.MonthViewStyles.DateCellBody.Height = Unit.Pixel(170);
settings.Views.FullWeekView.Enabled = true;
settings.Views.WeekView.Enabled = false;
settings.Views.MonthView.ResourcesPerPage = 1;
settings.Views.MonthView.AppointmentDisplayOptions.StartTimeVisibility = AppointmentTimeVisibility.Never;
settings.Views.MonthView.AppointmentDisplayOptions.EndTimeVisibility = AppointmentTimeVisibility.Never;
settings.Views.MonthView.AppointmentDisplayOptions.StatusDisplayType = AppointmentStatusDisplayType.Bounds;
settings.Views.MonthView.AppointmentDisplayOptions.ShowRecurrence = true;
settings.Views.MonthView.MonthViewStyles.DateCellBody.Height = Unit.Pixel(170);
TimeScale[] timeScales =
{
@@ -51,10 +44,6 @@
settings.Storage.Resources.Assign(SchedulerHelper.DefaultResourceStorage);
settings.Storage.Appointments.Assign(SchedulerHelper.DefaultAppointmentStorage);
/*
*
*/
settings.Storage.Appointments.Assign(SchedulerHelper.DefaultAppointmentStorage);
settings.Storage.Resources.Assign(SchedulerHelper.DefaultResourceStorage);
settings.Storage.Appointments.Mappings.Start = nameof(SchedulerAppointmentDC.StartDate);

10
BeWoPlanerMobil/Views/Main/ServiceRecordListPartial.cshtml
View File

@@ -291,16 +291,6 @@
}
}
@if(Model.ShowSignature && !serviceRecord.SignatureOid.HasValue && serviceRecord.Customer != null)
{
using(Html.BeginForm("SaveSignature", "Main", FormMethod.Post, new { id = $"save-signature-form-{serviceRecord.ServiceRecordOid.Value}" }))
{
<input type="hidden" name="@FormCollectionConstants.ServiceRecordSignatureBlobKey" id="sr-sig-blob-@serviceRecord.ServiceRecordOid.Value" />
<input type="hidden" name="@FormCollectionConstants.ServiceRecordSignatureDateKey" id="sr-sig-date-@serviceRecord.ServiceRecordOid.Value" />
<input type="hidden" name="@FormCollectionConstants.ServiceRecordSignatureRecordOidKey" id="sr-sig-sr-oid-@serviceRecord.ServiceRecordOid.Value" value="@serviceRecord.ServiceRecordOid.Value" />
}
}
@* Button-Leiste (bearbeiten, löschen, unterschreiben/Unterschrift, externe Unterschrift *@
<div class="btn-group" role="group">
@* Edit-Button *@

6
BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml
View File

@@ -69,7 +69,7 @@
}
@*
Benötigt: ServiceRecord-Oid, Modal-Id, SketchPad-Container-Id, Ok-Button-Id, Neu-Button-Id, Abbrechen-Button-Id
Benötigt: ServiceRecord-Oid, Modal-Id, SketchPad-Container-Id, Ok-Button-Id, Neu-Button-Id, Abbrechen-Button-Id, SketchPad-Id
*@
function initializeSignatureCanvas(serviceRecordOid) {
hideSpinner();
@@ -154,7 +154,7 @@
form.append($("<input>",
{
type: "hidden",
name: "@FormCollectionConstants.ServiceRecordSignatureRecordOidKey",
name: "@FormCollectionConstants.ServiceRecordSignatureObjOidKey",
value: selectedServiceRecordOid
}));
@@ -209,7 +209,7 @@ else
<div id="sr-sg-container"></div>
<div id="single-signature-modal" class="modal" tabindex="-1" role="dialog" data-backdrop="static">
<div class="modal-dialog modal-xl" role="document">
<div class="modal-dialog modal-xl modal-dialog-scrollable" style="max-width: 98% !important;" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Unterschrift</h5>

12
Data/Entities/Wohneinheit.cs
View File

@@ -273,6 +273,18 @@ namespace BeWo.Data.Entities
}
}
}
public virtual string Details1 { get; set; }
public virtual string Details2 { get; set; }
public virtual string Details3 { get; set; }
public virtual string Details4 { get; set; }
public virtual string Details5 { get; set; }
public virtual string Details6 { get; set; }
public virtual string Details7 { get; set; }
public virtual string Details8 { get; set; }
public virtual string Details9 { get; set; }
public virtual string Details10 { get; set; }
public virtual IList<WohneinheitBelegung> Belegungen
{
get

10
Data/Mappings/Wohneinheit.hbm.xml
View File

@@ -26,6 +26,16 @@
<property name="Mobilierung"/>
<property name="Zusatznotiz"/>
<property name="Stock"/>
<property name="Details1"/>
<property name="Details2"/>
<property name="Details3"/>
<property name="Details4"/>
<property name="Details5"/>
<property name="Details6"/>
<property name="Details7"/>
<property name="Details8"/>
<property name="Details9"/>
<property name="Details10"/>
<!--<property name="WohnheimOid" insert="false" update="false"/>-->
<many-to-one name="Wohnheim" column="WohnheimOid" class="BeWo.Data.Entities.Wohnheim,BeWo.Data" cascade="none" fetch="join"/>
<bag name="Belegungen" table="Wohneinheitbelegung" generic="true" cascade="all-delete-orphan" batch-size="250" inverse="true" >

2
Host/Host.csproj.user
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<NameOfLastUsedPublishProfile>C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>

11
Model/Changes_2025-12-02 Wohneinheit Details.txt Normal file
View File

@@ -0,0 +1,11 @@
ALTER TABLE `wohneinheit`
ADD COLUMN `Details1` VARCHAR(1024) NULL,
ADD COLUMN `Details2` VARCHAR(1024) NULL,
ADD COLUMN `Details3` VARCHAR(1024) NULL,
ADD COLUMN `Details4` VARCHAR(1024) NULL,
ADD COLUMN `Details5` VARCHAR(1024) NULL,
ADD COLUMN `Details6` VARCHAR(1024) NULL,
ADD COLUMN `Details7` VARCHAR(1024) NULL,
ADD COLUMN `Details8` VARCHAR(1024) NULL,
ADD COLUMN `Details9` VARCHAR(1024) NULL,
ADD COLUMN `Details10` VARCHAR(1024) NULL;

13
Model/Changes_alle_fuer_neue_db.txt
View File

@@ -1759,3 +1759,16 @@ CREATE TABLE IF NOT EXISTS `OvertimeHistory` (
`OvertimeAuszahlungsartOid` bigint DEFAULT NULL,
PRIMARY KEY (`Oid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
ALTER TABLE `wohneinheit`
ADD COLUMN `Details1` VARCHAR(1024) NULL,
ADD COLUMN `Details2` VARCHAR(1024) NULL,
ADD COLUMN `Details3` VARCHAR(1024) NULL,
ADD COLUMN `Details4` VARCHAR(1024) NULL,
ADD COLUMN `Details5` VARCHAR(1024) NULL,
ADD COLUMN `Details6` VARCHAR(1024) NULL,
ADD COLUMN `Details7` VARCHAR(1024) NULL,
ADD COLUMN `Details8` VARCHAR(1024) NULL,
ADD COLUMN `Details9` VARCHAR(1024) NULL,
ADD COLUMN `Details10` VARCHAR(1024) NULL;

15
ReportImp/BeWoRichter/Service/CustomVacationService.cs
View File

@@ -25,7 +25,20 @@ namespace BeWoRichter.Service
}
return feiertage;
}
}
public override decimal GetFeiertagsFaktor(DateTime start)
{
if (start.Year >= 2025 && start.Month == 12 && (start.Day == 24 || start.Day == 31))
{
return 0.5m;
}
else if (IstFeiertag(start))
{
return 1;
}
return 0;
}
public override DateTime GetExpirationDate(int year)
{

1
ReportImp/Fortis/Fortis.csproj
View File

@@ -74,6 +74,7 @@
</Compile>
<Compile Include="FortisServiceRecord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Translation\TranslationDictionary.cs" />
<Compile Include="ZeitdokumentationPlanIstUebersicht.cs">
<SubType>Component</SubType>
</Compile>

29
ReportImp/Fortis/Translation/TranslationDictionary.cs Normal file
View File

@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
namespace Fortis.Translation
{
public class CustomTranslationDictionary : TranslationDictionary
{
public override Dictionary<String, String> GetTranslationDictionary()
{
var dict = base.GetTranslationDictionary();
AddOrReplaceTranslation(dict, "EmployeeViewAdresse", "Adresse dienstlich");
AddOrReplaceTranslation(dict, "EmployeeViewAdresszusatz", "Jobbezeichnung");
AddOrReplaceTranslation(dict, "EmployeeViewKontakt", "Kontakt dienstlich");
return dict;
}
}
}

13
ReportImp/InklusioElmarBauer/Service/CustomVacationService.cs
View File

@@ -21,5 +21,18 @@ namespace InklusioElmarBauer.Service
return feiertage;
}
public override decimal GetFeiertagsFaktor(DateTime start)
{
if (start.Year >= 2025 && start.Month == 12 && (start.Day == 24 || start.Day == 31))
{
return 0.5m;
}
else if (IstFeiertag(start))
{
return 1;
}
return 0;
}
}
}

28
ReportImp/_TemplateNeuKunde/Translation/TranslationDictionary.cs Normal file
View File

@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
namespace TemplateNeuKunde.Translation
{
//public class CustomTranslationDictionary : TranslationDictionary
//{
// public override Dictionary<String, String> GetTranslationDictionary()
// {
// var dict = base.GetTranslationDictionary();
// //AddOrReplaceTranslation(dict, "EmployeeViewAdresse", "Adresse");
// return dict;
// }
//}
}

1
ReportImp/_TemplateNeuKunde/_TemplateNeuKunde.csproj
View File

@@ -68,6 +68,7 @@
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="Service\DefaultSaveInterceptor.cs" />
<Compile Include="Statistics\CustomServiceRecordStatisticFactory.cs" />
<Compile Include="Translation\TranslationDictionary.cs" />
<Compile Include="Validation\ServiceRecordValidator.cs" />
</ItemGroup>
<ItemGroup>

21
Service/DCEntityMapper/WohneinheitDC_Wohneinheit.cs
View File

@@ -42,6 +42,17 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.Mobilierung = pEntity.Mobilierung;
pDataContract.Zusatznotiz = pEntity.Zusatznotiz;
pDataContract.Stock = pEntity.Stock;
pDataContract.Details1 = pEntity.Details1;
pDataContract.Details2 = pEntity.Details2;
pDataContract.Details3 = pEntity.Details3;
pDataContract.Details4 = pEntity.Details4;
pDataContract.Details5 = pEntity.Details5;
pDataContract.Details6 = pEntity.Details6;
pDataContract.Details7 = pEntity.Details7;
pDataContract.Details8 = pEntity.Details8;
pDataContract.Details9 = pEntity.Details9;
pDataContract.Details10 = pEntity.Details10;
if (pEntity.Belegungen is object && pEntity.Belegungen.Any())
pDataContract.Belegungen = MapperFactory.WohneinheitBelegungDC_WohneinheitBelegung.MapToNewDCs(pEntity.Belegungen);
@@ -71,6 +82,16 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Mobilierung = pDataContract.Mobilierung;
pEntity.Zusatznotiz = pDataContract.Zusatznotiz;
pEntity.Stock = pDataContract.Stock;
pEntity.Details1 = pDataContract.Details1;
pEntity.Details2 = pDataContract.Details2;
pEntity.Details3 = pDataContract.Details3;
pEntity.Details4 = pDataContract.Details4;
pEntity.Details5 = pDataContract.Details5;
pEntity.Details6 = pDataContract.Details6;
pEntity.Details7 = pDataContract.Details7;
pEntity.Details8 = pDataContract.Details8;
pEntity.Details9 = pDataContract.Details9;
pEntity.Details10 = pDataContract.Details10;
if (pEntity.Belegungen is null)
pEntity.Belegungen = new List<WohneinheitBelegung>();

3
Service/Dokumentverwaltung/CustomerPlaceholderManager.cs
View File

@@ -54,7 +54,8 @@ namespace BeWo.Service.Dokumentverwaltung
Children = new List<PlatzhalterDC>(),
IconType = "Home"
};
adressdatenKlient.Children.Add(new PlatzhalterDC() { Bezeichnung = "Adresszusatz", Platzhalter = "KlAdresszusatz", IconType = "AB", FieldName = "Person.Address.Addressline1" });
adressdatenKlient.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "KlStrasse", IconType = "AB", FieldName = "Person.Address.Street" });
adressdatenKlient.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "KlPLZ", IconType = "AB", FieldName = "Person.Address.PostalCode" });
adressdatenKlient.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "KlOrt", IconType = "AB", FieldName = "Person.Address.Town" });

12
Service/Dokumentverwaltung/EmployeePlaceholderManager.cs
View File

@@ -43,13 +43,11 @@ namespace BeWo.Service.Dokumentverwaltung
Children = new List<PlatzhalterDC>(),
IconType = "Home"
};
PlatzhalterDC strasse = new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "MaStrasse", IconType = "AB", FieldName = "Person.Address.Street" };
adressdaten.Children.Add(strasse);
PlatzhalterDC plz = new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "MaPLZ", IconType = "AB", FieldName = "Person.Address.PostalCode" };
adressdaten.Children.Add(plz);
PlatzhalterDC ort = new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "MaOrt", IconType = "AB", FieldName = "Person.Address.Town" };
adressdaten.Children.Add(ort);
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "Adresszusatz", Platzhalter = "MaAdresszusatz", IconType = "AB", FieldName = "Person.Address.Addressline1" });
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "MaStrasse", IconType = "AB", FieldName = "Person.Address.Street" });
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "MaPLZ", IconType = "AB", FieldName = "Person.Address.PostalCode" });
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "MaOrt", IconType = "AB", FieldName = "Person.Address.Town" });
employeedaten.Children.Add(adressdaten);
liste.Add(employeedaten);

10
Service/Dokumentverwaltung/WohnheimPlaceholderManager.cs
View File

@@ -45,6 +45,16 @@ namespace BeWo.Service.Dokumentverwaltung
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Sonstige Kosten", Platzhalter = "WVSonstigeKosten", FieldName = "Person.Wohneinheit.SonstigeKosten", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Kaution", Platzhalter = "WVKaution", FieldName = "Person.Wohneinheit.Kaution", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Zusatz", Platzhalter = "WVZusatz", FieldName = "Person.Wohneinheit.Zusatznotiz", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 1", Platzhalter = "WVDetails1", FieldName = "Person.Wohneinheit.Details1", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 2", Platzhalter = "WVDetails2", FieldName = "Person.Wohneinheit.Details2", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 3", Platzhalter = "WVDetails3", FieldName = "Person.Wohneinheit.Details3", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 4", Platzhalter = "WVDetails4", FieldName = "Person.Wohneinheit.Details4", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 5", Platzhalter = "WVDetails5", FieldName = "Person.Wohneinheit.Details5", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 6", Platzhalter = "WVDetails6", FieldName = "Person.Wohneinheit.Details6", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 7", Platzhalter = "WVDetails7", FieldName = "Person.Wohneinheit.Details7", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 8", Platzhalter = "WVDetails8", FieldName = "Person.Wohneinheit.Details8", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 9", Platzhalter = "WVDetails9", FieldName = "Person.Wohneinheit.Details9", IconType = "AB" });
wohnung.Children.Add(new PlatzhalterDC() { Bezeichnung = "Details 10", Platzhalter = "WVDetails10", FieldName = "Person.Wohneinheit.Details10", IconType = "AB" });
liste.Add(wohnung);

4
Service/Plugins/TranslationDictionary.cs
View File

@@ -94,6 +94,10 @@ namespace BeWo.Service.Plugins
AddOrReplaceTranslation(dict, "EmployeeSchutzstufe", "Schutzstufe");
AddOrReplaceTranslation(dict, "EmployeeBemerkungenSbd", "Allgemeine Bemerkungen");
AddOrReplaceTranslation(dict, "EmployeeViewAdresse", "Adresse");
AddOrReplaceTranslation(dict, "EmployeeViewAdresszusatz", "Adresszusatz");
AddOrReplaceTranslation(dict, "EmployeeViewKontakt", "Kontakt");
AddOrReplaceTranslation(dict, "Zwei Faktor Authentifizierung erforderlich", "Zwei-Faktor-Authentifizierung erforderlich.\nEs wurde ein Code an ownChat gesendet.\n\nBitte geben Sie hier den Code ein:");
AddOrReplaceTranslation(dict, "Kein Chat Code für die Zwei Faktor Authentifizierung gefunden", "Eine Zwei-Faktor-Authentifizierung ist nicht möglich,\nda Sie kein(e) aktive(r) ownChat-Nutzer(in) sind.\nBitte wenden Sie sich an Ihre Administratoren.");

10
Shared/DataContracts/WohneinheitDC.cs
View File

@@ -22,6 +22,16 @@ namespace BS.Shared.DataContracts
[DataMember] public string Mobilierung { get; set; }
[DataMember] public string Zusatznotiz { get; set; }
[DataMember] public string Stock { get; set; }
[DataMember] public string Details1 { get; set; }
[DataMember] public string Details2 { get; set; }
[DataMember] public string Details3 { get; set; }
[DataMember] public string Details4 { get; set; }
[DataMember] public string Details5 { get; set; }
[DataMember] public string Details6 { get; set; }
[DataMember] public string Details7 { get; set; }
[DataMember] public string Details8 { get; set; }
[DataMember] public string Details9 { get; set; }
[DataMember] public string Details10 { get; set; }
[DataMember] public List<WohneinheitBelegungDC> Belegungen { get; set; }
[DataMember] public List<ImageDC> Grundrisse { get; set; }
}