diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index 36097b8d3..8a59b08ef 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -331,6 +331,7 @@
+
diff --git a/BeWoPlanerMobil/Controllers/CustomerController.cs b/BeWoPlanerMobil/Controllers/CustomerController.cs
index 8c82ded8b..b17aa1cf9 100644
--- a/BeWoPlanerMobil/Controllers/CustomerController.cs
+++ b/BeWoPlanerMobil/Controllers/CustomerController.cs
@@ -211,14 +211,14 @@ namespace BeWoPlanerMobil.Controllers
LoadCustomerToModel(selectedCustomerOid);
}
- return RedirectToActionPermanent("Customer");
+ return RedirectToAction("Customer", new { id = selectedCustomerOid });
}
catch (Exception exception)
{
Log.Error(exception.Message, exception);
}
- return RedirectToActionPermanent("Customer");
+ return RedirectToAction("Customer", Model);
}
[HttpPost]
diff --git a/BeWoPlanerMobil/Models/CustomerModel.cs b/BeWoPlanerMobil/Models/CustomerModel.cs
index fb03a2b60..386bce6c1 100644
--- a/BeWoPlanerMobil/Models/CustomerModel.cs
+++ b/BeWoPlanerMobil/Models/CustomerModel.cs
@@ -4,18 +4,15 @@ using System.Linq;
using System.Web.Mvc;
using BeWo.View.Navigation.Filter;
using BeWoPlanerMobil.Controllers;
-using BeWoPlanerMobil.Service;
using BeWoPlanerMobil.Util;
using BS.Shared;
using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Compact;
using DevExpress.XtraReports.UI;
namespace BeWoPlanerMobil.Models
{
- public class CustomerModel : AbstractModel
+ public class CustomerModel : AbstractModel, ISignaturePopup
{
-
public CustomerModel()
{
SessionModel = new CustomerSessionModel();
@@ -196,5 +193,7 @@ namespace BeWoPlanerMobil.Models
public List BargeldtransaktionshistoryEntries { get; set; } = new List();
public Dictionary TransaktionsOid2HasHistoryEntries { get; set; } = new Dictionary();
+
+ public string SignaturePopupTitle { get; set; }
}
}
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs
index 733503c97..07e494d31 100644
--- a/BeWoPlanerMobil/Models/MainModel.cs
+++ b/BeWoPlanerMobil/Models/MainModel.cs
@@ -15,7 +15,7 @@ using System.Web.Mvc;
namespace BeWoPlanerMobil.Models
{
- public class MainModel : AbstractModel
+ public class MainModel : AbstractModel, ISignaturePopup
{
protected static readonly log4net.ILog Log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -935,6 +935,8 @@ namespace BeWoPlanerMobil.Models
}
public ServiceRecord2Monatsunterschrift ServiceRecord2Monatsunterschrift { get; set; }
+
+ public string SignaturePopupTitle { get; set; }
}
public class CustomSelectListItem
diff --git a/BeWoPlanerMobil/Models/ReportModel.cs b/BeWoPlanerMobil/Models/ReportModel.cs
index 262e92559..5e0288ff8 100644
--- a/BeWoPlanerMobil/Models/ReportModel.cs
+++ b/BeWoPlanerMobil/Models/ReportModel.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Web.Mvc;
-using BeWo.Report;
+using BeWo.Report;
using BeWoPlanerMobil.Controllers;
+using BeWoPlanerMobil.Util;
using BeWoPlanerMobil.Util.ReportUtils;
using BS.Shared;
using BS.Shared.Core;
@@ -12,10 +8,15 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Web.Mvc;
namespace BeWoPlanerMobil.Models
{
- public class ReportModel : AbstractModel
+ public class ReportModel : AbstractModel, ISignaturePopup
{
public ReportModel()
{
@@ -207,20 +208,11 @@ namespace BeWoPlanerMobil.Models
}
}
- public QBFilterEnum? SelectedFilterItemId { get => ReportSessionModel.SelectedFilterItemId;
+ public QBFilterEnum? SelectedFilterItemId
+ {
+ get => ReportSessionModel.SelectedFilterItemId;
set => ReportSessionModel.SelectedFilterItemId = value;
}
- //{
- // get
- // {
- // if(SelectedFilterItem is null)
- // {
- // return null;
- // }
-
- // return (int)SelectedFilterItem.FilterEnum;
- // }
- //}
public List QbFilters { get; set; } = new List();
@@ -299,7 +291,11 @@ namespace BeWoPlanerMobil.Models
public AbstractReportCreator ReportCreator { get; set; }
- public QuittierungsbelegsReportSettings QuittierungsbelegsReportSettings { get { return ReportSessionModel.QuittierungsbelegsReportSettings; } set { ReportSessionModel.QuittierungsbelegsReportSettings = value; } }
+ public QuittierungsbelegsReportSettings QuittierungsbelegsReportSettings
+ {
+ get => ReportSessionModel.QuittierungsbelegsReportSettings;
+ set => ReportSessionModel.QuittierungsbelegsReportSettings = value;
+ }
public XtraReport QuittierungsbelegsReport { get; set; }
@@ -319,5 +315,7 @@ namespace BeWoPlanerMobil.Models
public ValueListEntryDC[] Dokutypes { get; set; }
public int NumberOfDokuTypes => Dokutypes?.Length ?? 0;
+
+ public string SignaturePopupTitle { get; set; }
}
}
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Util/ISignaturePopup.cs b/BeWoPlanerMobil/Util/ISignaturePopup.cs
new file mode 100644
index 000000000..dd9288e19
--- /dev/null
+++ b/BeWoPlanerMobil/Util/ISignaturePopup.cs
@@ -0,0 +1,7 @@
+namespace BeWoPlanerMobil.Util
+{
+ internal interface ISignaturePopup
+ {
+ string SignaturePopupTitle { get; set; }
+ }
+}