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:
Christian
2020-12-07 13:37:24 +01:00
parent a9674a90d6 bafa8a9970
commit dd634f0e9f
7 changed files with 72 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -136,15 +136,6 @@ namespace BeWoPlanerMobil.Controllers
var myRelatedCustomers = Model.Employee == null ? new List<CustomerEmployeeRelationDC>() : Model.Employee.RelatedCustomers;
foreach (var c2e in myRelatedCustomers)
{
var c = c2e.Customer;
if (c.LastName == "Janzen")
{
int test = 0;
}
}
var relatedCustomerOids = myRelatedCustomers.Select(employee2customer => employee2customer.Customer.CustomerOid).ToList();
if (MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees))
@@ -929,7 +920,7 @@ namespace BeWoPlanerMobil.Controllers
Log.Error(e.Message, e);
}
ResetGroupBookingMode(true);
ResetGroupBookingMode(Model.IsInGroupBookingMode);
return ResetEditingMode(null);
}
@@ -992,7 +983,7 @@ namespace BeWoPlanerMobil.Controllers
return ResetEditingMode(null);
}
// TODO: Eingeloggter Mitarbeiter wird beim Bearbeiten immer mit ausgewählt, obwohl er nicht unbedingt in der Mitarbeiterliste ist
private ActionResult UpdateGroupBooking()
{
var dc = Model.SelectedServiceRecord;