diff --git a/BeWo/ownChat/ChatView.xaml.cs b/BeWo/ownChat/ChatView.xaml.cs index fd92494e3..5084d9301 100644 --- a/BeWo/ownChat/ChatView.xaml.cs +++ b/BeWo/ownChat/ChatView.xaml.cs @@ -15,8 +15,7 @@ using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; using BS.Shared.Translation; using ChatController.ChatKlassen; -using ChatController.Klassen; - +using ChatController.LoginKlassen; using Button = System.Windows.Controls.Button; using MessageBox = System.Windows.MessageBox; using Panel = System.Windows.Controls.Panel; @@ -96,7 +95,7 @@ namespace BeWo.ownChat private void ChatMainControl_OnClickContextMenuItem(string menuItem) { - var aktuellerKontakt = ChatMainControl.GetAktuellenKontakt(); + var aktuellerKontakt = ChatMainControl.GetCurrentContact(); if (aktuellerKontakt != null) { @@ -237,7 +236,7 @@ namespace BeWo.ownChat private void SpeichereMessageInfosInDatenBank() { - var liste = ChatMainControl.UebergebeMessageInfoDatenFuerDb(); + var liste = ChatMainControl.GetContactsWithoutUnreadMessages(); if (liste.Count != 0) { @@ -270,7 +269,7 @@ namespace BeWo.ownChat } } - ChatMainControl.ErhalteMessageInfoVonDb(aa); + ChatMainControl.ResetNumberOfUnreadMessages(aa); } } diff --git a/BeWoPlanerMobil/Content/BeWoMobileStyle.css b/BeWoPlanerMobil/Content/BeWoMobileStyle.css index ef8a462b3..97534d2ca 100644 --- a/BeWoPlanerMobil/Content/BeWoMobileStyle.css +++ b/BeWoPlanerMobil/Content/BeWoMobileStyle.css @@ -747,6 +747,36 @@ input[type="checkbox"] { padding: .5em; } +.see-thru-popup-container-visible { + display: block; + position: absolute; + width: 100%; + height: 100%; + z-index: 899; + top: 0; + left: 0; + bottom: 0; + right: 0; + background-color: #bbbbbb; + opacity: 0.5; + overflow: hidden; +} + +.visible-popup-div { + width: auto; + height: auto; + position: absolute; + background-color: #ffffff; + border: 1px solid #FF5A00; + margin: auto; + z-index: 900; + padding: 0; + top: 0; + bottom: 0; + left: 0; + right: 0; + overflow-y: scroll; +} .see-thru-popup-container { display: none; @@ -929,3 +959,8 @@ input[type="checkbox"] { display: inline; padding: 0; } + +.showSignatureButton { + width: auto; + padding: 7.5px 15px; +} \ No newline at end of file diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 9c80f6640..113bbfa97 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -2665,5 +2665,36 @@ namespace BeWoPlanerMobil.Controllers return _LeerzeichenFuerGetMethoden; } + + [HttpPost] + [Authorize] + public ActionResult LoadSignatureImage(FormCollection pFormCollection) + { + if(Model == null) + { + return RedirectToActionPermanent("Index", "Login"); + } + + var isParsingSuccessful = long.TryParse(pFormCollection["signatureOidHolder"], out var signatureOid); + if(isParsingSuccessful) + { + Model.SignatureImage = OperationsService.GetSignature(signatureOid).DataBild; + } + + return RedirectToActionPermanent("Main"); + } + + [Authorize] + public string ResetSignatureImage() + { + if(Model == null) + { + return _LeerzeichenFuerGetMethoden; + } + + Model.SignatureImage = null; + + return _LeerzeichenFuerGetMethoden; + } } } diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs index d6735cdcc..bec367078 100644 --- a/BeWoPlanerMobil/Models/MainModel.cs +++ b/BeWoPlanerMobil/Models/MainModel.cs @@ -329,7 +329,9 @@ namespace BeWoPlanerMobil.Models return allCostBearerRelations; } } - } + + public string SignatureImage { get; set; } + } public class CustomSelectListItem { diff --git a/BeWoPlanerMobil/Scripts/unterschrift.js b/BeWoPlanerMobil/Scripts/unterschrift.js index 0af30c74c..d6695aebe 100644 --- a/BeWoPlanerMobil/Scripts/unterschrift.js +++ b/BeWoPlanerMobil/Scripts/unterschrift.js @@ -226,4 +226,15 @@ function loescheUnterschrift(canvas, ctx) { function preloadData(serviceRecordOid) { initSignatureInfo(serviceRecordOid); +} + +function showSignature() { + $("#signatureLoadingForm").submit(); +} + +function hideSignatureImagePopup() { + $("#signaturePopupDiv").hide(); + $("#signatureImagePopupDivContainer").hide(); + + makeAjaxCall("GET", window.resetSignatureImage, null, null, null); } \ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml index 76e5d681b..9fd289b9b 100644 --- a/BeWoPlanerMobil/Views/Main/Main.cshtml +++ b/BeWoPlanerMobil/Views/Main/Main.cshtml @@ -13,7 +13,7 @@
|
- @x.Text1 -- @x.Text2 - - |
- - - | -
|
+ @x.Text1 ++ @x.Text2 + + |
+ + + | +
|
@@ -170,7 +170,7 @@
|
@@ -178,7 +178,7 @@
-
+
|
@@ -191,13 +191,13 @@
-
+
|
-
+
|
@@ -205,15 +205,15 @@
-
+
|
-
+
|
@@ -294,22 +294,22 @@
@{
var shouldShowServiceRecordList = "display: block";
- if(Model.IsInGroupBookingMode && !Model.IsInEditingMode)
+ if (Model.IsInGroupBookingMode && !Model.IsInEditingMode)
{
shouldShowServiceRecordList = "display: none";
}
}
- @using(Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectSCForm2", style = shouldShowServiceRecordList }))
+ @using (Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectSCForm2", style = shouldShowServiceRecordList }))
{
-
+
- @foreach(var record in Model.ServiceRecords)
+ @foreach (var record in Model.ServiceRecords)
{
@@ -593,7 +605,7 @@
-
-
}
+
+
-
+
@@ -618,36 +630,36 @@
-
-
-
-
+
+
+
+
@@ -655,15 +667,15 @@
- @using(Html.BeginForm("AddEmployeesToGroupBooking", "Main", FormMethod.Post, new { id = "groupBookingEmployeeSelectionForm" }))
+ @using (Html.BeginForm("AddEmployeesToGroupBooking", "Main", FormMethod.Post, new { id = "groupBookingEmployeeSelectionForm" }))
{
var i = 0;
-->
KommentarUmfeld@@ -827,47 +849,47 @@
@@ -902,7 +924,7 @@
@@ -975,31 +997,31 @@
-
+
-
+
|
@@ -958,8 +980,8 @@
-
+
Validierung
-
-
+
+
+
-
+
-
+
-
+
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||