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

Bearbeitungsmodus wird zurückgesetzt nach dem Speichern in der Mobilversion

Browse Source
This commit is contained in:
Lyndon Jetten
2020-07-15 14:37:43 +02:00
parent 27bcb099de
commit aa2cc3502c
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -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);
}