BeWoPlanerMobil:
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:
@@ -3,6 +3,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<NameOfLastUsedPublishProfile>Test</NameOfLastUsedPublishProfile>
|
<NameOfLastUsedPublishProfile>Test</NameOfLastUsedPublishProfile>
|
||||||
<UseIISExpress>true</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
|
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
<VisualStudio>
|
<VisualStudio>
|
||||||
|
|||||||
@@ -263,11 +263,11 @@
|
|||||||
<VisualStudio>
|
<VisualStudio>
|
||||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||||
<WebProjectProperties>
|
<WebProjectProperties>
|
||||||
<UseIIS>False</UseIIS>
|
<UseIIS>True</UseIIS>
|
||||||
<AutoAssignPort>False</AutoAssignPort>
|
<AutoAssignPort>False</AutoAssignPort>
|
||||||
<DevelopmentServerPort>8808</DevelopmentServerPort>
|
<DevelopmentServerPort>8808</DevelopmentServerPort>
|
||||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||||
<IISUrl>http://localhost/BeWoPlanerMobil</IISUrl>
|
<IISUrl>http://localhost:8808/</IISUrl>
|
||||||
<NTLMAuthentication>False</NTLMAuthentication>
|
<NTLMAuthentication>False</NTLMAuthentication>
|
||||||
<UseCustomServer>False</UseCustomServer>
|
<UseCustomServer>False</UseCustomServer>
|
||||||
<CustomServerUrl>
|
<CustomServerUrl>
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<UseIISExpress>false</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
<Use64BitIISExpress />
|
<Use64BitIISExpress />
|
||||||
<IISExpressSSLPort />
|
<IISExpressSSLPort />
|
||||||
<IISExpressAnonymousAuthentication />
|
<IISExpressAnonymousAuthentication />
|
||||||
<IISExpressWindowsAuthentication />
|
<IISExpressWindowsAuthentication />
|
||||||
<IISExpressUseClassicPipelineMode />
|
<IISExpressUseClassicPipelineMode />
|
||||||
<UseGlobalApplicationHostFile />
|
<UseGlobalApplicationHostFile />
|
||||||
|
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
<VisualStudio>
|
<VisualStudio>
|
||||||
|
|||||||
@@ -42,6 +42,12 @@ body {
|
|||||||
height: 100%;
|
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 {
|
a, a:active, a:visited, a:hover {
|
||||||
color: #555;
|
color: #555;
|
||||||
}
|
}
|
||||||
@@ -438,8 +444,8 @@ textarea {
|
|||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#umfeldContainer {
|
#umfeldContainer, #kommentarContainer {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.contentTd {
|
.contentTd {
|
||||||
|
|||||||
@@ -77,6 +77,10 @@ namespace BeWoPlanerMobil.Controllers
|
|||||||
var unter = GetSettingValue("ShowSignature");
|
var unter = GetSettingValue("ShowSignature");
|
||||||
Model.ShowSignature = unter == "1";
|
Model.ShowSignature = unter == "1";
|
||||||
|
|
||||||
|
#if DEBUG
|
||||||
|
Model.ShowSignature = true;
|
||||||
|
#endif
|
||||||
|
|
||||||
Model.GroupsOfPeople = EmployeeService.GetAllGroups(GetUser().Employee.EmployeeOid);
|
Model.GroupsOfPeople = EmployeeService.GetAllGroups(GetUser().Employee.EmployeeOid);
|
||||||
|
|
||||||
Model.SelectedGoals = null;
|
Model.SelectedGoals = null;
|
||||||
@@ -2611,6 +2615,7 @@ namespace BeWoPlanerMobil.Controllers
|
|||||||
public string Fax { get; set; }
|
public string Fax { get; set; }
|
||||||
public string Telefon { get; set; }
|
public string Telefon { get; set; }
|
||||||
public string Handy { get; set; }
|
public string Handy { get; set; }
|
||||||
|
public string Kommentar { get; set; }
|
||||||
|
|
||||||
public List<Umfeldsperson> Umfeldpersonen { get; set; }
|
public List<Umfeldsperson> Umfeldpersonen { get; set; }
|
||||||
|
|
||||||
@@ -2631,6 +2636,8 @@ namespace BeWoPlanerMobil.Controllers
|
|||||||
RechnungsadressePostleitzahl = init.InvoiceAddressPostalCode;
|
RechnungsadressePostleitzahl = init.InvoiceAddressPostalCode;
|
||||||
RechnungsadresseOrt = init.InvoiceAddressTown;
|
RechnungsadresseOrt = init.InvoiceAddressTown;
|
||||||
|
|
||||||
|
Kommentar = init.Notice;
|
||||||
|
|
||||||
foreach (var iContactDC in init.ContactInformations)
|
foreach (var iContactDC in init.ContactInformations)
|
||||||
{
|
{
|
||||||
switch(iContactDC.ContactType)
|
switch(iContactDC.ContactType)
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
var isEnddateSet;
|
var isEnddateSet;
|
||||||
var numberOfDocumentationTypes;
|
var numberOfDocumentationTypes;
|
||||||
|
|
||||||
|
var canvasWidth;
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
if(!$("#zeiterfassung").length) {
|
if(!$("#zeiterfassung").length) {
|
||||||
return;
|
return;
|
||||||
@@ -55,9 +57,23 @@ $(document).ready(function() {
|
|||||||
vm = new KlientenVM();
|
vm = new KlientenVM();
|
||||||
ko.applyBindings(vm);
|
ko.applyBindings(vm);
|
||||||
|
|
||||||
|
var documentWidth = $(document).width();
|
||||||
|
canvasWidth = documentWidth * scaleFactor;
|
||||||
|
|
||||||
|
$("#sketchpad").prop("width", canvasWidth);
|
||||||
|
|
||||||
loadSettingsAccordingToBWP();
|
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) {
|
function initBeWoMobile(actionPath) {
|
||||||
try {
|
try {
|
||||||
$("#recordLoader_select, #kategorien_select, #leistungen_select, #textbausteine_select").prop("disabled", true);
|
$("#recordLoader_select, #kategorien_select, #leistungen_select, #textbausteine_select").prop("disabled", true);
|
||||||
@@ -269,6 +285,8 @@ $(document).on("change", ".edit-form-input",
|
|||||||
saveFormValuesLocally();
|
saveFormValuesLocally();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).change(function() { console.log("test"); });
|
||||||
|
|
||||||
function saveFormValuesLocally() {
|
function saveFormValuesLocally() {
|
||||||
var recordObject = {
|
var recordObject = {
|
||||||
category: $("#kategorien_select").val(),
|
category: $("#kategorien_select").val(),
|
||||||
|
|||||||
@@ -976,6 +976,9 @@ function nextDayButtonClick() {
|
|||||||
loadAppointments(newtoday);
|
loadAppointments(newtoday);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var canvas, ctx;
|
var canvas, ctx;
|
||||||
var mouseX, mouseY, mouseDown = 0;
|
var mouseX, mouseY, mouseDown = 0;
|
||||||
var lastpositionx = 0;
|
var lastpositionx = 0;
|
||||||
@@ -985,16 +988,15 @@ var newpositiony = 0;
|
|||||||
var minuswert = -20;
|
var minuswert = -20;
|
||||||
var maxwert = 20;
|
var maxwert = 20;
|
||||||
var posix = 0;
|
var posix = 0;
|
||||||
var posiy = 0;
|
var posiy = 0;
|
||||||
|
var r, g, b = 0;
|
||||||
|
var a = 255;
|
||||||
|
|
||||||
function loadUnterschriftFeldFunktion() {
|
function loadUnterschriftFeldFunktion() {
|
||||||
function drawDot(ctx, x, y, size) {
|
function drawDot(ctx, x, y, size) {
|
||||||
r = 0; g = 0; b = 0; a = 255;
|
|
||||||
|
|
||||||
ctx.fillStyle = "rgba(" + r + "," + g + "," + b + "," + (a / 255) + ")";
|
ctx.fillStyle = "rgba(" + r + "," + g + "," + b + "," + (a / 255) + ")";
|
||||||
|
|
||||||
if(lastpositionx != 0) {
|
if(lastpositionx !== 0) {
|
||||||
|
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
ctx.arc(x, y, size, 1, Math.PI * 0.25, true);
|
ctx.arc(x, y, size, 1, Math.PI * 0.25, true);
|
||||||
newpositionx = x;
|
newpositionx = x;
|
||||||
@@ -1042,14 +1044,14 @@ function loadUnterschriftFeldFunktion() {
|
|||||||
function sketchpadMouseMove(e) {
|
function sketchpadMouseMove(e) {
|
||||||
getMousePos(e);
|
getMousePos(e);
|
||||||
|
|
||||||
if(mouseDown == 1) {
|
if(mouseDown === 1) {
|
||||||
drawDot(ctx, mouseX, mouseY, 3);
|
drawDot(ctx, mouseX, mouseY, 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getMousePos(e) {
|
function getMousePos(e) {
|
||||||
if(!e) {
|
if(!e) {
|
||||||
var e = event;
|
e = event;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(e.offsetX) {
|
if(e.offsetX) {
|
||||||
@@ -1076,7 +1078,7 @@ function loadUnterschriftFeldFunktion() {
|
|||||||
|
|
||||||
function getTouchPos(e) {
|
function getTouchPos(e) {
|
||||||
if (!e) {
|
if (!e) {
|
||||||
var e = event;
|
e = event;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.touches) {
|
if (e.touches) {
|
||||||
@@ -1089,12 +1091,12 @@ function loadUnterschriftFeldFunktion() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
//canvas = $("#sketchpad");
|
canvas = document.getElementById("sketchpad");
|
||||||
canvas = document.getElementById('sketchpad');
|
|
||||||
|
|
||||||
if (canvas.getContext) {
|
if (canvas.getContext) {
|
||||||
ctx = canvas.getContext('2d');
|
ctx = canvas.getContext("2d");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctx) {
|
if (ctx) {
|
||||||
canvas.addEventListener("mousedown", sketchpadMouseDown, false);
|
canvas.addEventListener("mousedown", sketchpadMouseDown, false);
|
||||||
canvas.addEventListener("mousemove", sketchpadMouseMove, false);
|
canvas.addEventListener("mousemove", sketchpadMouseMove, false);
|
||||||
@@ -1245,6 +1247,8 @@ function loescheUnterschrift(canvas, ctx) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function preloadData(serviceRecordOid) {
|
function preloadData(serviceRecordOid) {
|
||||||
initSignatureInfo(serviceRecordOid);
|
initSignatureInfo(serviceRecordOid);
|
||||||
}
|
}
|
||||||
@@ -1291,6 +1295,7 @@ function klientenLaden() {
|
|||||||
if(oid === -1) {
|
if(oid === -1) {
|
||||||
$("#klientenTabelle").css("display", "none");
|
$("#klientenTabelle").css("display", "none");
|
||||||
$("#umfeldContainer").css("display", "none");
|
$("#umfeldContainer").css("display", "none");
|
||||||
|
$("#kommentarContainer").css("display", "none");
|
||||||
|
|
||||||
hideSanduhr();
|
hideSanduhr();
|
||||||
|
|
||||||
@@ -1300,6 +1305,7 @@ function klientenLaden() {
|
|||||||
makeAjaxCall("GET", getSelectedCustomerUrl, function (json) {
|
makeAjaxCall("GET", getSelectedCustomerUrl, function (json) {
|
||||||
$("#klientenTabelle").css("display", "block");
|
$("#klientenTabelle").css("display", "block");
|
||||||
$("#umfeldContainer").css("display", "block");
|
$("#umfeldContainer").css("display", "block");
|
||||||
|
$("#kommentarContainer").css("display", "block");
|
||||||
|
|
||||||
if(json === "SessionTimeout") {
|
if(json === "SessionTimeout") {
|
||||||
window.location.href = redirectLink;
|
window.location.href = redirectLink;
|
||||||
@@ -1313,11 +1319,10 @@ function klientenLaden() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
customerOid: oid
|
customerOid: oid
|
||||||
},
|
},
|
||||||
hideSanduhr);
|
hideSanduhr);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function KlientenVM() {
|
function KlientenVM() {
|
||||||
@@ -1342,6 +1347,7 @@ function KlientenVM() {
|
|||||||
this.Wohnheim = ko.observable("");
|
this.Wohnheim = ko.observable("");
|
||||||
this.mobileLink = ko.observable("");
|
this.mobileLink = ko.observable("");
|
||||||
this.landLineLink = ko.observable("");
|
this.landLineLink = ko.observable("");
|
||||||
|
this.kommentar = ko.observable("");
|
||||||
|
|
||||||
this.update = function (data) {
|
this.update = function (data) {
|
||||||
this.vorname(data.Vorname);
|
this.vorname(data.Vorname);
|
||||||
@@ -1366,6 +1372,7 @@ function KlientenVM() {
|
|||||||
this.handy(data.Handy);
|
this.handy(data.Handy);
|
||||||
this.mobileLink('tel:' + data.Handy);
|
this.mobileLink('tel:' + data.Handy);
|
||||||
this.landLineLink('tel:' + data.Telefon);
|
this.landLineLink('tel:' + data.Telefon);
|
||||||
|
this.kommentar(data.Kommentar);
|
||||||
|
|
||||||
var mappedUmfeldpersonen = $.map(data.Umfeldpersonen, function (item) { return new UmfPers(item); });
|
var mappedUmfeldpersonen = $.map(data.Umfeldpersonen, function (item) { return new UmfPers(item); });
|
||||||
|
|
||||||
@@ -1427,22 +1434,22 @@ function calcPropFieldMinSizes() {
|
|||||||
|
|
||||||
$(".eigenschaftsdiv").each(
|
$(".eigenschaftsdiv").each(
|
||||||
function (index, element) {
|
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 temporaryWidth = x.outerWidth(true);
|
||||||
var temporaryHeight = x.outerHeight(true);
|
var temporaryHeight = x.outerHeight(true);
|
||||||
|
|
||||||
x.remove();
|
x.remove();
|
||||||
|
|
||||||
elementCount++;
|
elementCount++;
|
||||||
|
|
||||||
if(temporaryWidth > width) {
|
if(temporaryWidth > width) {
|
||||||
width = temporaryWidth;
|
width = temporaryWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(temporaryHeight > height) {
|
if(temporaryHeight > height) {
|
||||||
height = temporaryHeight;
|
height = temporaryHeight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -1468,11 +1475,11 @@ function updateEigenschaftsfelder() {
|
|||||||
|
|
||||||
var width = parseInt(customerTableWidth / maxAnzahl) - 16;
|
var width = parseInt(customerTableWidth / maxAnzahl) - 16;
|
||||||
|
|
||||||
if(minSizes != undefined) {
|
if(minSizes !== undefined) {
|
||||||
$(".eigenschaftsdiv").each(
|
$(".eigenschaftsdiv").each(
|
||||||
function (index, element) {
|
function (index, element) {
|
||||||
$(element).css("width", width + "px");
|
$(element).css("width", width + "px");
|
||||||
$(element).css("height", (minSizes.minHeight - 16) + "px");
|
$(element).css("height", (minSizes.minHeight - 16) + "px");
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1498,13 +1505,13 @@ function hideSanduhr() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($("#SuccessPopupDiv").css("display") === "none" && $("#popupDiv").css("display") === "none") {
|
if($("#SuccessPopupDiv").css("display") === "none" && $("#popupDiv").css("display") === "none") {
|
||||||
$(".modalWrapper").css("display", "none");
|
$(".modalWrapper").css("display", "none");
|
||||||
$(".modalWrapper").css("height", "0");
|
$(".modalWrapper").css("height", "0");
|
||||||
}
|
}
|
||||||
|
|
||||||
if($("#AendernPopupDiv").css("display") === "none" && $("#popupDiv").css("display") === "none") {
|
if($("#AendernPopupDiv").css("display") === "none" && $("#popupDiv").css("display") === "none") {
|
||||||
$(".modalWrapper").css("display", "none");
|
$(".modalWrapper").css("display", "none");
|
||||||
$(".modalWrapper").css("height", "0");
|
$(".modalWrapper").css("height", "0");
|
||||||
}
|
}
|
||||||
|
|
||||||
$(".warte-animation").css("display", "none");
|
$(".warte-animation").css("display", "none");
|
||||||
@@ -1652,7 +1659,7 @@ function preselectCustomer() {
|
|||||||
$("#customersDropDown option").each(function () {
|
$("#customersDropDown option").each(function () {
|
||||||
if(this.value === valueToSelect === true) {
|
if(this.value === valueToSelect === true) {
|
||||||
$("#customersDropDown").val(valueToSelect);
|
$("#customersDropDown").val(valueToSelect);
|
||||||
$("#customersDropDown").trigger('change');
|
$("#customersDropDown").trigger("change");
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Web;
|
||||||
using BS.Shared.DataContracts;
|
using BS.Shared.DataContracts;
|
||||||
|
|
||||||
namespace BeWoPlanerMobil.Util
|
namespace BeWoPlanerMobil.Util
|
||||||
@@ -48,5 +48,17 @@ namespace BeWoPlanerMobil.Util
|
|||||||
|
|
||||||
return decValue;
|
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(" ", " ");
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -796,36 +796,42 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<!--############################################## Wohnheim gedöns #####################################################################################
|
<!--############################################## Wohnheim gedöns #####################################################################################
|
||||||
<div class="eigenschaftsdiv" id="WohnheimContainer">
|
<div class="eigenschaftsdiv" id="WohnheimContainer">
|
||||||
<h4>Wohnheim zugehörigkeit</h4>
|
<h4>Wohnheim zugehörigkeit</h4>
|
||||||
<hr />
|
<hr />
|
||||||
<table class="width-inheriting-table">
|
<table class="width-inheriting-table">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="customer-td">Name:</td>
|
<td class="customer-td">Name:</td>
|
||||||
<td class="contentTd" >a</td><!--data-bind="text: WohnheimName"
|
<td class="contentTd" >a</td><!--data-bind="text: WohnheimName"
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="customer-td">Strasse:</td>
|
<td class="customer-td">Strasse:</td>
|
||||||
<td class="contentTd" >e</td>
|
<td class="contentTd" >e</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="customer-td">Postleitzahl:</td>
|
<td class="customer-td">Postleitzahl:</td>
|
||||||
<td class="contentTd" >i</td>
|
<td class="contentTd" >i</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="customer-td">Ort:</td>
|
<td class="customer-td">Ort:</td>
|
||||||
<td class="contentTd" >o</td>
|
<td class="contentTd" >o</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="customer-td">Bemerkung:</td>
|
<td class="customer-td">Bemerkung:</td>
|
||||||
<td class="contentTd" data-bind="text: WohnheimName" >u</td>
|
<td class="contentTd" data-bind="text: WohnheimName" >u</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>-->
|
</div>-->
|
||||||
</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">
|
<div style="padding-right: 1em;" id="umfeldContainer">
|
||||||
<h4 style="display: inline; color: #AB4A07;">Umfeld</h4>
|
<h4 style="display: inline; color: #AB4A07;">Umfeld</h4>
|
||||||
<hr />
|
<hr />
|
||||||
@@ -835,46 +841,47 @@
|
|||||||
<div style="display: none;" class="kollabierbar">
|
<div style="display: none;" class="kollabierbar">
|
||||||
<table class="width-inheriting-table">
|
<table class="width-inheriting-table">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr class="testklasse">
|
<tr class="testklasse">
|
||||||
<td class="customer-td">Rolle:</td>
|
<td class="customer-td">Rolle:</td>
|
||||||
<td class="contentTd" data-bind="text: umfrolle"></td>
|
<td class="contentTd" data-bind="text: umfrolle"></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="testklasse">
|
<tr class="testklasse">
|
||||||
<td class="customer-td">Adresse:</td>
|
<td class="customer-td">Adresse:</td>
|
||||||
<td class="contentTd" data-bind="text: umfstrnr"></td>
|
<td class="contentTd" data-bind="text: umfstrnr"></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="testklasse">
|
<tr class="testklasse">
|
||||||
<td class="customer-td"></td>
|
<td class="customer-td"></td>
|
||||||
<td class="contentTd" data-bind="text: umfplzort"></td>
|
<td class="contentTd" data-bind="text: umfplzort"></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="testklasse">
|
<tr class="testklasse">
|
||||||
<td class="customer-td">Tel.:</td>
|
<td class="customer-td">Tel.:</td>
|
||||||
<td class="contentTd">
|
<td class="contentTd">
|
||||||
<a style="color: black" data-bind="attr: { href: umftelnr, title: nurtelnr }, text: nurtelnr"></a>
|
<a style="color: black" data-bind="attr: { href: umftelnr, title: nurtelnr }, text: nurtelnr"></a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="testklasse">
|
<tr class="testklasse">
|
||||||
<td class="customer-td">Mobil:</td>
|
<td class="customer-td">Mobil:</td>
|
||||||
<td class="contentTd">
|
<td class="contentTd">
|
||||||
<a style="color: black" data-bind="attr: { href: umfmobil, title: nurmobil }, text: nurmobil"></a>
|
<a style="color: black" data-bind="attr: { href: umfmobil, title: nurmobil }, text: nurmobil"></a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="testklasse">
|
<tr class="testklasse">
|
||||||
<td class="customer-td">E-Mail</td>
|
<td class="customer-td">E-Mail</td>
|
||||||
<td class="contentTd">
|
<td class="contentTd">
|
||||||
<a style="color: black" data-bind="attr: { href: umfemail, title: nuremail }, text: nuremail"></a>
|
<a style="color: black" data-bind="attr: { href: umfemail, title: nuremail }, text: nuremail"></a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="testklasse">
|
<tr class="testklasse">
|
||||||
<td class="customer-td">Fax:</td>
|
<td class="customer-td">Fax:</td>
|
||||||
<td class="contentTd" data-bind="text: umffax"></td>
|
<td class="contentTd" data-bind="text: umffax"></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="Kalender">
|
<div id="Kalender">
|
||||||
@@ -973,14 +980,17 @@
|
|||||||
<input class="floating-label-input" id="UnterschriftDatum" readonly name="Datum/Uhrzeit" />
|
<input class="floating-label-input" id="UnterschriftDatum" readonly name="Datum/Uhrzeit" />
|
||||||
|
|
||||||
<input id="SaveRecordOID" readonly name="OID" style="display: none" />
|
<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>
|
||||||
|
|
||||||
<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>
|
</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>
|
||||||
|
|
||||||
<div id="SupportStatistik" style="display: none" align="center" >
|
<div id="SupportStatistik" style="display: none" align="center" >
|
||||||
|
|||||||
@@ -119,7 +119,7 @@
|
|||||||
<add key="ClientValidationEnabled" value="true"/>
|
<add key="ClientValidationEnabled" value="true"/>
|
||||||
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
|
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
|
||||||
<!--<add key="MultitenancyPath" value="D:\Projects\BeWo\Host\Multitenancy\"/>-->
|
<!--<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="LicenseInfoUrl" value="https://support.bewoplaner.de/api/getlicensecount.php?k=[TENANT]" />
|
||||||
<add key="LicenseOrderUrl" value="https://support.bewoplaner.de/lizenzbestellung/?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]" />
|
<add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ namespace BeWo.Service.Plugins
|
|||||||
//t = "8001550599"; // Biallas BeWo
|
//t = "8001550599"; // Biallas BeWo
|
||||||
//t = "7282396774"; // Caritas Unna
|
//t = "7282396774"; // Caritas Unna
|
||||||
//t = "6884855402"; // IBP
|
//t = "6884855402"; // IBP
|
||||||
//t = "4867997795"; // ADiK Kleve
|
t = "4867997795"; // ADiK Kleve
|
||||||
//t = "3184859776"; // Sergej Becker
|
//t = "3184859776"; // Sergej Becker
|
||||||
//t = "7752610643"; // BWK Gbr
|
//t = "7752610643"; // BWK Gbr
|
||||||
//t = "3785623125"; // Betreuwo
|
//t = "3785623125"; // Betreuwo
|
||||||
@@ -161,7 +161,7 @@ namespace BeWo.Service.Plugins
|
|||||||
//t = "1873138856"; // BUG e.V.
|
//t = "1873138856"; // BUG e.V.
|
||||||
//t = "6463422907"; // Caritas Leverkusen
|
//t = "6463422907"; // Caritas Leverkusen
|
||||||
//t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch
|
//t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch
|
||||||
t = "6548202677"; // VKM Aachen SBD
|
//t = "6548202677"; // VKM Aachen SBD
|
||||||
//t = "7803602698"; // Taubblindendienst
|
//t = "7803602698"; // Taubblindendienst
|
||||||
//t = "5518600303"; // Wetterleuchten e.V.
|
//t = "5518600303"; // Wetterleuchten e.V.
|
||||||
//t = "4096649015"; // AWO Dortmund
|
//t = "4096649015"; // AWO Dortmund
|
||||||
|
|||||||
@@ -2096,7 +2096,7 @@ namespace BeWo.Service.ServiceImplementations
|
|||||||
CustomerInsUser = lOriginal.InsUser,
|
CustomerInsUser = lOriginal.InsUser,
|
||||||
CustomerOid = Oid ?? lOriginal.Oid,
|
CustomerOid = Oid ?? lOriginal.Oid,
|
||||||
CustomerUdpUser = lOriginal.UdpUser,
|
CustomerUdpUser = lOriginal.UdpUser,
|
||||||
CustomerVersion = lOriginal.Version.Value,
|
CustomerVersion = lOriginal.Version ?? 0,
|
||||||
DebitorNumber = lOriginal.DebitorNumber,
|
DebitorNumber = lOriginal.DebitorNumber,
|
||||||
Diagnosis = lOriginal.Diagnosis,
|
Diagnosis = lOriginal.Diagnosis,
|
||||||
Environment = lOriginal.Environment,
|
Environment = lOriginal.Environment,
|
||||||
|
|||||||
Reference in New Issue
Block a user