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

cb

Browse Source
This commit is contained in:
Christian
2018-05-21 16:39:24 +02:00
parent a44b59079c
commit d20b2ec5bf
102 changed files with 20992 additions and 20197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -4,7 +4,7 @@ using System.Diagnostics;
using System.Linq;
using System.Text.RegularExpressions;
using System.Web.Mvc;
using BeWo.Data.Access;
using BeWo.Service.ServiceImplementations;
using BeWoPlanerMobil.Models;
using BeWoPlanerMobil.Service;
@@ -97,15 +97,15 @@ namespace BeWoPlanerMobil.Controllers
if (MobileSessionFacade.CheckForUserRight(UserRightType.CustomerView_View))
{
Model.Customers = CustomerService.GetAllActiveCustomers().OrderBy(k => k.LastName).ToList();
Model.Customers = CustomerService.GetAllActiveCompactCustomers().OrderBy(k => k.LastName).ToList();
}
else if(MobileSessionFacade.CheckForUserRight(UserRightType.Customer_ViewMyCustomers))
{
Model.Customers = CustomerService.GetActiveCustomersById(myRelatedCustomers.Select(c => c.Customer.CustomerOid).ToList()).OrderBy(k => k.LastName).ToList();
Model.Customers = CustomerService.GetCompactCustomersById(myRelatedCustomers.Select(c => c.Customer.CustomerOid).ToList()).OrderBy(k => k.LastName).ToList();
}
else
{
Model.Customers = new List<CustomerDC>();
Model.Customers = new List<CompactCustomerDC>();
}
if(MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees))
@@ -127,7 +127,7 @@ namespace BeWoPlanerMobil.Controllers
}
else
{
Model.SupportConcepts = CustomerService.GetAllActiveSupportConceptsByCustomers(Model.Customers.Select(c => c.CustomerOid ?? 0));
Model.SupportConcepts = CustomerService.GetAllActiveSupportConceptsByCustomers(Model.Customers.Select(c => c.CustomerOid));
}
var test = Model.ServiceRecords.Any(a => a.GroupPersonCount != null && a.IsCreatedInMobileClient);
@@ -2303,8 +2303,9 @@ namespace BeWoPlanerMobil.Controllers
return "SessionTimeout";
}
Model.SelectedCustomer = Model.Customers.FirstOrDefault(f => f.CustomerOid.HasValue && f.CustomerOid.Value.Equals(customerOid));
Model.SelectedCustomer = CustomerService.LoadCustomer(customerOid);
Model.SelectedCustomerOid = customerOid;
return SerializeObject(GetJSONCustomer(Model.SelectedCustomer));
}