diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 76645e4f7..f07fe0729 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -816,6 +816,7 @@
+
UploadDialog.xaml
@@ -2491,392 +2492,392 @@
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
diff --git a/BeWo/View/Controls/DPCtrlEmployee.cs b/BeWo/View/Controls/DPCtrlEmployee.cs
index 0c0f9c407..7a1399c30 100644
--- a/BeWo/View/Controls/DPCtrlEmployee.cs
+++ b/BeWo/View/Controls/DPCtrlEmployee.cs
@@ -110,44 +110,44 @@ namespace BeWo.View.Controls
case 0: return EmployeeInformation.Employee.LastNameFirstName;
//Auskommentieren für nur eine Zeile
- case 1:
+ //case 1:
- foreach (var contract in EmployeeInformation.Contracts)
- {
- sb.Append(contract.EmploymentType?.Name);
- sb.Append('/');
- }
+ // foreach (var contract in EmployeeInformation.Contracts)
+ // {
+ // sb.Append(contract.EmploymentType?.Name);
+ // sb.Append('/');
+ // }
- sb.Remove(sb.Length - 1, 1);
+ // sb.Remove(sb.Length - 1, 1);
- return sb.ToString();
+ // return sb.ToString();
- case 2:
+ //case 2:
- foreach (var contract in EmployeeInformation.Contracts)
- {
- sb.Append('(');
+ // foreach (var contract in EmployeeInformation.Contracts)
+ // {
+ // sb.Append('(');
- if (contract.EntryDate.HasValue)
- sb.Append(contract.EntryDate.Value.ToString("dd.MM.yy"));
- else
- sb.Append("k.A.");
+ // if (contract.EntryDate.HasValue)
+ // sb.Append(contract.EntryDate.Value.ToString("dd.MM.yy"));
+ // else
+ // sb.Append("k.A.");
- sb.Append(" - ");
+ // sb.Append(" - ");
- if (contract.ContractEndDate.HasValue)
- sb.Append(contract.ContractEndDate.Value.ToString("dd.MM.yy"));
- else
- sb.Append("unbefr.");
+ // if (contract.ContractEndDate.HasValue)
+ // sb.Append(contract.ContractEndDate.Value.ToString("dd.MM.yy"));
+ // else
+ // sb.Append("unbefr.");
- sb.Append(')');
+ // sb.Append(')');
- sb.Append('/');
- }
+ // sb.Append('/');
+ // }
- sb.Remove(sb.Length - 1, 1);
+ // sb.Remove(sb.Length - 1, 1);
- return sb.ToString();
+ // return sb.ToString();
}
}
diff --git a/BeWo/View/Detail/Report/AbwesenheitsView.xaml b/BeWo/View/Detail/Report/AbwesenheitsView.xaml
index c1747f7f5..096a87bd5 100644
--- a/BeWo/View/Detail/Report/AbwesenheitsView.xaml
+++ b/BeWo/View/Detail/Report/AbwesenheitsView.xaml
@@ -41,7 +41,80 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -96,9 +169,9 @@
x:Name="_SchedulerControl" ActiveViewType="Timeline" Visibility="Collapsed" GroupType="Resource"
IsManipulationEnabled="True" AllowDrop="False" IsTabStop="False" EditAppointmentFormShowing="SchedularControl_EditAppointmentFormShowing"
EditRecurrentAppointmentFormShowing="SchedularControl_EditRecurrentAppointmentFormShowing" FormCustomizationUsingMVVMLocal="False"
- AppointmentViewInfoCustomizing="SchedulerControl_AppointmentViewInfoCustomizing" PopupMenuShowing="SchedulerControl_PopupMenuShowing"
-
- >
+ AppointmentViewInfoCustomizing="SchedulerControl_AppointmentViewInfoCustomizing" PopupMenuShowing="SchedulerControl_PopupMenuShowing"
+ >
+
diff --git a/BeWo/View/Detail/Report/AbwesenheitsView.xaml.cs b/BeWo/View/Detail/Report/AbwesenheitsView.xaml.cs
index 39fa50301..35cc433bf 100644
--- a/BeWo/View/Detail/Report/AbwesenheitsView.xaml.cs
+++ b/BeWo/View/Detail/Report/AbwesenheitsView.xaml.cs
@@ -73,6 +73,8 @@ namespace BeWo.View.Detail.Report
linkGiftLeaveday.NavigateUri = BeWoApp.SiteOfOrigin;
_EmployeeDict = new Dictionary();
+ ApplyCellStyles();
+ ApplySelectionTemplate();
}
@@ -335,15 +337,9 @@ namespace BeWo.View.Detail.Report
var resource = _SchedulerStorage.CreateResource(employee.EmployeeOid.Value.ToString());
resource.Caption = employee.LastNameFirstName;
- //resource.CustomFields[nameof(EmployeeDC)] = employee; //Liste mit CustomFields wird um einen erweitert; Value wird auf Employee gesetzt.
- // Jetzt sind alle Infos vom Employee in der Ressource vorhanden
-
+
resource.CustomFields[nameof(AbwesenheitsInformationDC)] = infoDC;
- //resource.CustomFields["int"] = _MonthPicker.SelectedMonth;
- //resource.CustomFields["Jahr"] = (int)_YearPicker.SelectedItem;
-
-
_EmployeeDict.Add(employee.EmployeeOid.Value, employee);
_ResourceStorage.Add(resource);
@@ -486,6 +482,16 @@ namespace BeWo.View.Detail.Report
return tageUrlaub;
}
+
+ private void ApplyCellStyles()
+ {
+ _SchedulerControl.TimelineView.CellStyle = (Style)this.FindResource("TimelineViewCellStyle");
+ }
+ private void ApplySelectionTemplate()
+ {
+ _SchedulerControl.TimelineView.SelectionTemplate = (ControlTemplate)this.FindResource("SelectionTemplate");
+ }
+
private decimal CountKrankheitstage(AbwesenheitsInformationDC info)
{
int tageKrankheit = 0;
diff --git a/BeWo/View/Detail/Report/DienstplanerView.xaml b/BeWo/View/Detail/Report/DienstplanerView.xaml
index b0ee262b6..9c79c943b 100644
--- a/BeWo/View/Detail/Report/DienstplanerView.xaml
+++ b/BeWo/View/Detail/Report/DienstplanerView.xaml
@@ -43,13 +43,14 @@
-
-
+
+
+
@@ -238,7 +239,7 @@
-
+
diff --git a/BeWo/View/Detail/Report/DienstplanerView.xaml.cs b/BeWo/View/Detail/Report/DienstplanerView.xaml.cs
index 35816fdf9..bedf3be6b 100644
--- a/BeWo/View/Detail/Report/DienstplanerView.xaml.cs
+++ b/BeWo/View/Detail/Report/DienstplanerView.xaml.cs
@@ -1542,9 +1542,9 @@ namespace BeWo.View.Detail.Report
var zeile = _DienstplanerRootObj.DienstZeilenListe[i];
if (i < _DienstplanerRootObj.DienstZeilenListe.Count - 1)
{
- if (zeile.Employee == emp && _DienstplanerRootObj.DienstZeilenListe[i + 1].Employee != zeile.Employee && zeile.Zeile + 1 <= 2) //Letzte Zeile des ausgewählten Mitarbeiters
+ if (zeile.Employee == emp && _DienstplanerRootObj.DienstZeilenListe[i + 1].Employee != zeile.Employee && zeile.Zeile + 1 <= 19) //Letzte Zeile des ausgewählten Mitarbeiters
{
- _DienstplanerRootObj.DienstZeilenListe.Insert(zeile.Zeile + 1,
+ _DienstplanerRootObj.DienstZeilenListe.Insert(i + 1,
new DienstZeileDC()
{
Contracts = zeile.Contracts,
@@ -1870,8 +1870,8 @@ namespace BeWo.View.Detail.Report
{
var zeileDC = eintragDC.DienstDictArray[i];
- //if(zeileDC.Count > 0 || i == 0) //Nur eine Zeile
- //{
+ if (zeileDC.Count > 0 || i == 0) //Nur eine Zeile
+ {
var newDic = new Dictionary();
if (zeileDC != null)
@@ -1882,8 +1882,8 @@ namespace BeWo.View.Detail.Report
toAdd.DienstDictUpdated += dienstDictUpdate;
res.Add(toAdd);
- //}
-
+ }
+
}
return res;
diff --git a/Service/Dienstplanung/DienstplanungsManager.cs b/Service/Dienstplanung/DienstplanungsManager.cs
index e2c1eeb80..c2e356356 100644
--- a/Service/Dienstplanung/DienstplanungsManager.cs
+++ b/Service/Dienstplanung/DienstplanungsManager.cs
@@ -148,7 +148,7 @@ namespace BeWo.Service.Dienstplanung
Employee = emp,
Contracts = contracts,
Wohnheim = whDC,
- DienstDictArray = new Dictionary[3]
+ DienstDictArray = new Dictionary[20]
};
for (int i = 0; i < zeile.DienstDictArray.Length; i++)
@@ -184,7 +184,7 @@ namespace BeWo.Service.Dienstplanung
Employee = emp,
Contracts = contracts,
Wohnheim = whDC,
- DienstDictArray = new Dictionary[3]
+ DienstDictArray = new Dictionary[20]
};
for (int i = 0; i < zeile.DienstDictArray.Length; i++)
@@ -262,7 +262,7 @@ namespace BeWo.Service.Dienstplanung
Employee = emp,
Contracts = contracts,
Wohnheim = whDC,
- DienstDictArray = new Dictionary[3]
+ DienstDictArray = new Dictionary[20]
};
for (int i = 0; i < zeile.DienstDictArray.Length; i++)