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

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

Browse Source
This commit is contained in:
Alexandra
2022-04-12 14:31:37 +02:00
parent bb964105bd e4cc9ac3a2
commit 6218bfd952
35 changed files with 5599 additions and 3725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BeWo/Scheduler/Utils/AppointmentExtensions.cs
View File

@@ -95,8 +95,13 @@ namespace BeWo.Scheduler.Utils
return appointment.GetCustomFieldStorage()?.HasServiceRecordEntry ?? false;
}
public static bool CF_CanBeEdited(this Appointment appointment)
{
return appointment.GetCustomFieldStorage()?.CanBeEdited ?? false;
}
public static void CF_IsTask(this Appointment appointment, bool pIsTask)
{
appointment.GetCustomFieldStorage().IsTask = pIsTask;

11
BeWo/Scheduler/View/NewSchedulerView.xaml
View File

@@ -70,7 +70,7 @@
Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
</ToolTip>
</ToolTipService.ToolTip>
<!-- Endregion -->
<!-- Endregion -->
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
<dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="2" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor, RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="1" DefaultBorderThickness="1">
<dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
@@ -310,6 +310,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -353,7 +355,6 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!--<Border Grid.Column="0" Background="{Binding Converter={StaticResource NichtNochEinConverter}}" BorderThickness="1" BorderBrush="DimGray" Width="5" Margin="0,0,3,0" />-->
<Border Grid.Column="0" Background="{Binding Converter={StaticResource NichtNochEinConverter}}" BorderThickness="1" BorderBrush="DimGray" Width="5" Margin="0,0,3,0" Visibility="{Binding Path=DataContext.CustomViewInfo[CustomFieldStorage].ToolTipZusageVisibility, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListView}}}" />
<TextBlock Grid.Column="1" Foreground="DimGray" Text="{Binding Converter={StaticResource NichtNochEinConverter}, ConverterParameter=GibName}" />
</Grid>
@@ -364,7 +365,11 @@
<TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="{markup:Translate Klienten:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
<TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Klienten}"
Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
</Grid>
<!-- Separator und "Angelegt von: " mit dem Namen des Originators -->
<Separator Grid.Row="5" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
<TextBlock Margin="0,0,3,0" Grid.Row="6" Grid.Column="0" Text="Angelegt von:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
<TextBlock Margin="0,0,3,0" Grid.Row="6" Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].Originator}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
</Grid>
</DataTemplate>
<!-- DragDropHoverTimeCellsStyle -->

2
BeWo/Scheduler/View/NewSchedulerView.xaml.cs
View File

@@ -1536,7 +1536,7 @@ namespace BeWo.Scheduler.View
var mitarbeiterliste = appointment.CF_EmployeeList();
var istErsteller = ersteller?.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ?? false;
if(!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)))
if(!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !appointment.CF_CanBeEdited())
{
darfTerminDetailsSehen = false;
}

5
BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
View File

@@ -73,6 +73,8 @@ namespace BeWo.Scheduler.ViewModel
public InternalInfo InternalInfo { get; set; }
public bool CanBeEdited { get; set; }
public CustomFieldStorage()
{
@@ -107,6 +109,7 @@ namespace BeWo.Scheduler.ViewModel
_AbsenceTimeEnd = pAppointment.AbsenceTimeEnd;
HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
CanBeEdited = pAppointment.CanBeEdited;
}
public CustomFieldStorage(SchedulerAppointmentDC pAppointment)
@@ -135,6 +138,8 @@ namespace BeWo.Scheduler.ViewModel
RecurrenceIndex = pAppointment.RecurrenceIndex;
HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
CanBeEdited = pAppointment.CanBeEdited;
}
public CustomFieldStorage(ObservableCollection<Employee2SchedulerAppointmentDC> pEmployees, List<CompactCustomerDC> pCustomers, List<ResourceDC> pResources, CompactEmployeeDC pOriginator, bool pIsPrivate, bool pIsTask, string pTaskDescription, DateTime? pDueDate, DateTime? pCompletedDate, string pCompletedNotice, List<CompactSupportConceptDC> pSupportConcepts, string pSubject, bool pIsAllDay)

9
BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
View File

@@ -550,10 +550,14 @@ namespace BeWo.Scheduler.ViewModel
public int RecurrenceIndex => BS.Shared.Core.Utils.GetRecurrenceIndexFromRecurrenceInfo(RecurrenceInfo);
public SchedulerAppointmentVM(SchedulerAppointmentDC pDC) : base(pDC, pDC.SchedulerAppointmentOid == null)
public bool CanBeEdited { get; set; } = true;
public SchedulerAppointmentVM(SchedulerAppointmentDC pDC) : base(pDC, pDC.SchedulerAppointmentOid == null)
{
IsTeilnahmeBestaetigung = pDC.IsTeilnahmeBestaetigung;
}
CanBeEdited = pDC.CanBeEdited;
}
// Wird für Abwesenheiten genutzt
public SchedulerAppointmentVM(bool pAllDay, string pSubject, DateTime pStart, DateTime pEnd, CompactEmployeeDC pOriginator, DateTime? absenceTimeStart, DateTime? absenceTimeEnd)
@@ -604,6 +608,7 @@ namespace BeWo.Scheduler.ViewModel
_HasServiceRecordEntry = pDataContract.HasServiceRecordEntry;
_IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived;
CanBeEdited = pDataContract.CanBeEdited;
if(pDataContract.DueDate.HasValue)

2
Data/Access/SearchDAO.cs
View File

@@ -2631,6 +2631,7 @@ namespace BeWo.Data.Access
return c.List<Customer2Person>();
}
// KALENDER
public IList<SchedulerAppointment> LoadFilteredAppointments(bool pHasRightToSeeAllEmployeeAppointments, long pEmployeeOid, DateTime pIntervalStart, DateTime pIntervalEnd, List<long> pSelectedEmployees, List<long> pSelectedCustomers, List<long> pSelectedResources, bool pEmployeesOnly, bool pCustomersOnly, bool pResourcesOnly, bool pPrivateAppointmentsOnly, bool pOnlyMyAppointments, bool pIncludeInactiveOnes)
{
var recurrenceBetween = Format("'{0:yyyy-MM-dd} 00:00:00' BETWEEN STR_TO_DATE(SUBSTRING({1}, 24, 19), '%m/%d/%Y %H:%i:%s') AND STR_TO_DATE(SUBSTRING({1}, 50, 19), '%m/%d/%Y %H:%i:%s')", pIntervalStart, SchedulerAppointment.PropertyName_RecurrenceInfo);
@@ -2729,6 +2730,7 @@ namespace BeWo.Data.Access
return criteria.List<SchedulerAppointment>();
}
// KALENDER
public IEnumerable<SchedulerAppointment> LoadFilteredAppointmentsForEmployee(bool pHasRightToSeeAllEmployeeAppointments, long? pEmployeeOid, DateTime pIntervalStart, DateTime pIntervalEnd, List<long> pSelectedEmployees, List<long> pSelectedCustomers, List<long> pSelectedResources, bool pEmployeesOnly, bool pCustomersOnly, bool pResourcesOnly, bool pPrivateAppointmentsOnly, bool pOnlyMyAppointments, bool pIncludeInactiveOnes)
{
var mainCriteria = CreateRecurrenceCriteria(pIntervalStart, pIntervalEnd, pIncludeInactiveOnes);

6
Data/DefaultHibernateSessionManager.cs
View File

@@ -78,8 +78,8 @@ namespace BeWo.Data
{
//String path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionFactoryError.txt");
//System.IO.File.AppendAllText(path, String.Format("{0:dd.MM.yyyy HH:mm:ss}", DateTime.Now) + "\n" + e.Message + "\n" + e.StackTrace);
Debug.WriteLine("<<<<< " + e.StackTrace + (e.InnerException != null ? e.InnerException.Message : string.Empty));
throw new FaultException(e.StackTrace + e.InnerException != null ? e.InnerException.Message : string.Empty);
Debug.WriteLine("<<<<< " + e.StackTrace + e.InnerException?.Message ?? string.Empty);
throw new FaultException(e.StackTrace + e.InnerException?.Message ?? string.Empty);
}
finally
{
@@ -170,7 +170,7 @@ namespace BeWo.Data
}
catch (Exception e)
{
throw new FaultException(e.StackTrace + e.InnerException != null ? e.InnerException.Message : string.Empty);
throw new FaultException(e.StackTrace + e.InnerException?.Message ?? string.Empty);
}
}

2
Data/WCFHibernateSessionManager.cs
View File

@@ -157,7 +157,7 @@ namespace BeWo.Data
}
catch (Exception e)
{
throw new FaultException(e.StackTrace + e.InnerException != null ? e.InnerException.Message : string.Empty);
throw new FaultException(e.StackTrace + e.InnerException?.Message ?? string.Empty);
}
}

18
ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.Designer.cs generated
View File

@@ -81,6 +81,7 @@ namespace BeWoWalzPaiva
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.rtAnschrift1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -149,6 +150,7 @@ namespace BeWoWalzPaiva
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel4,
this.xrLabel11,
this.xrLabel10,
this.xrLabel6,
@@ -686,6 +688,21 @@ namespace BeWoWalzPaiva
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 235F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "IK-Nummer: 490 5040 21";
this.xrLabel4.WordWrap = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -766,5 +783,6 @@ namespace BeWoWalzPaiva
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRRichText rtAnschrift1;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
}
}

26
ReportImp/BeWoWalzPaiva/SettlementReport.Designer.cs generated
View File

@@ -106,6 +106,7 @@ namespace BeWoWalzPaiva.Alt
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtAnschrift1)).BeginInit();
@@ -153,7 +154,7 @@ namespace BeWoWalzPaiva.Alt
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 375.3333F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 398.6666F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -284,7 +285,7 @@ namespace BeWoWalzPaiva.Alt
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.3333F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 323.6666F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -294,7 +295,7 @@ namespace BeWoWalzPaiva.Alt
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 290.6667F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -571,6 +572,7 @@ namespace BeWoWalzPaiva.Alt
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel14,
this.xrLabel7,
this.xrLabel9,
this.xrLabel13,
@@ -587,7 +589,7 @@ namespace BeWoWalzPaiva.Alt
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F);
this.GroupHeader1.HeightF = 443.3333F;
this.GroupHeader1.HeightF = 476.6667F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -910,6 +912,21 @@ namespace BeWoWalzPaiva.Alt
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// xrLabel14
//
this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
this.xrLabel14.CanShrink = true;
this.xrLabel14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0001430511F, 242F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel14.StylePriority.UseBackColor = false;
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "IK-Nummer: 490 5040 21";
this.xrLabel14.WordWrap = false;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1018,5 +1035,6 @@ namespace BeWoWalzPaiva.Alt
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
}
}

26
ReportImp/BeWoWalzPaiva/SettlementReport2.Designer.cs generated
View File

@@ -106,6 +106,7 @@ namespace BeWoWalzPaiva
this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rtAnschrift1)).BeginInit();
@@ -152,7 +153,7 @@ namespace BeWoWalzPaiva
// xrTable1
//
this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 375.3333F);
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 395.5416F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
@@ -283,7 +284,7 @@ namespace BeWoWalzPaiva
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.3333F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 320.5416F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -293,7 +294,7 @@ namespace BeWoWalzPaiva
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 287.5417F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F);
@@ -570,6 +571,7 @@ namespace BeWoWalzPaiva
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel14,
this.xrLabel7,
this.xrLabel9,
this.xrLabel13,
@@ -586,7 +588,7 @@ namespace BeWoWalzPaiva
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F);
this.GroupHeader1.HeightF = 443.3333F;
this.GroupHeader1.HeightF = 473.5417F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -910,6 +912,21 @@ namespace BeWoWalzPaiva
this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell58.Weight = 0.21685899000901443D;
//
// xrLabel14
//
this.xrLabel14.BackColor = System.Drawing.Color.Transparent;
this.xrLabel14.CanShrink = true;
this.xrLabel14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel14.StylePriority.UseBackColor = false;
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.Text = "IK-Nummer: 490 5040 21";
this.xrLabel14.WordWrap = false;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1018,5 +1035,6 @@ namespace BeWoWalzPaiva
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
}
}

505
ReportImp/ChristopherusHausFamilienhilfe/Einsatzzeiten.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

42
ReportImp/ChristopherusHausFamilienhilfe/Einsatzzeiten.cs
View File

@@ -33,6 +33,7 @@ namespace ChristopherusHausFamilienhilfe
DateTime end = ro.EndDate;
int row = start.Day + 1;
// Spalte 0 und 2 setzen (Kalenderwoche und Monat
while (start <= end)
{
row = start.Day + 1; ;
@@ -84,6 +85,7 @@ namespace ChristopherusHausFamilienhilfe
}
// Kernmethode, die jede Zeile setzt
private void AddDetailToTable(ServicesOverviewRO ro, ServicesOverviewRO.ServiceDetail sd)
{
@@ -99,8 +101,8 @@ namespace ChristopherusHausFamilienhilfe
if (cont)
SetTableText(table, start, sd.ServiceCategory, sd.ServiceDescription);
table.Rows[row].Cells[12].Text = sd.Notice2; //die Beteiligten können aus der Familie oder Fremde sein - Freitext
table.Rows[row].Cells[12].Text = table.Rows[row].Cells[12].Text.IsNullOrEmpty() ? sd.Notice2 : "\n" + sd.Notice2; //die Beteiligten können aus der Familie oder Fremde sein - Freitext
// ACHTUNG ToDo - bei Tandem gehen zwei Betreuer rein und werden bezahlt -
if (sd.IsGroup && sd.ServiceDescription.ToLower().Contains("tandem"))
{
@@ -112,20 +114,22 @@ namespace ChristopherusHausFamilienhilfe
{
if (gsr.Employee.Person.Abbreviation == null || gsr.Employee.Person.Abbreviation.Length == 0)
secEmp += " ," + gsr.Employee.Person.FirstName.Substring(0, 1) + ". " + gsr.Employee.Person.LastName;
else
else
secEmp += " ," + gsr.Employee.Person.Abbreviation;
}
}
table.Rows[row].Cells[13].Text = sd.EmployeeAbbr + secEmp;
}
//Service = DAOFactory.GenericDAO.LoadByID<Employee>(group.Oid.Value);
else
table.Rows[row].Cells[13].Text = sd.EmployeeAbbr;
table.Rows[row].Cells[14].Text = String.Format("{0:HH:mm}", sd.StartDateMinutes);
table.Rows[row].Cells[15].Text = String.Format("{0:HH:mm}", sd.EndDateMinutes);
table.Rows[row].Cells[16].Text = String.Format("{0:0.00}", (sd.Minutes / 60));
table.Rows[row].Cells[17].Text = sd.Notice;
//else
//{
table.Rows[row].Cells[13].Text += table.Rows[row].Cells[13].Text.IsNullOrEmpty() ? sd.EmployeeAbbr : "\n" + sd.EmployeeAbbr;
//}
table.Rows[row].Cells[14].Text += table.Rows[row].Cells[14].Text.IsNullOrEmpty() ? String.Format("{0:HH:mm}", sd.StartDateMinutes) : String.Format("\n{0:HH:mm}", sd.StartDateMinutes);
table.Rows[row].Cells[15].Text += table.Rows[row].Cells[15].Text.IsNullOrEmpty() ? String.Format("{0:HH:mm}", sd.EndDateMinutes) : String.Format("\n{0:HH:mm}", sd.EndDateMinutes);
table.Rows[row].Cells[16].Text += table.Rows[row].Cells[16].Text.IsNullOrEmpty() ? String.Format("{0:0.00}", sd.Minutes / 60) : String.Format("\n{0:0.00}", sd.Minutes / 60);
table.Rows[row].Cells[17].Text += table.Rows[row].Cells[17].Text.IsNullOrEmpty() ? sd.Notice : "\n" + sd.Notice;
stundenGesamt += sd.Minutes / 60;
@@ -143,23 +147,23 @@ namespace ChristopherusHausFamilienhilfe
String beschreibung = serviceDescription.ToLower().Trim();
if (beschreibung.Contains("face"))
table.Rows[row].Cells[3].Text = "x";
table.Rows[row].Cells[3].Text += table.Rows[row].Cells[3].Text.IsNullOrEmpty() ? "x" : " x";
else if (beschreibung.Contains("ear"))
table.Rows[row].Cells[4].Text = "x";
table.Rows[row].Cells[4].Text += table.Rows[row].Cells[4].Text.IsNullOrEmpty() ? "x" : " x";
if (beschreibung.Contains("tandem"))
table.Rows[row].Cells[5].Text = "x";
table.Rows[row].Cells[5].Text += table.Rows[row].Cells[5].Text.IsNullOrEmpty() ? "x" : " x";
if (beschreibung.Contains("familie"))
table.Rows[row].Cells[6].Text = "x";
table.Rows[row].Cells[6].Text += table.Rows[row].Cells[6].Text.IsNullOrEmpty() ? "x" : " x";
else if (beschreibung.Contains("kita"))
table.Rows[row].Cells[6].Text = "x";
table.Rows[row].Cells[7].Text += table.Rows[row].Cells[7].Text.IsNullOrEmpty() ? "x" : " x";
else if (beschreibung.Contains("arzt"))
table.Rows[row].Cells[8].Text = "x";
table.Rows[row].Cells[8].Text += table.Rows[row].Cells[8].Text.IsNullOrEmpty() ? "x" : " x";
else if (beschreibung.Contains("sonstige"))
table.Rows[row].Cells[9].Text = "x";
table.Rows[row].Cells[9].Text += table.Rows[row].Cells[9].Text.IsNullOrEmpty() ? "x" : " x";
else if (beschreibung.Contains("dokumentation"))
table.Rows[row].Cells[10].Text = "x";
table.Rows[row].Cells[10].Text += table.Rows[row].Cells[10].Text.IsNullOrEmpty() ? "x" : " x";
else if (beschreibung.Contains("hpg"))
table.Rows[row].Cells[11].Text = "x";
table.Rows[row].Cells[11].Text += table.Rows[row].Cells[11].Text.IsNullOrEmpty() ? "x" : " x";
}
private static int GetKW(DateTime actualDate)

27
ReportImp/ChristopherusHausFamilienhilfe/ServiceInvoiceReport.Designer.cs generated
View File

@@ -98,8 +98,6 @@ namespace ChristopherusHausFamilienhilfe
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
@@ -388,7 +386,7 @@ namespace ChristopherusHausFamilienhilfe
this.lblBewFLS.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblBewFLS.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ApprovedHours", "{0:#.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.SupportConceptApprovalPeriod.ApprovedBEPerInterval", "{0:#.00}")});
this.lblBewFLS.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblBewFLS.Name = "lblBewFLS";
this.lblBewFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -1026,9 +1024,8 @@ namespace ChristopherusHausFamilienhilfe
this.xrTableRow2,
this.xrTableRow12,
this.xrTableRow13,
this.xrTableRow4,
this.xrTableRow5});
this.xrTable2.SizeF = new System.Drawing.SizeF(200.8751F, 94.00001F);
this.xrTableRow4});
this.xrTable2.SizeF = new System.Drawing.SizeF(200.8751F, 77.00001F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
//
@@ -1109,24 +1106,10 @@ namespace ChristopherusHausFamilienhilfe
this.xrTableCell5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Mobiltelefon 1: 01577-6087778";
this.xrTableCell5.Text = "Mobiltelefon: 01577-6087778";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell5.Weight = 1D;
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell6});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.11258278145695365D;
//
// xrTableCell6
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell6.Text = "Mobiltelefon 2: 01577-3862385";
this.xrTableCell6.Weight = 1D;
//
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None;
@@ -1550,8 +1533,6 @@ namespace ChristopherusHausFamilienhilfe
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;

86
ReportImp/IlkaLinkAmbulanteHilfen/Quittierungsbeleg.Designer.cs generated
View File

@@ -69,7 +69,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel();
this.lblBetreuungsart = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
@@ -155,6 +155,7 @@ namespace IlkaLinkAmbulanteHilfen
this.TotalFLSBillable = new DevExpress.XtraReports.UI.CalculatedField();
this.formattingRuleZwischensummeSichtbar = new DevExpress.XtraReports.UI.FormattingRule();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.pb_Link = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -289,7 +290,7 @@ namespace IlkaLinkAmbulanteHilfen
// xrTableCell15
//
this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerCity", "{0:0}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice", "{0:0}")});
this.xrTableCell15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.StylePriority.UseBorders = false;
@@ -302,7 +303,7 @@ namespace IlkaLinkAmbulanteHilfen
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CustomerCount", "{0:0.##}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2", "{0:0.##}")});
this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F);
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseBorders = false;
@@ -641,7 +642,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel31,
this.xrLabel32,
this.xrLabel29,
this.xrLabel30,
this.lblBetreuungsart,
this.xrLabel27,
this.xrLabel28,
this.xrLabel26,
@@ -659,7 +660,7 @@ namespace IlkaLinkAmbulanteHilfen
//
this.xrLabel31.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel31.ForeColor = System.Drawing.Color.Black;
this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 176.0417F);
this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(504.6806F, 176.0417F);
this.xrLabel31.Multiline = true;
this.xrLabel31.Name = "xrLabel31";
this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -675,7 +676,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel32.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel32.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel32.ForeColor = System.Drawing.Color.Black;
this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(618.0139F, 176.0417F);
this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(648.2222F, 176.0417F);
this.xrLabel32.Multiline = true;
this.xrLabel32.Name = "xrLabel32";
this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -702,26 +703,25 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel29.Text = "Betreuungsart:";
this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel30
// lblBetreuungsart
//
this.xrLabel30.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel30.ForeColor = System.Drawing.Color.Black;
this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(143.5417F, 176.0417F);
this.xrLabel30.Multiline = true;
this.xrLabel30.Name = "xrLabel30";
this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel30.SizeF = new System.Drawing.SizeF(271.4584F, 25F);
this.xrLabel30.StylePriority.UseFont = false;
this.xrLabel30.StylePriority.UseForeColor = false;
this.xrLabel30.StylePriority.UseTextAlignment = false;
this.xrLabel30.Text = "Sozialpädagogische Familienhilfe";
this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
this.lblBetreuungsart.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.lblBetreuungsart.ForeColor = System.Drawing.Color.Black;
this.lblBetreuungsart.LocationFloat = new DevExpress.Utils.PointFloat(143.5417F, 176.0417F);
this.lblBetreuungsart.Multiline = true;
this.lblBetreuungsart.Name = "lblBetreuungsart";
this.lblBetreuungsart.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblBetreuungsart.SizeF = new System.Drawing.SizeF(322.3607F, 25F);
this.lblBetreuungsart.StylePriority.UseFont = false;
this.lblBetreuungsart.StylePriority.UseForeColor = false;
this.lblBetreuungsart.StylePriority.UseTextAlignment = false;
this.lblBetreuungsart.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel27
//
this.xrLabel27.Font = new System.Drawing.Font("Arial", 12F);
this.xrLabel27.ForeColor = System.Drawing.Color.Black;
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 132.2916F);
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(504.6806F, 132.2916F);
this.xrLabel27.Multiline = true;
this.xrLabel27.Name = "xrLabel27";
this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -739,7 +739,7 @@ namespace IlkaLinkAmbulanteHilfen
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.xrLabel28.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel28.ForeColor = System.Drawing.Color.Black;
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(618.0139F, 132.2916F);
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(648.2222F, 132.2916F);
this.xrLabel28.Multiline = true;
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -761,7 +761,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrLabel26.Multiline = true;
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(271.4584F, 25F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(322.3607F, 25F);
this.xrLabel26.StylePriority.UseBorders = false;
this.xrLabel26.StylePriority.UseFont = false;
this.xrLabel26.StylePriority.UseForeColor = false;
@@ -838,13 +838,15 @@ namespace IlkaLinkAmbulanteHilfen
//
// xrLabel20
//
this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer")});
this.xrLabel20.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.xrLabel20.ForeColor = System.Drawing.Color.Black;
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 25F);
this.xrLabel20.Multiline = true;
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(320F, 25F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(406.6902F, 25F);
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.StylePriority.UseForeColor = false;
this.xrLabel20.StylePriority.UseTextAlignment = false;
@@ -889,7 +891,7 @@ namespace IlkaLinkAmbulanteHilfen
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.HeightF = 37.50001F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -923,8 +925,9 @@ namespace IlkaLinkAmbulanteHilfen
this.xrTable7,
this.xrTable6,
this.xrTable5,
this.xrTable4});
this.GroupFooter1.HeightF = 318.1459F;
this.xrTable4,
this.pb_Link});
this.GroupFooter1.HeightF = 278.9302F;
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
//
@@ -1014,7 +1017,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image")));
this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(549.7717F, 188.1459F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(149.0623F, 69.02275F);
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(149.0623F, 64.99997F);
this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrTable15
@@ -1075,11 +1078,11 @@ namespace IlkaLinkAmbulanteHilfen
//
this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(535.1435F, 243.5854F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(535.1349F, 253.1459F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(222.9027F, 24F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(222.9027F, 14.43945F);
this.xrLabel2.StylePriority.UseBorders = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
@@ -1090,11 +1093,11 @@ namespace IlkaLinkAmbulanteHilfen
//
this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(242.9998F, 243.5853F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(242.9998F, 253.1459F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(222.9027F, 24F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(222.9027F, 14.43945F);
this.xrLabel12.StylePriority.UseBorders = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UseTextAlignment = false;
@@ -1105,11 +1108,11 @@ namespace IlkaLinkAmbulanteHilfen
//
this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 243.5854F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.009448439F, 253.1459F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(125F, 24F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(125F, 14.43945F);
this.xrLabel11.StylePriority.UseBorders = false;
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
@@ -1289,7 +1292,7 @@ namespace IlkaLinkAmbulanteHilfen
this.xrTableCell26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell26.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell26.StylePriority.UseBorders = false;
this.xrTableCell26.StylePriority.UseFont = false;
this.xrTableCell26.StylePriority.UsePadding = false;
@@ -1573,7 +1576,7 @@ namespace IlkaLinkAmbulanteHilfen
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerMonth", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CostBearer2SupportConceptList.ApprovalPeriodList.ApprovedBEPerInterval", "{0:0.00}")});
this.xrTableCell16.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.StylePriority.UseFont = false;
@@ -1737,6 +1740,14 @@ namespace IlkaLinkAmbulanteHilfen
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// pb_Link
//
this.pb_Link.Image = ((System.Drawing.Image)(resources.GetObject("pb_Link.Image")));
this.pb_Link.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.1459F);
this.pb_Link.Name = "pb_Link";
this.pb_Link.SizeF = new System.Drawing.SizeF(140.7525F, 65F);
this.pb_Link.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1759,7 +1770,7 @@ namespace IlkaLinkAmbulanteHilfen
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName,
this.formattingRuleZwischensummeSichtbar});
this.Margins = new System.Drawing.Printing.Margins(50, 35, 100, 30);
this.Margins = new System.Drawing.Printing.Margins(50, 35, 38, 30);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4Rotated;
@@ -1820,7 +1831,7 @@ namespace IlkaLinkAmbulanteHilfen
private DevExpress.XtraReports.UI.XRLabel xrLabel27;
private DevExpress.XtraReports.UI.XRLabel xrLabel28;
private DevExpress.XtraReports.UI.XRLabel xrLabel29;
private DevExpress.XtraReports.UI.XRLabel xrLabel30;
private DevExpress.XtraReports.UI.XRLabel lblBetreuungsart;
private DevExpress.XtraReports.UI.XRLabel xrLabel31;
private DevExpress.XtraReports.UI.XRLabel xrLabel32;
private DevExpress.XtraReports.UI.XRTable xrTable1;
@@ -1909,5 +1920,6 @@ namespace IlkaLinkAmbulanteHilfen
private DevExpress.XtraReports.UI.XRPictureBox pb_Jadczak;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRPictureBox pb_Link;
}
}

36
ReportImp/IlkaLinkAmbulanteHilfen/Quittierungsbeleg.cs
View File

@@ -26,7 +26,8 @@ namespace IlkaLinkAmbulanteHilfen
bool hatGruppen = false;
tc_Bemerkungen.Text = pRO.CostBearer2SupportConceptList[0]?.SupportConcept?.Notice;
if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0)
tc_Bemerkungen.Text = pRO.CostBearer2SupportConceptList[0].SupportConcept?.Notice;
if (pRO.Services != null)
{
@@ -39,7 +40,6 @@ namespace IlkaLinkAmbulanteHilfen
ServicesOverviewRO.CreateSignatureString(sd);
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
hatGruppen = true;
}
@@ -50,6 +50,22 @@ namespace IlkaLinkAmbulanteHilfen
pRO.Services = servicesBillable;
}
foreach (var cb2sc in pRO.CostBearer2SupportConceptList)
{
if (cb2sc.CostBearer.Organisation.Name == pRO.Costbearer)
{
for (int i = 0; i < cb2sc.ApprovalPeriodList.Count; i++)
{
var item = cb2sc.ApprovalPeriodList[i];
lblBetreuungsart.Text += i != cb2sc.ApprovalPeriodList.Count - 1 ? item.ServiceCategory?.Name + ", " : item.ServiceCategory?.Name;
}
break;
}
}
decimal summeHauptbetreuerminuten = 0;
decimal summeVertretungsstunden = 0;
decimal summeGesamt = 0;
@@ -69,27 +85,39 @@ namespace IlkaLinkAmbulanteHilfen
summeGesamt += Convert.ToDecimal(item.Minutes) / 60;
}
//tc_Vertetungsauflistung.Text = alleVertretungen;
tc_Hauptbetreuerstunden.Text = string.Format("{0:0.00}", summeHauptbetreuerminuten);
tc_Vertretungsstunden.Text = string.Format("{0:0.00}", summeVertretungsstunden);
tc_MehrMinderStunden.Text = string.Format("{0:0.00}", Convert.ToDecimal(pRO.TotalFLS) - pRO.ApprovedFLSPerMonth);
tc_MehrMinderStunden.Text = pRO.CostBearer2SupportConceptList.Count == 0 ? string.Format("{0:0.00}", Convert.ToDecimal(pRO.TotalFLS) - pRO.ApprovedFLSPerMonth) :
string.Format("{0:0.00}", Convert.ToDecimal(pRO.TotalFLS) - pRO.CostBearer2SupportConceptList[0].ApprovalPeriodList[0].ApprovedBEPerInterval);
// Wenn es eine Vertretung gibt, wird wohl keine Unterschrift angezeigt.
if (pRO.MainAttendant != null)
{
if (pRO.MainAttendant.ToLower().Contains("herrera"))
{
pb_Herrera.Visible = true;
pb_Jadczak.Visible = false;
pb_Link.Visible = false;
}
else if (pRO.MainAttendant.ToLower().Contains("jadczak"))
{
pb_Jadczak.Visible = true;
pb_Herrera.Visible = false;
pb_Link.Visible = false;
}
else if (pRO.MainAttendant.ToLower().Contains("link"))
{
pb_Link.Visible = true;
pb_Jadczak.Visible = false;
pb_Herrera.Visible = false;
}
else
{
pb_Jadczak.Visible = false;
pb_Herrera.Visible = false;
pb_Link.Visible = false;
}
}

1400
ReportImp/IlkaLinkAmbulanteHilfen/Quittierungsbeleg.resx
View File

File diff suppressed because it is too large Load Diff

BIN
ReportImp/TeamPfeil/Logo_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

1508
ReportImp/TeamPfeil/ServiceInvoiceReport.resx
View File

File diff suppressed because it is too large Load Diff

1508
ReportImp/TeamPfeil/SettlementReport.resx
View File

File diff suppressed because it is too large Load Diff

3
ReportImp/VSDHammReports/Budgetnachweis.cs
View File

@@ -25,7 +25,10 @@ namespace VSDHammReports.Alt
lblZad.Text = "60 - 9011896.1";
}
else
{
lblZad.Text = "60-9011897.1";
pRO.RecordedFLSTotal *= 1.2;
}
foreach (var ii in pRO.InvoiceItems)
{

11
ReportImp/VSDHammReports/Budgetnachweis.designer.cs generated
View File

@@ -118,11 +118,11 @@ namespace VSDHammReports.Alt
this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = 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.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
@@ -1060,7 +1060,6 @@ namespace VSDHammReports.Alt
this.xrLabel20.StylePriority.UseBackColor = false;
this.xrLabel20.StylePriority.UseBorders = false;
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = "Hamm,";
this.xrLabel20.WordWrap = false;
//
// xrLabel19
@@ -1174,6 +1173,10 @@ namespace VSDHammReports.Alt
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell16.Weight = 0.21685899000901443D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1222,10 +1225,6 @@ namespace VSDHammReports.Alt
this.xrCheckBox2.StylePriority.UseFont = false;
this.xrCheckBox2.Text = " Die Betreuung dauert an.";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// Budgetnachweis
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

1
ReportImp/VSDHammReports/Budgetnachweis2.Designer.cs generated
View File

@@ -319,7 +319,6 @@ namespace VSDHammReports
this.xrLabel20.StylePriority.UseBackColor = false;
this.xrLabel20.StylePriority.UseBorders = false;
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = "Hamm,";
this.xrLabel20.WordWrap = false;
//
// xrLabel19

3
ReportImp/VSDHammReports/Budgetnachweis2.cs
View File

@@ -27,7 +27,10 @@ namespace VSDHammReports
lblZad.Text = "60 - 9011896.1";
}
else
{
lblZad.Text = "60-9011897.1";
pRO.RecordedFlsTotal *= 1.2m;
}
//if (!pRO.HourlyRateNew.HasValue && pRO.DifferentHourlyRateCount > 0 && pRO.InvoiceItems != null &&
// pRO.InvoiceItems.Count > 0)

1962
ReportImp/VSDHammReports/SettlementReport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

1972
ReportImp/VSDHammReports/SettlementReport2.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
ReportImp/VaroSozialagentur/Invoicing/CustomInvoiceCreation.cs
View File

@@ -244,7 +244,7 @@ namespace VaroSozialagentur.Invoicing
{
invoiceItem.ItemDescription = "Direkte Leistungen";
invoiceItem.UnitDescription = "Fachleistungsstunde (FLS)";
}
}
else if (cat == "Fahrtkosten")
{
return null;

19
ReportImp/WegweiserBetreuungsdienstReports/LeistungsnachweisSoziotherapie.cs
View File

@@ -31,10 +31,29 @@ namespace BeWo.WegweiserBetreuungsdienstReports
s.Notice5 = "E";
else
s.Notice5 = "G";
//if (s.ServiceDescription.Contains("Video"))
//{
// s.ServiceDescription = "V";
//}
//else if (s.ServiceDescription.Contains("Telefon"))
//{
// s.ServiceDescription = "T";
//}
//else if (s.ServiceDescription.Contains("Einrichtung"))
//{
// s.ServiceDescription = "E";
//}
//else
//{
// s.ServiceDescription = "A";
//}
}
}
cellGesamt.Text = String.Format("{0:0.00}", gesamt / 60);
//SetzeAdresseUndIk(pRO);

1
Service/DCEntityMapper/CompactEmployeeDC_Employee.cs
View File

@@ -19,6 +19,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.ActivationType = pEntity.IsActive;
pDataContract.ValueListEntries = pEntity.ValueList.ToDictionary(i => i.Entry.Oid.Value, i => i.Entry.Type);
pDataContract.EmployeeColor = pEntity.EmployeeColor;
pDataContract.RelatedCustomerOIDList = pEntity.Employee2CustomerList.Where(w => w.CustomerOid.HasValue).Select(s => s.CustomerOid.Value).ToList();
return pDataContract;
}

2
Service/DCEntityMapper/SchedulerAppointmentDC_SchedulerAppointment.cs
View File

@@ -51,6 +51,8 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.ActivationType = pEntity.IsActive;
pDataContract.CanBeEdited = true;
return pDataContract;
}

2
Service/Plugins/PluginLoader.cs
View File

@@ -298,7 +298,7 @@ namespace BeWo.Service.Plugins
//t = "3640152169"; // Claudia Charisius
//t = "3884496709"; // Wahl e.V.
//t = "3536079480"; // Behindertenhilfe Menden
//t = "5427523619"; // ChristopherusHausFamilienhilfe
t = "5427523619"; // ChristopherusHausFamilienhilfe
//t = "8251343124"; // Rat Plus Tat
//t = "6819347851"; // Awo Kreisverband Plön
//t = "2385915144"; // AKGG GmbHd

65
Service/Plugins/VacationService.cs
View File

@@ -705,6 +705,69 @@ namespace BeWo.Service.Plugins
}
}
internal decimal BerechneAnzahlUrlaubstageMitWeeklyDays(AbsenceTimeDC absenceDC, int year, int weeklyDays)
{
decimal tage = 0;
if (absenceDC.Start.HasValue)
{
DateTime start = (absenceDC.Start.Value.Year == year) ? absenceDC.Start.Value : new DateTime(year, 1, 1);
DateTime end = start;
DateTime maxend = new DateTime(year, 12, 31);
if (absenceDC.End.HasValue)
{
end = absenceDC.End.Value;
}
if (maxend < end)
{
end = maxend;
}
decimal tageInEinerWoche = 0; // Tage für die Ist- und Sollstunden
int wochentageVergangen = 0; // Vergangene Wochentage
while (start <= end)
{
// Wenn Wochentag Montag ist, werden Tage einer Woche resetted und die vergangenen Arbeitstage
var wochentag = start.DayOfWeek;
if (wochentag == DayOfWeek.Monday)
{
tageInEinerWoche = 0;
wochentageVergangen = 0;
}
if (!IstFeiertag(start))
{
if (wochentageVergangen < weeklyDays)
{
// Wenn nur ein halber Tag, dann..
if (start.Date == end.Date && start.TimeOfDay != end.TimeOfDay)
{
tageInEinerWoche += 0.5m;
if (tageInEinerWoche >= weeklyDays)
tage += tageInEinerWoche > weeklyDays ? 0 - tage + weeklyDays : 0.5m;
else
tage += 0.5m;
}
else
{
tageInEinerWoche++;
if (tageInEinerWoche >= weeklyDays)
tage += tageInEinerWoche > weeklyDays ? 0 - tage + weeklyDays : 1;
else
tage++;
}
}
wochentageVergangen++;
}
start = start.AddDays(1);
}
}
return tage;
}
// Methode zur Berechnung der Urlaubstage, wenn Vertrag mitten im Jahr beginnt oder endet.
// BSP: 30 Urlaubstage, Beginn am 01.06.; Dann entfallen eine bestimmte Anzahl an Tagen, das wird hier berechnet
private decimal CalcCorrectNumberOfLeaveDaysForSpecialContractSituation(DateTime entryDate, DateTime? endDate, int anzahlArbeitstage, int restlicheTageImJahr, decimal? urlaubstageProJahr)
@@ -789,7 +852,7 @@ namespace BeWo.Service.Plugins
while (start <= end)
{
if (start.DayOfWeek != DayOfWeek.Saturday && start.DayOfWeek != DayOfWeek.Sunday && !IstFeiertag(start))
if (/*start.DayOfWeek != DayOfWeek.Saturday && start.DayOfWeek != DayOfWeek.Sunday &&*/ !IstFeiertag(start))
{
if (start.Date == end.Date && start.TimeOfDay != end.TimeOfDay)
days += 0.5m;

32
Service/ServiceImplementations/ResourceServiceImp.cs
View File

@@ -1236,13 +1236,31 @@ namespace BeWo.Service.ServiceImplementations
if(user != null)
{
result = result.Where(w => BS.Shared.Core.Utils.CheckSchedulerRights(w, SchedulerRightsCheckType.View, user)).ToList();
// Bei ausgewählten Ressourcen oder auch "Nur Ressourcen" werden auch Termine mit den ausgewählten Ressourcen geladen und anonymisiert angezeigt, die der angemeldete Mitarbeiter nicht sehen darf.
var appointmentsToCheckForAnonymization = pSelectedResources.Any() || pResourcesOnly ? result.Where(w => w.ResourceList.Any() && false == SUtils.CheckSchedulerRights(w, SchedulerRightsCheckType.View, user)).ToList() : new List<SchedulerAppointmentDC>();
if(appointmentsToCheckForAnonymization.Any())
{
foreach(var a in appointmentsToCheckForAnonymization)
{
a.Subject = "Anonymisiert";
a.Location = "Anonymisiert";
a.Description = "Anonymisiert";
a.CanBeEdited = false;
a.CustomerList.Clear();
a.EmployeeList.Clear();
}
}
// Es wird nach zugewiesenen Rechten gefiltert und ob die Termine bereits in der Liste mit den anonymisierten Terminen sind.
result = result.Where(w => (!w.ResourceList.Any() || SUtils.CheckSchedulerRights(w, SchedulerRightsCheckType.View, user)) && !appointmentsToCheckForAnonymization.Any(a => a.SchedulerAppointmentOid == w.SchedulerAppointmentOid)).ToList();
result.AddRange(appointmentsToCheckForAnonymization);
}
// Aufgaben laden
ConvertOldTasks(pEmployeeOid);
var taskAppointmentDCs = MapperFactory.SchedulerAppointmentDCSchedulerAppointment.MapToNewDCs(DAOFactory.SearchDAO.LoadTaskAppointmentsForEmployee(pEmployeeOid, true));
result.AddRangeIfElementsNotIn(taskAppointmentDCs);
@@ -1410,10 +1428,12 @@ namespace BeWo.Service.ServiceImplementations
private static List<SchedulerAppointmentDC> FilterAppointments(IEnumerable<SchedulerAppointmentDC> pAppointments, long pEmployeeOid, ICollection<long> pFilteredEmployeeOids, ICollection<long> pSelectedCustomers, ICollection<long> pSelectedResources, bool pCustomersOnly, bool pResourcesOnly, bool pShowTasks = false)
{
var result = new List<SchedulerAppointmentDC>();
foreach(var app in pAppointments)
{
var add = true;
if(app.Originator != null && app.Originator.EmployeeOid == pEmployeeOid)
{
if(app.EmployeeList != null && app.EmployeeList.Count > 0)
@@ -1429,6 +1449,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
// ToDo: Nicht herausnehmen, wenn Ressource in SelectedResources vorhanden ist.
//Prüfe Klientenfilter
if(!add)
{
@@ -1478,6 +1499,11 @@ namespace BeWo.Service.ServiceImplementations
add = false;
}
if(app.SchedulerAppointmentOid == 21852)
{
}
if(add)
{
result.Add(app);

19
Shared/Core/Utils.cs
View File

@@ -668,6 +668,8 @@ namespace BS.Shared.Core
public static bool CheckSchedulerRights(List<CompactCustomerDC> pCustomerList, List<ResourceDC> pResourceList, List<Employee2SchedulerAppointmentDC> pEmployeeList, CompactEmployeeDC pOriginator, bool pIsNew, SchedulerRightsCheckType pCheckType, UserDC pLoggedOnUser)
{
// ToDo: Ressourcentermine anzeigen und gegebenenfalls zensieren, falls eine Ressource daraus in der Auswahlliste ist.
var loggedInEmployee = pLoggedOnUser.Employee;
var isAllowedToViewEverything = pLoggedOnUser.HasRight(UserRightType.ViewAll);
@@ -679,23 +681,24 @@ namespace BS.Shared.Core
pLoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers);
var isAllowedToViewAllCustomerAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderKliententermineAlleAnsehen);
var isAllowedToCreateCustomerAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderKliententermineAnlegen);
var isAllowedToEditCustomerAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderKliententermineAendern);
var isAllowedToCreateCustomerAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderKliententermineAnlegen);
var isAllowedToEditCustomerAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderKliententermineAendern);
var isAllowedToViewEmployeeAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen);
var isAllowedToViewEmployeeAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen);
var isAllowedToCreateEmployeeAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnlegen);
var isAllowedToEditEmployeeAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAendern);
var isAllowedToEditEmployeeAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAendern);
var isAllowedToViewResourceAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnsehen);
var isAllowedToCreateResourceAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnlegen);
var isAllowedToEditResourceAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAendern);
var isAllowedToViewResourceAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnsehen);
var isAllowedToCreateResourceAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnlegen);
var isAllowedToEditResourceAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAendern);
var isAllowedToEditOtherEmployeesResourceAppointments = pLoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAndererAendern);
var hasEmployees = pEmployeeList?.Count > 0;
var hasCustomers = pCustomerList?.Count > 0;
var hasResources = pResourceList?.Count > 0;
var hasOnlyOwnCustomers = pCustomerList?.All(c => c.IsRelatedToEmployee) ?? false;
// Prüfen, ob die Klienten alle in der Liste des Employees sind!
var hasOnlyOwnCustomers = pCustomerList?.All(c => loggedInEmployee.RelatedCustomerOIDList.Contains(c.CustomerOid)) ?? false;
var isOwnAppointment = Equals(pOriginator, loggedInEmployee);
var employeeListOnlyContainsEmployee = pEmployeeList?.Count == 1 && pEmployeeList[0].Employee.Equals(loggedInEmployee);

2
Shared/DataContracts/SchedulerAppointmentDC.cs
View File

@@ -101,6 +101,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public bool HasServiceRecordEntry { get; set; }
[DataMember]
public bool CanBeEdited { get; set; } = true;
public override bool Equals(object obj)
{