diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
index 5639e87b2..d5a4f5a1b 100644
--- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
+++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
@@ -142,7 +142,7 @@
}
}
- @*@if(AbstractModel.IsAllowedToSeeBills)
+ @if(AbstractModel.IsAllowedToSeeBills)
{
using(Html.BeginForm("RedirectToReportView", "Main", FormMethod.Post))
{
@@ -155,7 +155,7 @@
}
- }*@
+ }
@using(Html.BeginForm("Logout", "Main", FormMethod.Post))
diff --git a/Controls/Controls.csproj b/Controls/Controls.csproj
index e1f88d3e2..3319dd7ed 100644
--- a/Controls/Controls.csproj
+++ b/Controls/Controls.csproj
@@ -75,12 +75,10 @@
false
-
-
@@ -90,12 +88,6 @@
3.5
-
- 3.5
-
-
- 3.5
-
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 902d860a1..36bf692dd 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -3386,5 +3386,57 @@ namespace BeWo.Data.Access
{
return FindListOfCustomerServiceRecordsForKilometerauswertung(customerOids, span).Any();
}
+
+ public List GetAllCustomersForEmployee(long? employeeOid)
+ {
+ ApplicationUser user;
+
+ if(employeeOid.HasValue)
+ {
+ var employee = CreateCriteria().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult();
+ user = FindUserForEmployee(employee);
+ }
+ else
+ {
+ if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+ {
+ user = LoggedInUserOperationContextExt.Current.User;
+ }
+ else
+ {
+ user = SessionFacade.LoggedInUser;
+ }
+ }
+
+ var rights = new List();
+
+ user.UserGroups.DoForEach(s => s.Rights.DoForEach(right => rights.AddIfNotIn(right.RightType)));
+
+ var lCriteria = CreateCriteriaIsActive();
+
+ if(rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.CustomerView_View))
+ {
+ return lCriteria.List().ToList();
+ }
+
+ var result = new List();
+
+ if(rights.Contains(UserRightType.Customer_ViewMyCustomers))
+ {
+ result = user.Employee.Employee2CustomerList.Select(employee2Customer => employee2Customer.Customer).Distinct().ToList();
+ }
+
+ if(rights.Contains(UserRightType.Customer_ViewMyTeams))
+ {
+ var teams = FindAllActiveTeamsOfEmployee(user.Employee.Oid.Value);
+
+ teams.DoForEach(team =>
+ {
+ team.MemberList.DoForEach(member => result.AddRangeIfElementsNotIn(member.Employee2CustomerList.Select(employee2Customer => employee2Customer.Customer)));
+ });
+ }
+
+ return result;
+ }
}
}
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 394494010..e4d2e7e16 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -74,6 +74,9 @@
+
+ False
+
diff --git a/ReportImp/demo_reports/Export/QlikCsvExporter.cs b/ReportImp/demo_reports/Export/QlikCsvExporter.cs
index ebf80ea75..13fecc855 100644
--- a/ReportImp/demo_reports/Export/QlikCsvExporter.cs
+++ b/ReportImp/demo_reports/Export/QlikCsvExporter.cs
@@ -334,7 +334,7 @@ namespace demo_reports.Export
var stringWriter = new StringWriter();
- using(var csv = new CsvWriter(stringWriter, CultureInfo.InvariantCulture))
+ using(var csv = new CsvWriter(stringWriter, CultureInfo.GetCultureInfo("de-DE")))
{
csv.WriteRecords(dataList);
}
diff --git a/Service/ServiceContracts/IEmployeeService.cs b/Service/ServiceContracts/IEmployeeService.cs
index 42010f1be..e9d3d695e 100644
--- a/Service/ServiceContracts/IEmployeeService.cs
+++ b/Service/ServiceContracts/IEmployeeService.cs
@@ -379,5 +379,9 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List GetAllActiveEmployees();
+
+ [FaultContract(typeof(BeWoFault))]
+ [OperationContract]
+ List GetActiveCompactCustomersForEmployee(long? employeeOid);
}
}
\ No newline at end of file
diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs
index babda98be..62e86e513 100644
--- a/Service/ServiceImplementations/EmployeeServiceImp.cs
+++ b/Service/ServiceImplementations/EmployeeServiceImp.cs
@@ -1631,5 +1631,19 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(exception);
}
}
+
+ public List GetActiveCompactCustomersForEmployee(long? employeeOid)
+ {
+ try
+ {
+ var customers = DAOFactory.SearchDAO.GetAllCustomersForEmployee(employeeOid);
+
+ return MapperFactory.CompactCustomerDC_Customer.MapToNewDCs(customers);
+ }
+ catch(Exception exception)
+ {
+ throw Utils.CreateBeWoFaultException(exception);
+ }
+ }
}
}
\ No newline at end of file