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

BeWoPlanerMobil:

Browse Source 
Das Unterschriftenfeld befindet sich jetzt unter den Buttons und ist größer. Ca. 80% des Browserfensters.
    Der Kommentar wird jetzt im Klientenfeld angezeigt.
This commit is contained in:
Lyndon
2018-10-10 16:43:11 +02:00
parent 07eadddd57
commit cc388de591
12 changed files with 173 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BeWoPlanerAndroid/BeWoPlanerAndroid.csproj.user
View File

@@ -3,6 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>Test</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

4
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -263,11 +263,11 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<UseIIS>True</UseIIS>
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>8808</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost/BeWoPlanerMobil</IISUrl>
<IISUrl>http://localhost:8808/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

3
BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
View File

@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>false</UseIISExpress>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

10
BeWoPlanerMobil/Content/BeWoMobileStyle.css
View File

@@ -42,6 +42,12 @@ body {
height: 100%;
}
pre {
font-family: "Microsoft Sans Serif", Arial, sans-serif;
white-space: pre-line;
word-wrap: normal;
}
a, a:active, a:visited, a:hover {
color: #555;
}
@@ -438,8 +444,8 @@ textarea {
margin-top: 1em;
}
#umfeldContainer {
display: none;
#umfeldContainer, #kommentarContainer {
display: none;
}
.contentTd {

7
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -77,6 +77,10 @@ namespace BeWoPlanerMobil.Controllers
var unter = GetSettingValue("ShowSignature");
Model.ShowSignature = unter == "1";
#if DEBUG
Model.ShowSignature = true;
#endif
Model.GroupsOfPeople = EmployeeService.GetAllGroups(GetUser().Employee.EmployeeOid);
Model.SelectedGoals = null;
@@ -2611,6 +2615,7 @@ namespace BeWoPlanerMobil.Controllers
public string Fax { get; set; }
public string Telefon { get; set; }
public string Handy { get; set; }
public string Kommentar { get; set; }
public List<Umfeldsperson> Umfeldpersonen { get; set; }
@@ -2631,6 +2636,8 @@ namespace BeWoPlanerMobil.Controllers
RechnungsadressePostleitzahl = init.InvoiceAddressPostalCode;
RechnungsadresseOrt = init.InvoiceAddressTown;
Kommentar = init.Notice;
foreach (var iContactDC in init.ContactInformations)
{
switch(iContactDC.ContactType)

18
BeWoPlanerMobil/Scripts/initialization.js
View File

@@ -1,6 +1,8 @@
var isEnddateSet;
var numberOfDocumentationTypes;
var canvasWidth;
$(document).ready(function() {
if(!$("#zeiterfassung").length) {
return;
@@ -55,9 +57,23 @@ $(document).ready(function() {
vm = new KlientenVM();
ko.applyBindings(vm);
var documentWidth = $(document).width();
canvasWidth = documentWidth * scaleFactor;
$("#sketchpad").prop("width", canvasWidth);
loadSettingsAccordingToBWP();
});
var scaleFactor = .8;
$(window).resize(function() {
var documentWidth = $(document).width();
if(canvasWidth !== (documentWidth * scaleFactor) && $("#sketchpad").css("display") === "inline") {
$("#sketchpad").prop("width", documentWidth * scaleFactor);
}
});
function initBeWoMobile(actionPath) {
try {
$("#recordLoader_select, #kategorien_select, #leistungen_select, #textbausteine_select").prop("disabled", true);
@@ -269,6 +285,8 @@ $(document).on("change", ".edit-form-input",
saveFormValuesLocally();
});
$(document).change(function() { console.log("test"); });
function saveFormValuesLocally() {
var recordObject = {
category: $("#kategorien_select").val(),

75
BeWoPlanerMobil/Scripts/mainView.js
View File

@@ -976,6 +976,9 @@ function nextDayButtonClick() {
loadAppointments(newtoday);
}
var canvas, ctx;
var mouseX, mouseY, mouseDown = 0;
var lastpositionx = 0;
@@ -985,16 +988,15 @@ var newpositiony = 0;
var minuswert = -20;
var maxwert = 20;
var posix = 0;
var posiy = 0;
var posiy = 0;
var r, g, b = 0;
var a = 255;
function loadUnterschriftFeldFunktion() {
function drawDot(ctx, x, y, size) {
r = 0; g = 0; b = 0; a = 255;
ctx.fillStyle = "rgba(" + r + "," + g + "," + b + "," + (a / 255) + ")";
if(lastpositionx != 0) {
if(lastpositionx !== 0) {
ctx.beginPath();
ctx.arc(x, y, size, 1, Math.PI * 0.25, true);
newpositionx = x;
@@ -1042,14 +1044,14 @@ function loadUnterschriftFeldFunktion() {
function sketchpadMouseMove(e) {
getMousePos(e);
if(mouseDown == 1) {
if(mouseDown === 1) {
drawDot(ctx, mouseX, mouseY, 3);
}
}
function getMousePos(e) {
if(!e) {
var e = event;
e = event;
}
if(e.offsetX) {
@@ -1076,7 +1078,7 @@ function loadUnterschriftFeldFunktion() {
function getTouchPos(e) {
if (!e) {
var e = event;
e = event;
}
if (e.touches) {
@@ -1089,12 +1091,12 @@ function loadUnterschriftFeldFunktion() {
}
function init() {
//canvas = $("#sketchpad");
canvas = document.getElementById('sketchpad');
canvas = document.getElementById("sketchpad");
if (canvas.getContext) {
ctx = canvas.getContext('2d');
ctx = canvas.getContext("2d");
}
if (ctx) {
canvas.addEventListener("mousedown", sketchpadMouseDown, false);
canvas.addEventListener("mousemove", sketchpadMouseMove, false);
@@ -1245,6 +1247,8 @@ function loescheUnterschrift(canvas, ctx) {
}
function preloadData(serviceRecordOid) {
initSignatureInfo(serviceRecordOid);
}
@@ -1291,6 +1295,7 @@ function klientenLaden() {
if(oid === -1) {
$("#klientenTabelle").css("display", "none");
$("#umfeldContainer").css("display", "none");
$("#kommentarContainer").css("display", "none");
hideSanduhr();
@@ -1300,6 +1305,7 @@ function klientenLaden() {
makeAjaxCall("GET", getSelectedCustomerUrl, function (json) {
$("#klientenTabelle").css("display", "block");
$("#umfeldContainer").css("display", "block");
$("#kommentarContainer").css("display", "block");
if(json === "SessionTimeout") {
window.location.href = redirectLink;
@@ -1313,11 +1319,10 @@ function klientenLaden() {
});
},
{
customerOid: oid
},
{
customerOid: oid
},
hideSanduhr);
}
function KlientenVM() {
@@ -1342,6 +1347,7 @@ function KlientenVM() {
this.Wohnheim = ko.observable("");
this.mobileLink = ko.observable("");
this.landLineLink = ko.observable("");
this.kommentar = ko.observable("");
this.update = function (data) {
this.vorname(data.Vorname);
@@ -1366,6 +1372,7 @@ function KlientenVM() {
this.handy(data.Handy);
this.mobileLink('tel:' + data.Handy);
this.landLineLink('tel:' + data.Telefon);
this.kommentar(data.Kommentar);
var mappedUmfeldpersonen = $.map(data.Umfeldpersonen, function (item) { return new UmfPers(item); });
@@ -1427,22 +1434,22 @@ function calcPropFieldMinSizes() {
$(".eigenschaftsdiv").each(
function (index, element) {
var x = $(element).clone().css({ "height": "auto", "width": "auto" }).appendTo("body");
var x = $(element).clone().css({ "height": "auto", "width": "auto" }).appendTo("body");
var temporaryWidth = x.outerWidth(true);
var temporaryHeight = x.outerHeight(true);
var temporaryWidth = x.outerWidth(true);
var temporaryHeight = x.outerHeight(true);
x.remove();
x.remove();
elementCount++;
elementCount++;
if(temporaryWidth > width) {
width = temporaryWidth;
}
if(temporaryWidth > width) {
width = temporaryWidth;
}
if(temporaryHeight > height) {
height = temporaryHeight;
}
if(temporaryHeight > height) {
height = temporaryHeight;
}
}
);
@@ -1468,11 +1475,11 @@ function updateEigenschaftsfelder() {
var width = parseInt(customerTableWidth / maxAnzahl) - 16;
if(minSizes != undefined) {
if(minSizes !== undefined) {
$(".eigenschaftsdiv").each(
function (index, element) {
$(element).css("width", width + "px");
$(element).css("height", (minSizes.minHeight - 16) + "px");
$(element).css("width", width + "px");
$(element).css("height", (minSizes.minHeight - 16) + "px");
}
);
}
@@ -1498,13 +1505,13 @@ function hideSanduhr() {
}
if($("#SuccessPopupDiv").css("display") === "none" && $("#popupDiv").css("display") === "none") {
$(".modalWrapper").css("display", "none");
$(".modalWrapper").css("height", "0");
$(".modalWrapper").css("display", "none");
$(".modalWrapper").css("height", "0");
}
if($("#AendernPopupDiv").css("display") === "none" && $("#popupDiv").css("display") === "none") {
$(".modalWrapper").css("display", "none");
$(".modalWrapper").css("height", "0");
$(".modalWrapper").css("display", "none");
$(".modalWrapper").css("height", "0");
}
$(".warte-animation").css("display", "none");
@@ -1652,7 +1659,7 @@ function preselectCustomer() {
$("#customersDropDown option").each(function () {
if(this.value === valueToSelect === true) {
$("#customersDropDown").val(valueToSelect);
$("#customersDropDown").trigger('change');
$("#customersDropDown").trigger("change");
return false;
} else {

14
BeWoPlanerMobil/Util/MobileUtils.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using BS.Shared.DataContracts;
namespace BeWoPlanerMobil.Util
@@ -48,5 +48,17 @@ namespace BeWoPlanerMobil.Util
return decValue;
}
public static string TextToHtml(string text)
{
var result = HttpUtility.HtmlEncode(text);
result = result.Replace("\r\n", "\r");
result = result.Replace("\n", "\r");
result = result.Replace("\r", "<br />\r\n");
result = result.Replace(" ", " &nbsp;");
return result;
}
}
}

144
BeWoPlanerMobil/Views/Main/Main.cshtml
View File

@@ -796,36 +796,42 @@
</tr>
</table>
</div>
<!--############################################## Wohnheim gedöns #####################################################################################
<div class="eigenschaftsdiv" id="WohnheimContainer">
<h4>Wohnheim zugehörigkeit</h4>
<hr />
<table class="width-inheriting-table">
<tr>
<td class="customer-td">Name:</td>
<td class="contentTd" >a</td><!--data-bind="text: WohnheimName"
</tr>
<tr>
<td class="customer-td">Strasse:</td>
<td class="contentTd" >e</td>
</tr>
<tr>
<td class="customer-td">Postleitzahl:</td>
<td class="contentTd" >i</td>
</tr>
<tr>
<td class="customer-td">Ort:</td>
<td class="contentTd" >o</td>
</tr>
<tr>
<td class="customer-td">Bemerkung:</td>
<td class="contentTd" data-bind="text: WohnheimName" >u</td>
</tr>
</table>
</div>-->
<!--############################################## Wohnheim gedöns #####################################################################################
<div class="eigenschaftsdiv" id="WohnheimContainer">
<h4>Wohnheim zugehörigkeit</h4>
<hr />
<table class="width-inheriting-table">
<tr>
<td class="customer-td">Name:</td>
<td class="contentTd" >a</td><!--data-bind="text: WohnheimName"
</tr>
<tr>
<td class="customer-td">Strasse:</td>
<td class="contentTd" >e</td>
</tr>
<tr>
<td class="customer-td">Postleitzahl:</td>
<td class="contentTd" >i</td>
</tr>
<tr>
<td class="customer-td">Ort:</td>
<td class="contentTd" >o</td>
</tr>
<tr>
<td class="customer-td">Bemerkung:</td>
<td class="contentTd" data-bind="text: WohnheimName" >u</td>
</tr>
</table>
</div>-->
</div>
<div style="padding-right: 1em;" id="kommentarContainer">
<h4 style="display: inline; color: #AB4A07;">Kommentar</h4>
<hr />
<pre data-bind="text: kommentar"></pre>
</div>
<div style="padding-right: 1em;" id="umfeldContainer">
<h4 style="display: inline; color: #AB4A07;">Umfeld</h4>
<hr />
@@ -835,46 +841,47 @@
<div style="display: none;" class="kollabierbar">
<table class="width-inheriting-table">
<tbody>
<tr class="testklasse">
<td class="customer-td">Rolle:</td>
<td class="contentTd" data-bind="text: umfrolle"></td>
</tr>
<tr class="testklasse">
<td class="customer-td">Adresse:</td>
<td class="contentTd" data-bind="text: umfstrnr"></td>
</tr>
<tr class="testklasse">
<td class="customer-td"></td>
<td class="contentTd" data-bind="text: umfplzort"></td>
</tr>
<tr class="testklasse">
<td class="customer-td">Tel.:</td>
<td class="contentTd">
<a style="color: black" data-bind="attr: { href: umftelnr, title: nurtelnr }, text: nurtelnr"></a>
</td>
</tr>
<tr class="testklasse">
<td class="customer-td">Mobil:</td>
<td class="contentTd">
<a style="color: black" data-bind="attr: { href: umfmobil, title: nurmobil }, text: nurmobil"></a>
</td>
</tr>
<tr class="testklasse">
<td class="customer-td">E-Mail</td>
<td class="contentTd">
<a style="color: black" data-bind="attr: { href: umfemail, title: nuremail }, text: nuremail"></a>
</td>
</tr>
<tr class="testklasse">
<td class="customer-td">Fax:</td>
<td class="contentTd" data-bind="text: umffax"></td>
</tr>
<tr class="testklasse">
<td class="customer-td">Rolle:</td>
<td class="contentTd" data-bind="text: umfrolle"></td>
</tr>
<tr class="testklasse">
<td class="customer-td">Adresse:</td>
<td class="contentTd" data-bind="text: umfstrnr"></td>
</tr>
<tr class="testklasse">
<td class="customer-td"></td>
<td class="contentTd" data-bind="text: umfplzort"></td>
</tr>
<tr class="testklasse">
<td class="customer-td">Tel.:</td>
<td class="contentTd">
<a style="color: black" data-bind="attr: { href: umftelnr, title: nurtelnr }, text: nurtelnr"></a>
</td>
</tr>
<tr class="testklasse">
<td class="customer-td">Mobil:</td>
<td class="contentTd">
<a style="color: black" data-bind="attr: { href: umfmobil, title: nurmobil }, text: nurmobil"></a>
</td>
</tr>
<tr class="testklasse">
<td class="customer-td">E-Mail</td>
<td class="contentTd">
<a style="color: black" data-bind="attr: { href: umfemail, title: nuremail }, text: nuremail"></a>
</td>
</tr>
<tr class="testklasse">
<td class="customer-td">Fax:</td>
<td class="contentTd" data-bind="text: umffax"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div id="Kalender">
@@ -973,14 +980,17 @@
<input class="floating-label-input" id="UnterschriftDatum" readonly name="Datum/Uhrzeit" />
<input id="SaveRecordOID" readonly name="OID" style="display: none" />
<p id="Geologie"></p>
<input type="button" style="width: 100px;" onclick="loescheUnterschrift(canvas, ctx)" value="Neu" />
<input type="button" style="width: 100px;" onclick="speichereUnterschrift()" value="Speichern" />
<input type="button" style="width: 100px;" onclick="backToZeiterfassung()" value="Abbrechen" />
</div>
<div>
<canvas id="sketchpad" height="150" style="cursor: default; border-color: black" width="325"></canvas>
<canvas id="sketchpad" height="150" style="cursor: default; border-color: black; margin-top: 1em;" width="325"></canvas>
</div>
<p id="Geologie"></p>
<input type="button" style="width: 100px;" onclick="loescheUnterschrift(canvas, ctx)" value="Neu" />
<input type="button" style="width: 100px;" onclick="speichereUnterschrift()" value="Speichern" />
<input type="button" style="width: 100px;" onclick="backToZeiterfassung()" value="Abbrechen" />
</div>
<div id="SupportStatistik" style="display: none" align="center" >

2
BeWoPlanerMobil/Web.config
View File

@@ -119,7 +119,7 @@
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<!--<add key="MultitenancyPath" value="D:\Projects\BeWo\Host\Multitenancy\"/>-->
<add key="MultitenancyPath" value="D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\Multitenancy\"/>
<add key="MultitenancyPath" value="D:\Projects\BeWo\Host\Multitenancy\"/>
<add key="LicenseInfoUrl" value="https://support.bewoplaner.de/api/getlicensecount.php?k=[TENANT]" />
<add key="LicenseOrderUrl" value="https://support.bewoplaner.de/lizenzbestellung/?k=[TENANT]" />
<add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />

4
Service/Plugins/PluginLoader.cs
View File

@@ -79,7 +79,7 @@ namespace BeWo.Service.Plugins
//t = "8001550599"; // Biallas BeWo
//t = "7282396774"; // Caritas Unna
//t = "6884855402"; // IBP
//t = "4867997795"; // ADiK Kleve
t = "4867997795"; // ADiK Kleve
//t = "3184859776"; // Sergej Becker
//t = "7752610643"; // BWK Gbr
//t = "3785623125"; // Betreuwo
@@ -161,7 +161,7 @@ namespace BeWo.Service.Plugins
//t = "1873138856"; // BUG e.V.
//t = "6463422907"; // Caritas Leverkusen
//t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch
t = "6548202677"; // VKM Aachen SBD
//t = "6548202677"; // VKM Aachen SBD
//t = "7803602698"; // Taubblindendienst
//t = "5518600303"; // Wetterleuchten e.V.
//t = "4096649015"; // AWO Dortmund

2
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -2096,7 +2096,7 @@ namespace BeWo.Service.ServiceImplementations
CustomerInsUser = lOriginal.InsUser,
CustomerOid = Oid ?? lOriginal.Oid,
CustomerUdpUser = lOriginal.UdpUser,
CustomerVersion = lOriginal.Version.Value,
CustomerVersion = lOriginal.Version ?? 0,
DebitorNumber = lOriginal.DebitorNumber,
Diagnosis = lOriginal.Diagnosis,
Environment = lOriginal.Environment,