From aa2cc3502c2a5e587e1b867ecf705ef448590870 Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@beyondsoft.de>
Date: Wed, 15 Jul 2020 14:37:43 +0200
Subject: [PATCH] =?UTF-8?q?Bearbeitungsmodus=20wird=20zur=C3=BCckgesetzt?=
 =?UTF-8?q?=20nach=20dem=20Speichern=20in=20der=20Mobilversion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWoPlanerMobil/Controllers/MainController.cs | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index a76ecd2de..3790e3983 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -1064,7 +1064,7 @@ namespace BeWoPlanerMobil.Controllers
                 Log.Error(e.Message, e);
             }
 
-            return RedirectToActionPermanent("Main");
+            return ResetEditingMode(null);
         }
 
         private ActionResult SaveGroupBooking()
@@ -1122,15 +1122,8 @@ namespace BeWoPlanerMobil.Controllers
                     OperationsService.InsertNewServiceRecordGroup(groupDC);
                 }
             }
-
-            Model.NewServiceRecord = new ServiceRecordDC();
-            Model.SelectedSupportConcepts.Clear();
-            Model.SelectedConceptCostBearerRelations.Clear();
-            Model.SelectedCostbearerRelOids.Clear();
-            Model.SelectedGroupOfPeopleOids.Clear();
-            Model.SelectedEmployees = new List<CompactEmployeeDC>{ MobileSessionFacade.LoggedInCompactEmployee };
             
-            return RedirectToActionPermanent("Main");
+            return ResetEditingMode(null);
         }
 
         private ActionResult UpdateGroupBooking()
@@ -2191,9 +2184,12 @@ namespace BeWoPlanerMobil.Controllers
             Model.SelectedServiceRecord = null;
             Model.SelectedSupportConcepts.Clear();
             Model.SelectedEmployees.Clear();
-            Model.IsInGroupBookingMode = false;
             Model.IsInEditingMode = false;
-
+            Model.SelectedSupportConcepts.Clear();
+            Model.SelectedConceptCostBearerRelations.Clear();
+            Model.SelectedCostbearerRelOids.Clear();
+            Model.SelectedGroupOfPeopleOids.Clear();
+            Model.SelectedEmployees = new List<CompactEmployeeDC> { MobileSessionFacade.LoggedInCompactEmployee };
             Model.SelectedEmployee = MobileSessionFacade.LoggedInCompactEmployee;
             LoadServiceCategoriesToModel(Model.CostBearer2SupportConceptOid);
 
@@ -2601,11 +2597,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult EditServiceRecord(FormCollection formCollection)
         {
-            if (Model == null)
+            if(Model == null)
             {
                 return RedirectToActionPermanent("Index", "Login");
             }
-            try {
+            try
+            {
                 string doku1;
 
                 if(Model.Dokutypes != null && Model.Dokutypes.Length > 0)
@@ -2708,7 +2705,7 @@ namespace BeWoPlanerMobil.Controllers
 
                 if(Model.Employee.EmployeeOid != null)
                 {
-                    
+
                     if(Model.SelectedEmployee != null)
                     {
                         Model.NewServiceRecord.Employee = Model.SelectedEmployee;
@@ -2763,7 +2760,8 @@ namespace BeWoPlanerMobil.Controllers
                 if(!string.IsNullOrEmpty(formCollection["ServiceDescription"]))
                 {
                     serviceDescOid = Convert.ToInt64(formCollection["ServiceDescription"]);
-                } else if (Model.SelectedServiceDescriptionOid.HasValue)
+                }
+                else if(Model.SelectedServiceDescriptionOid.HasValue)
                 {
                     serviceDescOid = Model.SelectedServiceDescriptionOid.Value;
                 }
@@ -2797,7 +2795,7 @@ namespace BeWoPlanerMobil.Controllers
                     Model.ServiceRecords = OperationsService.FindServiceRecordsForLastDays(selectedCostbearer2SupportConceptRelOid, Model.Zeitraum, Model.Employee.EmployeeOid).ToList();
                 }
             }
-            catch (Exception e)
+            catch(Exception e)
             {
                 Log.Error(e.Message, e);
             }