From cc642e98389cfc92d3fa2607ff8df4678207a91c Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Jun 2018 16:35:19 +0200 Subject: [PATCH] CB --- BeWo/BeWo.csproj | 146 +-- BeWoPlanerMobil/Controllers/MainController.cs | 1 + BeWoPlanerMobil/Scripts/calendar.js | 68 +- BeWoPlanerMobil/Scripts/dateHelper.js | 124 +-- BeWoPlanerMobil/Scripts/gruppenbuchung.js | 24 +- BeWoPlanerMobil/Scripts/initialization.js | 60 +- BeWoPlanerMobil/Scripts/mainView.js | 228 ++--- BeWoPlanerMobil/Scripts/statistics.js | 10 +- BeWoPlanerMobil/Scripts/utils.js | 30 +- BeWoPlanerMobil/Views/Main/Main.cshtml | 10 +- BeWoPlanerMobil/Views/Shared/Error.cshtml | 2 +- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 26 +- BeWoPlanerMobil/Web.config | 5 +- Host/Multitenancy/demo.config | 2 +- .../ServicesOverviewReport.Designer.cs | 1 + .../ServicesOverviewReport.cs | 47 +- .../DiakonieNeustadtAisch.csproj | 23 + .../Properties/licenses.licx | 1 + .../ServiceRecordListReport.Designer.cs | 71 +- .../ServiceRecordListReport.cs | 11 + .../LeistungsnachweiseSpfh.Designer.cs | 45 - .../SettlementReport.Designer.cs | 969 ++++++++++++++++++ ReportImp/SkmLeverkusen/SettlementReport.cs | 222 ++++ ReportImp/SkmLeverkusen/SettlementReport.resx | 127 +++ ReportImp/SkmLeverkusen/SkmLeverkusen.csproj | 18 + .../ServicesOverviewReport.Designer.cs | 56 +- Service/Plugins/PluginLoader.cs | 4 +- Shared/Core/Utils.cs | 21 +- 28 files changed, 1891 insertions(+), 461 deletions(-) create mode 100644 ReportImp/SkmLeverkusen/SettlementReport.Designer.cs create mode 100644 ReportImp/SkmLeverkusen/SettlementReport.cs create mode 100644 ReportImp/SkmLeverkusen/SettlementReport.resx diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 49dc5da2b..54b636677 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -2004,7 +2004,7 @@ - + {8a83c4dc-a0b1-4a51-ae1d-366d7a05b298} ChatController @@ -2099,362 +2099,362 @@ False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly False - Include - True + Include + True Assembly diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 33ad5907f..c298e7e5e 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -2323,6 +2323,7 @@ namespace BeWoPlanerMobil.Controllers } catch (Exception e) { + log.Info("Error in SetServiceRecordEmployee:"); log.Error(e.Message, e); throw e; } diff --git a/BeWoPlanerMobil/Scripts/calendar.js b/BeWoPlanerMobil/Scripts/calendar.js index f793dda4e..76bc47c2a 100644 --- a/BeWoPlanerMobil/Scripts/calendar.js +++ b/BeWoPlanerMobil/Scripts/calendar.js @@ -20,7 +20,7 @@ function loadAppointments(newtoday) { url: loadAppointmentsUrl, data: { newtoday: newtoday }, success: function(json) { - const kalenderRec = $.parseJSON(json); + var kalenderRec = $.parseJSON(json); var html = ""; @@ -28,11 +28,11 @@ function loadAppointments(newtoday) { var i = 0; $.each(kalenderRec, function(index, termin) { - const description = termin.Subject; - const startD = termin.StartDate; - const endD = termin.EndDate; - const date = new Date(startD); - const dateend = new Date(endD); + var description = termin.Subject; + var startD = termin.StartDate; + var endD = termin.EndDate; + var date = new Date(startD); + var dateend = new Date(endD); appointments[termin.SchedulerAppointmentOid] = termin; @@ -53,17 +53,17 @@ function appointmentOnClick(appointmentOid) { return; } - const selectedAppointment = appointments[appointmentOid]; + var selectedAppointment = appointments[appointmentOid]; if(selectedAppointment.RecurrenceInfo !== null) { return; } - const startDate = new Date(selectedAppointment.StartDate); - const endDate = new Date(selectedAppointment.EndDate); + var startDate = new Date(selectedAppointment.StartDate); + var endDate = new Date(selectedAppointment.EndDate); - const startTime = getHoursAndMinutesWithLeadingZeros(startDate); - const endTime = getHoursAndMinutesWithLeadingZeros(endDate); + var startTime = getHoursAndMinutesWithLeadingZeros(startDate); + var endTime = getHoursAndMinutesWithLeadingZeros(endDate); window.selectedAppointmentOid = selectedAppointment.SchedulerAppointmentOid; @@ -100,9 +100,9 @@ function updateSelectedAppointment() { day: currentAppointment.startDate, endDate: currentAppointment.endDate }, success: function() { - const dp = $("#KalenderDatumFormat").val(); - const dateParts = dp.split("."); - const nextdatum2 = new Date(dateParts[2], (dateParts[1] - 1), dateParts[0]); + var dp = $("#KalenderDatumFormat").val(); + var dateParts = dp.split("."); + var nextdatum2 = new Date(dateParts[2], (dateParts[1] - 1), dateParts[0]); $("#KalenderDatum").val(toDateStringYearMonthDay(nextdatum2)); $("#KalenderDatumFormat").val(dp); @@ -124,11 +124,11 @@ function updateAppointmentOnClick() { } function checkAppointmentFields() { - const newAppointmentStartDate = $("#StartDate").val(); - const newAppointmentEndDate = $("#EndDate").val(); - const newAppointmentStartTime = $("#TerminStartZeit").val(); - const newAppointmentEndTime = $("#TerminEndZeit").val(); - const newAppointmentSubject = $("#TerminBetreff").val(); + var newAppointmentStartDate = $("#StartDate").val(); + var newAppointmentEndDate = $("#EndDate").val(); + var newAppointmentStartTime = $("#TerminStartZeit").val(); + var newAppointmentEndTime = $("#TerminEndZeit").val(); + var newAppointmentSubject = $("#TerminBetreff").val(); if(newAppointmentStartDate === "" || newAppointmentEndDate === "" || newAppointmentStartTime === "" || newAppointmentEndTime === "" || newAppointmentSubject === "") { writeFatalErrorMessage("Bitte geben Sie Uhrzeit und Betreff ein."); @@ -187,9 +187,9 @@ function insertNewAppointment(pStartDate, pStartTime, pEndTime, pSubject, pNotic } function selectDate() { - const dp = $("#KalenderDatumFormat").val(); - const dateParts = dp.split("."); - const nextdatum2 = new Date(dateParts[2], (dateParts[1] - 1), dateParts[0]); + var dp = $("#KalenderDatumFormat").val(); + var dateParts = dp.split("."); + var nextdatum2 = new Date(dateParts[2], (dateParts[1] - 1), dateParts[0]); $("#KalenderDatum").val(toDateStringYearMonthDay(nextdatum2)); $("#KalenderDatumFormat").val(dp); @@ -198,12 +198,12 @@ function selectDate() { } function previousDayButtonClick() { - const nextdatum = new Date($("#KalenderDatum").val()); + var nextdatum = new Date($("#KalenderDatum").val()); nextdatum.setDate((nextdatum.getDate() - 1)); $("#KalenderDatum").val(toDateStringYearMonthDay(nextdatum)); - const newtoday = getDateStringWithLeadingZeros(nextdatum); + var newtoday = getDateStringWithLeadingZeros(nextdatum); $("#KalenderDatumFormat").val(newtoday); @@ -216,27 +216,27 @@ function loadBeWoTask(newtoday) { url: loadBewoTasksUrl, data: { newtoday: newtoday }, success: function(json) { - const kalenderRec = $.parseJSON(json); + var kalenderRec = $.parseJSON(json); var html = ""; $("#KalenderTableTask").empty(); var zahl = 0; $.each(kalenderRec, function(index, termin) { - const description = termin.Title; - const date = new Date(termin.DueDate); + var description = termin.Title; + var date = new Date(termin.DueDate); if(zahl === 0) { html += "Aufgaben"; } - //const minutes = date.getMinutes() < 10 ? `0${date.getMinutes().toString()}` : date.getMinutes().toString(); - //const hours = date.getHours() < 10 ? `0${date.getHours().toString()}` : date.getHours().toString(); + //var minutes = date.getMinutes() < 10 ? `0${date.getMinutes().toString()}` : date.getMinutes().toString(); + //var hours = date.getHours() < 10 ? `0${date.getHours().toString()}` : date.getHours().toString(); - const minutes = date.getMinutes() < 10 ? '0' + date.getMinutes().toString() : date.getMinutes.toString(); - const hours = date.getHours() < 10 ? '0' + date.getHours().toString() : date.getHours().toString(); + var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes().toString() : date.getMinutes.toString(); + var hours = date.getHours() < 10 ? '0' + date.getHours().toString() : date.getHours().toString(); - const farbe = "2B508B"; + var farbe = "2B508B"; //html += `${hours.fontcolor(farbe)}:${minutes.fontcolor(farbe)} ${description}`; html += ''+hours.fontcolor(farbe)+':' + minutes.fontcolor(farbe) + ' ' + description + ''; @@ -249,8 +249,8 @@ function loadBeWoTask(newtoday) { } function LoadOnly(i, x) { - const serviceRecord = localStorage.getItem("Zeitdaten"); - const appointment = localStorage.getItem("Kalenderdaten"); + var serviceRecord = localStorage.getItem("Zeitdaten"); + var appointment = localStorage.getItem("Kalenderdaten"); if(serviceRecord != null || appointment != null) { if(serviceRecord != null && i === 1) { diff --git a/BeWoPlanerMobil/Scripts/dateHelper.js b/BeWoPlanerMobil/Scripts/dateHelper.js index ffe20a55b..455c51fe2 100644 --- a/BeWoPlanerMobil/Scripts/dateHelper.js +++ b/BeWoPlanerMobil/Scripts/dateHelper.js @@ -1,25 +1,25 @@ function getDateTimeStringWithLeadingZeros(pDate) { - const dateStr = getDateStringWithLeadingZeros(pDate); + var dateStr = getDateStringWithLeadingZeros(pDate); - const hh = (pDate.getHours() < 10 ? "0" : "") + pDate.getHours(); - const m = (pDate.getMinutes() < 10 ? "0" : "") + pDate.getMinutes(); - const ss = (pDate.getSeconds() < 10 ? "0" : "") + pDate.getSeconds(); + var hh = (pDate.getHours() < 10 ? "0" : "") + pDate.getHours(); + var m = (pDate.getMinutes() < 10 ? "0" : "") + pDate.getMinutes(); + var ss = (pDate.getSeconds() < 10 ? "0" : "") + pDate.getSeconds(); return dateStr + " " + hh + ":" + m + ":" + ss; } function getDateStringWithLeadingZeros(pDate) { - const dd = (pDate.getDate() < 10 ? "0" : "") + pDate.getDate().toString(); - const mm = ((pDate.getMonth() + 1) < 10 ? "0" : "") + (pDate.getMonth() + 1); - const yyyy = pDate.getFullYear(); + var dd = (pDate.getDate() < 10 ? "0" : "") + pDate.getDate().toString(); + var mm = ((pDate.getMonth() + 1) < 10 ? "0" : "") + (pDate.getMonth() + 1); + var yyyy = pDate.getFullYear(); return dd + "." + mm + "." + yyyy; } function subtractDates(date1, date2) { - const t1 = date1.getTime(); - const t2 = date2.getTime(); - const diff = (t2 - t1) / 60000; + var t1 = date1.getTime(); + var t2 = date2.getTime(); + var diff = (t2 - t1) / 60000; return Math.abs(diff); } @@ -29,7 +29,7 @@ function addMinutes(date, minutes) { } function stringToTime(str) { - const defaultResult = [-1, -1]; + var defaultResult = [-1, -1]; str = str.replace(":", ""); str = str.replace(".", ""); @@ -50,8 +50,8 @@ function stringToTime(str) { } } - const minutes = str.slice(2, 4); - const hours = str.slice(0, 2); + var minutes = str.slice(2, 4); + var hours = str.slice(0, 2); defaultResult[0] = parseInt(hours); defaultResult[1] = parseInt(minutes); @@ -62,8 +62,8 @@ function stringToTime(str) { function actualDurationWithEndDate() { if($("#enddatum_textbox").val() !== "") { if($("#enddatum_textbox").val() !== $("#datum_textbox").val()) { - let endDateObj = getEndDateObj(); - const startDateObj = getDateObj(true); + var endDateObj = getEndDateObj(); + var startDateObj = getDateObj(true); if(endDateObj < startDateObj) { endDateObj = setHoursAndMinutes(new Date(startDateObj.getTime()), $("#ende_textbox").val()); @@ -75,12 +75,12 @@ function actualDurationWithEndDate() { console.log('end date: ' + endDateObj); } - const endDate = endDateObj.getDate(); - const startDate = startDateObj.getDate(); + var endDate = endDateObj.getDate(); + var startDate = startDateObj.getDate(); - const diffInMs = endDateObj - startDateObj; - const diffInS = diffInMs / 1000; - const diffInMins = diffInS / 60; + var diffInMs = endDateObj - startDateObj; + var diffInS = diffInMs / 1000; + var diffInMins = diffInS / 60; //console.log(`end date: ${endDate}`); //console.log(`difference in minutes: ${diffInMins}`); @@ -88,17 +88,17 @@ function actualDurationWithEndDate() { console.log('end date: ' + endDate); console.log('difference in minutes: ' + diffInMins); - const dateDifference = endDate - startDate; + var dateDifference = endDate - startDate; - const endDateString = $("#ende_textbox").val(); + var endDateString = $("#ende_textbox").val(); - const startDateString = $("#start_textbox").val(); + var startDateString = $("#start_textbox").val(); - let duration = diffInMins;// - startDateString; + var duration = diffInMins;// - startDateString; //console.log(`dateDifference: ${dateDifference}`); console.log('dateDifference: ' + dateDifference); - const rest = duration % 100; + var rest = duration % 100; duration = duration - rest; @@ -112,10 +112,10 @@ function actualDurationWithEndDate() { } function getEndDateObj() { - const rawEnddate = $("#enddatum_textbox").val(); - const day = parseInt(rawEnddate.slice(0, 2)); - const month = parseInt(rawEnddate.slice(3, 5)); - const year = parseInt(rawEnddate.slice(6, 10)); + var rawEnddate = $("#enddatum_textbox").val(); + var day = parseInt(rawEnddate.slice(0, 2)); + var month = parseInt(rawEnddate.slice(3, 5)); + var year = parseInt(rawEnddate.slice(6, 10)); var hoursAndMinutes = [0, 0]; var date = new Date(); @@ -123,7 +123,7 @@ function getEndDateObj() { date = new Date(year, month - 1, day); } - const endDateString = $("#ende_textbox").val(); + var endDateString = $("#ende_textbox").val(); if(endDateString !== "") { hoursAndMinutes = stringToTime(endDateString); @@ -136,7 +136,7 @@ function getEndDateObj() { } function setHoursAndMinutes(date, timeString) { - let hoursAndMinutes = [0, 0]; + var hoursAndMinutes = [0, 0]; if(timeString !== "") { hoursAndMinutes = stringToTime(timeString); @@ -149,25 +149,25 @@ function setHoursAndMinutes(date, timeString) { } function getHoursAndMinutesWithLeadingZeros(pDate) { - const hours = pDate.getHours(); - const minutes = pDate.getMinutes(); + var hours = pDate.getHours(); + var minutes = pDate.getMinutes(); - //const hoursString = hours < 10 ? `0${hours.toString()}` : hours.toString(); - //const minutesString = minutes < 10 ? `0${minutes.toString()}` : minutes.toString(); + //var hoursString = hours < 10 ? `0${hours.toString()}` : hours.toString(); + //var minutesString = minutes < 10 ? `0${minutes.toString()}` : minutes.toString(); - const hoursString = hours < 10 ? '0' + hours.toString() : hours.toString(); - const minutesString = minutes < 10 ? '0' + minutes.toString() : minutes.toString(); + var hoursString = hours < 10 ? '0' + hours.toString() : hours.toString(); + var minutesString = minutes < 10 ? '0' + minutes.toString() : minutes.toString(); return hoursString + ":" + minutesString; } function toShortDateString(dateString, trennzeichen) { - const geteilt = dateString.split(trennzeichen); + var geteilt = dateString.split(trennzeichen); var yyyy = ""; - const mm = geteilt[1]; - const dd = geteilt[0]; + var mm = geteilt[1]; + var dd = geteilt[0]; - for(let i = 0; i < 4 - geteilt[2].split(" ")[0].length; i++) { + for(var i = 0; i < 4 - geteilt[2].split(" ")[0].length; i++) { yyyy += "0"; } @@ -177,12 +177,12 @@ function toShortDateString(dateString, trennzeichen) { } function toDateStringYearMonthDay(pDate) { - const dd2 = pDate.getDate(); - const mm2 = pDate.getMonth() + 1; - const yyyy2 = pDate.getFullYear(); + var dd2 = pDate.getDate(); + var mm2 = pDate.getMonth() + 1; + var yyyy2 = pDate.getFullYear(); - const ddStr2 = dd2 < 10 ? "0" + dd2 : dd2; - const mmStr2 = mm2 < 10 ? "0" + mm2 : mm2; + var ddStr2 = dd2 < 10 ? "0" + dd2 : dd2; + var mmStr2 = mm2 < 10 ? "0" + mm2 : mm2; return yyyy2 + "-" + mmStr2 + "-" + ddStr2; } @@ -192,8 +192,8 @@ function checkEndDate() { type: "GET", url: CheckEndDateUrl, success: function(json) { - const endDateSettingsString = $.parseJSON(json); - const endDateSetting = parseInt(endDateSettingsString); + var endDateSettingsString = $.parseJSON(json); + var endDateSetting = parseInt(endDateSettingsString); if(endDateSetting === 1) { $("#EndDate_div").css("display", "block"); @@ -215,10 +215,10 @@ function calcDurationByStartEnd() { console.log('is end date visible: ' + endDateVisibleEh()); if($("#enddatum_textbox").val() === $("#datum_textbox").val() || $("#enddatum_textbox").val() === "") { - const shm = getDateObj(true); - const ehm = getDateObj(false); + var shm = getDateObj(true); + var ehm = getDateObj(false); - let dur = 0; + var dur = 0; if(shm.getTime() < ehm.getTime()) { dur = parseInt(subtractDates(ehm, shm)); @@ -233,16 +233,16 @@ function calcDurationByStartEnd() { function calcEndByStartDuration() { if($("#enddatum_textbox").val() === $("#datum_textbox").val() || $("#enddatum_textbox").val() === "") { - const shm2 = getDateObj(true); - const dauer = parseInt($("#duration_textbox").val()); + var shm2 = getDateObj(true); + var dauer = parseInt($("#duration_textbox").val()); if(isNaN(dauer)) { return; } - const neu = addMinutes(shm2, dauer); + var neu = addMinutes(shm2, dauer); - const ende = (neu.getHours() < 10 ? "0" : "") + neu.getHours() + ":" + (neu.getMinutes() < 10 ? "0" : "") + neu.getMinutes(); + var ende = (neu.getHours() < 10 ? "0" : "") + neu.getHours() + ":" + (neu.getMinutes() < 10 ? "0" : "") + neu.getMinutes(); $("#ende_textbox").val(ende).trigger("change"); } @@ -252,22 +252,22 @@ function calcEndByStartDuration() { } function calcStartByEndDuration() { - const ehm2 = getDateObj(false); - const dauer2 = parseInt($("#duration_textbox").val()); + var ehm2 = getDateObj(false); + var dauer2 = parseInt($("#duration_textbox").val()); if(isNaN(dauer2)) { return; } - const neu2 = addMinutes(ehm2, dauer2 * -1); + var neu2 = addMinutes(ehm2, dauer2 * -1); $("#start_textbox").val((neu2.getHours() < 10 ? "0" : "") + neu2.getHours() + (neu2.getMinutes() < 10 ? "0" : "") + neu2.getMinutes()).trigger("change"); } function getDateObj(isFromStart) { - const roh = $("#datum_textbox").val(); - const dd = parseInt(roh.slice(0, 2)); - const mm = parseInt(roh.slice(3, 5)); - const yyyy = parseInt(roh.slice(6, 10)); + var roh = $("#datum_textbox").val(); + var dd = parseInt(roh.slice(0, 2)); + var mm = parseInt(roh.slice(3, 5)); + var yyyy = parseInt(roh.slice(6, 10)); var date = new Date(); if(!isNaN(dd) && !isNaN(mm) && !isNaN(yyyy)) { diff --git a/BeWoPlanerMobil/Scripts/gruppenbuchung.js b/BeWoPlanerMobil/Scripts/gruppenbuchung.js index cd340e65d..90d5ebd93 100644 --- a/BeWoPlanerMobil/Scripts/gruppenbuchung.js +++ b/BeWoPlanerMobil/Scripts/gruppenbuchung.js @@ -7,9 +7,9 @@ function isInEditingMode() { } function initGroupBookingForm() { - const isChecked = isInGroupBookingMode(); - const hide = "none"; - const show = "block"; + var isChecked = isInGroupBookingMode(); + var hide = "none"; + var show = "block"; $("#selectSCForm").css("display", isChecked ? hide : show); $("#gruppenbuchungsContainer").css("display", isChecked ? show : hide); @@ -25,7 +25,7 @@ function removeSupportConceptFromList(pSelectedSupportConceptOid, event) { } function addEmployeeToGruppenbuchung(event) { - const selectedEmployeeOid = $("#groupBookingEmployeesDropDown").find(":selected").val(); + var selectedEmployeeOid = $("#groupBookingEmployeesDropDown").find(":selected").val(); // if($(`#employee_tr_${selectedEmployeeOid}`).length === 0) { if($('#employee_tr_' + selectedEmployeeOid).length === 0) { @@ -44,7 +44,7 @@ function removeEmployeeFromList(pEmployeeOid, event) { } function addSupportConceptToGroupBooking(event) { - const scToAddOid = $($("#multiScDropDown")).find(":selected").val(); + var scToAddOid = $($("#multiScDropDown")).find(":selected").val(); if($('#supportconcept_tr_' + scToAddOid).length === 0) { showSanduhr(); @@ -62,14 +62,14 @@ function selectGroupBookingForEditing(serviceRecordOid) { } function addSupportConceptGroupToGroupBooking(event) { - const groupOidToScOids = $($("#groupDropDown")).find(":selected").val(); + var groupOidToScOids = $($("#groupDropDown")).find(":selected").val(); - const supportConceptOids = groupOidToScOids.split(":")[1].split(","); + var supportConceptOids = groupOidToScOids.split(":")[1].split(","); - let shouldSubmitForm = false; + var shouldSubmitForm = false; - for(let i = 0; i < supportConceptOids.length; i++) { - const isSelected = $('#supportconcept_tr_' + supportConceptOids[i]).length !== 0; + for(var i = 0; i < supportConceptOids.length; i++) { + var isSelected = $('#supportconcept_tr_' + supportConceptOids[i]).length !== 0; //console.log(`support concept oid: ${supportConceptOids[i]}; is already selected: ${isSelected}`); console.log('support concept oid: ' + supportConceptOids[i] + '; is already selected: ' + isSelected); @@ -89,7 +89,7 @@ function addSupportConceptGroupToGroupBooking(event) { var flagData = {}; function setGroupEditingFlag(flag) { - const obj = { + var obj = { flag: flag } @@ -99,7 +99,7 @@ function setGroupEditingFlag(flag) { } function getGroupEditingFlag() { - const storageData = localStorage.flagData; + var storageData = localStorage.flagData; if(storageData !== "undefined") { flagData = JSON.parse(storageData); diff --git a/BeWoPlanerMobil/Scripts/initialization.js b/BeWoPlanerMobil/Scripts/initialization.js index 11abd1604..d1984f4a2 100644 --- a/BeWoPlanerMobil/Scripts/initialization.js +++ b/BeWoPlanerMobil/Scripts/initialization.js @@ -23,7 +23,7 @@ $(document).ready(function() { initBeWoMobile(loadGoalsUrl); - const height = $("#datum_textbox").css("height"); + var height = $("#datum_textbox").css("height"); $(".dropdownlist-for").css("height", height); @@ -67,7 +67,7 @@ function initBeWoMobile(actionPath) { toggleSelectClassesForElement("#recordLoader_select", "#record-loader-select-container"); toggleSelectClassesForElement("#textbausteine_select", "#textbausteine-select-container"); - const selectedServiceCategory = $($("#scDropDown")).find(":selected").val(); + var selectedServiceCategory = $($("#scDropDown")).find(":selected").val(); if(isInGroupBookingMode() && isInEditingMode()) { if(getGroupEditingFlag().flag === false) { @@ -79,7 +79,7 @@ function initBeWoMobile(actionPath) { setGroupEditingFlag(false); } - const shouldActivateForm = isInGroupBookingMode() ? $("#gruppenbuchungsSupportConceptTable tr").length > 0 : selectedServiceCategory !== "-1"; + var shouldActivateForm = isInGroupBookingMode() ? $("#gruppenbuchungsSupportConceptTable tr").length > 0 : selectedServiceCategory !== "-1"; if(shouldActivateForm) { $("#recordLoader_select").prop("disabled", false); @@ -93,15 +93,15 @@ function initBeWoMobile(actionPath) { $(".not-required-input").on("click blur change focus", function() { - const v = $(this).attr("id"); + var v = $(this).attr("id"); setTimeout(function() { toggleLabel(v); }, 1); } ); $("#start_textbox").on("blur", function() { - const startHasValue = $("#start_textbox").val() !== ""; - const endHasValue = $("#ende_textbox").val() !== ""; - const durationHasValue = $("#duration_textbox").val() !== ""; + var startHasValue = $("#start_textbox").val() !== ""; + var endHasValue = $("#ende_textbox").val() !== ""; + var durationHasValue = $("#duration_textbox").val() !== ""; if(startHasValue && endHasValue) { calcDurationByStartEnd(); @@ -111,9 +111,9 @@ function initBeWoMobile(actionPath) { }); $("#ende_textbox").on("blur", function () { - const startHasValue = $("#start_textbox").val() !== ""; - const endHasValue = $("#ende_textbox").val() !== ""; - const durationHasValue = $("#duration_textbox").val() !== ""; + var startHasValue = $("#start_textbox").val() !== ""; + var endHasValue = $("#ende_textbox").val() !== ""; + var durationHasValue = $("#duration_textbox").val() !== ""; if(endHasValue && startHasValue) { calcDurationByStartEnd(); @@ -123,9 +123,9 @@ function initBeWoMobile(actionPath) { }); $("#duration_textbox").on("blur", function () { - const startHasValue = $("#start_textbox").val() !== ""; - const endHasValue = $("#ende_textbox").val() !== ""; - const durationHasValue = $("#duration_textbox").val() !== ""; + var startHasValue = $("#start_textbox").val() !== ""; + var endHasValue = $("#ende_textbox").val() !== ""; + var durationHasValue = $("#duration_textbox").val() !== ""; clearZED(); @@ -136,8 +136,8 @@ function initBeWoMobile(actionPath) { } }); - const supportConceptTableHasEntries = $("#gruppenbuchungsSupportConceptTable").has("td").length; - const employeesTableHasEntries = $("#gruppenbuchungsEmployeeTable").has("td").length; + var supportConceptTableHasEntries = $("#gruppenbuchungsSupportConceptTable").has("td").length; + var employeesTableHasEntries = $("#gruppenbuchungsEmployeeTable").has("td").length; if(isInGroupBookingMode()) { $("#anlegenEditierenBtn").prop("disabled", (supportConceptTableHasEntries === 0 || employeesTableHasEntries === 0)); @@ -149,7 +149,7 @@ function initBeWoMobile(actionPath) { } function toggleSelectClassesForElement(elementIdentifier, parentElement) { - const enabled = $(elementIdentifier).prop("disabled") === "false"; + var enabled = $(elementIdentifier).prop("disabled") === "false"; if(enabled) { $(parentElement).removeClass("disabled-select-container"); @@ -161,8 +161,8 @@ function toggleSelectClassesForElement(elementIdentifier, parentElement) { } function toggleErrorPopup2(errorMessage) { - const isDisplayNone = $("#errorPopupDiv2").css("display") === "none"; - const displayValue = isDisplayNone ? "block" : "none"; + var isDisplayNone = $("#errorPopupDiv2").css("display") === "none"; + var displayValue = isDisplayNone ? "block" : "none"; $("#errorPopupDiv2").css("display", displayValue); $(".modalWrapper").css("display", displayValue); @@ -171,11 +171,11 @@ function toggleErrorPopup2(errorMessage) { if(isDisplayNone) { $("#errorPopupText2").text(errorMessage); - let h = 0; - const t = $("#errorPopupTitle2").outerHeight(); - const u = $("#errorPopupText2").outerHeight(); - const v = $("#errorPopupBtnDiv2").outerHeight(); - const w = $("#errorPopupOkBtn2").outerHeight(); + var h = 0; + var t = $("#errorPopupTitle2").outerHeight(); + var u = $("#errorPopupText2").outerHeight(); + var v = $("#errorPopupBtnDiv2").outerHeight(); + var w = $("#errorPopupOkBtn2").outerHeight(); h += t + u + v + w + w; @@ -217,7 +217,7 @@ function loadSettingsAccordingToBWP() { type: "GET", url: LoadSessionSettingsFromBWPUrl, success: function (json) { - const timeOutSettingsString = $.parseJSON(json); + var timeOutSettingsString = $.parseJSON(json); timeoutSetting = parseInt(timeOutSettingsString); logoutSettingsAccordingToBWP(timeoutSetting); @@ -230,7 +230,7 @@ function initializeDocumentationTextareas() { type: "GET", url: CheckDokuReiterUrl, success: function (json) { - const documentationTypes = $.parseJSON(json); + var documentationTypes = $.parseJSON(json); numberOfDocumentationTypes = documentationTypes.length; if(numberOfDocumentationTypes === 0) { @@ -248,8 +248,8 @@ function initializeDocumentationTextareas() { } if(numberOfDocumentationTypes > 1) { - for(let i = 0; i < numberOfDocumentationTypes; i++) { - const idNumber = i + 1; + for(var i = 0; i < numberOfDocumentationTypes; i++) { + var idNumber = i + 1; //$(`#DokName${idNumber}`).text(documentationTypes[i].TypeDescription); //$(`#Dokumentation${idNumber}`).css("display", "block"); @@ -274,7 +274,7 @@ $(document).on("change", ".edit-form-input", }); function saveFormValuesLocally() { - const recordObject = { + var recordObject = { category: $("#kategorien_select").val(), serviceDescription: $("#leistungen_select").val(), startDate: $("#datum_textbox").val(), @@ -301,7 +301,7 @@ function deleteSavedEditFormValues() { } function loadSavedEditFormValues() { - const storageData = localStorage.savedEditFormValues; + var storageData = localStorage.savedEditFormValues; if(storageData !== "undefined") { savedEditFormValues = JSON.parse(storageData); @@ -313,7 +313,7 @@ function loadSavedEditFormValues() { } function loadSavedValuesIntoForm() { - const values = loadSavedEditFormValues(); + var values = loadSavedEditFormValues(); if(values.category !== "undefined") { $("#kategorien_select").val(values.category); diff --git a/BeWoPlanerMobil/Scripts/mainView.js b/BeWoPlanerMobil/Scripts/mainView.js index 6d3711d98..2ba04078b 100644 --- a/BeWoPlanerMobil/Scripts/mainView.js +++ b/BeWoPlanerMobil/Scripts/mainView.js @@ -17,7 +17,7 @@ function buildCollapsibleSet(jsonString) { return; } - const kollektion = $.parseJSON(jsonString); + var kollektion = $.parseJSON(jsonString); actuallyBuildCollapsibleSet(kollektion, null); } catch(exception) { @@ -56,10 +56,10 @@ function buildGoalTreeItem(goalItem, selectedGoalOids) { } } else { - const goalOid = goalItem.ValueListEntryOid; - const goalHeader = goalItem.Header; + var goalOid = goalItem.ValueListEntryOid; + var goalHeader = goalItem.Header; - const isChecked = selectedGoalOids != null && isElementInArray(selectedGoalOids, goalOid) ? "checked" : ""; + var isChecked = selectedGoalOids != null && isElementInArray(selectedGoalOids, goalOid) ? "checked" : ""; collapsibleHtml += '
' + goalHeader + '
'; } @@ -83,7 +83,7 @@ function loadServiceDescriptionsOnSuccess(json) { return; } - const liste = $.parseJSON(json); + var liste = $.parseJSON(json); $("#leistungen_select").empty(); $("#leistungen_select").val(""); @@ -101,9 +101,9 @@ function loadServiceDescriptionsOnSuccess(json) { makeAjaxCall("GET", loadCategoryAndDescriptionUrl, function(result) { - const arr = result.split("/"); - const descriptionOid = arr[0]; - const categoryOid = arr[1]; + var arr = result.split("/"); + var descriptionOid = arr[0]; + var categoryOid = arr[1]; $("#kategorien_select").val(categoryOid); @@ -147,18 +147,18 @@ function resizeLabelColumns() { zeitRegEx = /^(2[0-3]|[01]?[0-9])(:|,|\.|#|;)?([0-5][0-9])$/; function loadGoals(actionPath) { - const selectedServiceRecord = $($("#scDropDown")).find(":selected").val(); + var selectedServiceRecord = $($("#scDropDown")).find(":selected").val(); makeAjaxCall("GET", actionPath, loadGoalsOnSuccess, { pCostbearer2SupportConceptOid: selectedServiceRecord }, null); } function toggleMenu() { - const menuDiv = $("#menu-div"); + var menuDiv = $("#menu-div"); $(menuDiv).fadeToggle("fast"); } function loadServiceDescriptions() { - const selectedCategory = $("#kategorien_select").find(":selected").val(); + var selectedCategory = $("#kategorien_select").find(":selected").val(); makeAjaxCall("GET", loadServiceCategoriesUrl, loadServiceDescriptionsOnSuccess, { pServiceCategoryOid: selectedCategory }, null); @@ -237,7 +237,7 @@ function setTextModule(moduleOid) { } function setTextbaustein() { - const selectedTextbausteinOid = $("#textbausteine_select").find(":selected").val(); + var selectedTextbausteinOid = $("#textbausteine_select").find(":selected").val(); if (selectedTextbausteinOid > 0) { makeAjaxCall("GET", loadCompleteTextbausteinByOidUrl, loadTextbausteinContentOnSuccess, { pTextbausteinOid: selectedTextbausteinOid }, null); @@ -246,10 +246,10 @@ function setTextbaustein() { function loadTextbausteinContentOnSuccess(textbausteintext) { if (focusedDokuTextarea != null) { - const cursorPosition = focusedDokuTextarea.prop("selectionStart"); - const v = focusedDokuTextarea.val(); - const textBefore = v.substring(0, cursorPosition); - const textAfter = v.substring(cursorPosition, v.length); + var cursorPosition = focusedDokuTextarea.prop("selectionStart"); + var v = focusedDokuTextarea.val(); + var textBefore = v.substring(0, cursorPosition); + var textAfter = v.substring(cursorPosition, v.length); focusedDokuTextarea.val(textBefore + textbausteintext + textAfter); } else { @@ -262,7 +262,7 @@ function updateGoals(cbId) { } function setServiceDescription() { - const sdOid = $("#leistungen_select").find(":selected").val(); + var sdOid = $("#leistungen_select").find(":selected").val(); makeAjaxCall("GET", setServiceDescriptionUrl, function(kek) { }, { pServiceDescriptionOid: sdOid }, function(kek) { }); } @@ -288,13 +288,13 @@ function selectServiceRecord(oid) { var record = $.parseJSON(jsonServiceRecord); - const goals = record.Goals; + var goals = record.Goals; var idArray = new Array(); var meinGoalsArray = new Array(); - let j = 0; - for(let i = 0; i < goals.length; i++) { + var j = 0; + for(var i = 0; i < goals.length; i++) { if(goals[i].ValueListEntryOid !== undefined) { idArray[j] = goals[i].ValueListEntryOid; j++; @@ -364,7 +364,7 @@ function selectServiceRecord(oid) { $("#kategorien_select").val(record.ServiceDescription.Category.ServiceCategoryOid); - const liste = $.parseJSON(result); + var liste = $.parseJSON(result); $("#leistungen_select").empty(); $("#leistungen_select").val(""); @@ -446,11 +446,11 @@ function resetRecordForm() { $("#kategorien_select").val($("#kategorien_select option").eq(0).val()); - for(let i = 0; i < numberOfDocumentationTypes; i++) { + for(var i = 0; i < numberOfDocumentationTypes; i++) { $('#notiz_textbox' + (i + 1)).val(""); } - const selectedCategory = $("#kategorien_select").find(":selected").val(); + var selectedCategory = $("#kategorien_select").find(":selected").val(); if(isInEditingMode()) { console.log('making ajax call to reset the editing mode'); @@ -480,8 +480,8 @@ function resetRecordForm() { } function toggleOnclick(element) { - const collapsedDiv = $(element).next("div"); - const isHidden = "none" === $(collapsedDiv).css("display"); + var collapsedDiv = $(element).next("div"); + var isHidden = "none" === $(collapsedDiv).css("display"); var newIcon = "url('"; newIcon += isHidden ? toggleIconUContentUrl : toggleIconDContentUrl; newIcon += "')"; @@ -491,8 +491,8 @@ function toggleOnclick(element) { } $(document).mouseup(function(e) { - const menu = $("#menu-div"); - const menuBtn = $("#menu-btn"); + var menu = $("#menu-div"); + var menuBtn = $("#menu-btn"); if(!menu.is(e.target) && !menuBtn.is(e.target) && menu.has(e.target).length === 0) { menu.fadeOut("fast"); @@ -510,8 +510,8 @@ function saveCreateServicerecod() { } function validateTimeField(id) { - const timeStr = $(id).val(); - const zeitStr = id === "#start_textbox" ? "Start" : "End"; + var timeStr = $(id).val(); + var zeitStr = id === "#start_textbox" ? "Start" : "End"; if (timeStr !== "" && !zeitRegEx.test(timeStr)) { showZeiterfassungsError('Bitte geben Sie eine ' + + 'xxx-Zeit in einem gültigen Format (HH:MM oder HHMM) an.'); @@ -526,19 +526,19 @@ recordToDelete = 0; function togglePopup(serviceRecordOid) { window.recordToDelete = serviceRecordOid; - const isShowing = $(".modalWrapper").css("display") === "none"; - const displayValue = $(".modalWrapper").css("display") === "block" ? "none" : "block"; + var isShowing = $(".modalWrapper").css("display") === "none"; + var displayValue = $(".modalWrapper").css("display") === "block" ? "none" : "block"; toggleModalWrapper(); $("#popupDiv").css("display", displayValue); if (isShowing) { - const titleOuterHeight = $("#popupTitle").outerHeight(); - const textOuterHeight = $("#popupText").outerHeight(); - const buttonDivOuterHeight = $("#popupBtnDiv").outerHeight(); - const btnOuterHeight = $(".popupBtn").outerHeight(); + var titleOuterHeight = $("#popupTitle").outerHeight(); + var textOuterHeight = $("#popupText").outerHeight(); + var buttonDivOuterHeight = $("#popupBtnDiv").outerHeight(); + var btnOuterHeight = $(".popupBtn").outerHeight(); - const newHeight = titleOuterHeight + textOuterHeight + buttonDivOuterHeight + btnOuterHeight + btnOuterHeight; + var newHeight = titleOuterHeight + textOuterHeight + buttonDivOuterHeight + btnOuterHeight + btnOuterHeight; $("#popupDiv").css("height", newHeight + "px"); @@ -550,7 +550,7 @@ function togglePopup(serviceRecordOid) { } function toggleModalWrapper() { - const displayValue = $(".modalWrapper").css("display") === "block" ? "none" : "block"; + var displayValue = $(".modalWrapper").css("display") === "block" ? "none" : "block"; $(".modalWrapper").css("display", displayValue); $(".modalWrapper").css("height", $(document).height()); @@ -585,11 +585,11 @@ function validateServiceRecordBeforeSubmit() { } } - const dateStr = $("#datum_textbox").val(); - const startStr = $("#start_textbox").val(); - const endStr = $("#ende_textbox").val(); + var dateStr = $("#datum_textbox").val(); + var startStr = $("#start_textbox").val(); + var endStr = $("#ende_textbox").val(); - const x = getDateObj(true); + var x = getDateObj(true); var y; @@ -600,7 +600,7 @@ function validateServiceRecordBeforeSubmit() { } var vonDatum = getDateTimeStringWithLeadingZeros(x); - const bisDatum = getDateTimeStringWithLeadingZeros(y); + var bisDatum = getDateTimeStringWithLeadingZeros(y); var isValidRecord = true; @@ -624,8 +624,8 @@ function validateServiceRecordBeforeSubmit() { var bookAfterSettlementInvoice = false; $.each(meldungen.Rights, function(position) { - const value = meldungen.Rights[position]; - const key = parseInt(position); + var value = meldungen.Rights[position]; + var key = parseInt(position); switch (key) { case 0: @@ -762,18 +762,18 @@ function initSignatureInfo(serviceRecordOid){ return; } - const record = $.parseJSON(jsonServiceRecord); + var record = $.parseJSON(jsonServiceRecord); - const startDate = record.Start[18] === "1" ? "" : record.Start.slice(11, 16); - const endDate = record.End[18] === "1" ? "" : record.End.slice(11, 16); - const jahr = record.Start.slice(0, 4); - const monat = record.Start.slice(5, 7); - const tag = record.Start.slice(8, 10); - const datum = tag + "." + monat + "." + jahr; - const serviceDescriptionName = record.ServiceDescription.Name; - const serviceCategoryName = record.ServiceDescription.Category.Name; + var startDate = record.Start[18] === "1" ? "" : record.Start.slice(11, 16); + var endDate = record.End[18] === "1" ? "" : record.End.slice(11, 16); + var jahr = record.Start.slice(0, 4); + var monat = record.Start.slice(5, 7); + var tag = record.Start.slice(8, 10); + var datum = tag + "." + monat + "." + jahr; + var serviceDescriptionName = record.ServiceDescription.Name; + var serviceCategoryName = record.ServiceDescription.Category.Name; - const zahl2 = $("#scDropDown").val(); + var zahl2 = $("#scDropDown").val(); $("#UnterschriftHilfeplan").val('HilfePlan: ' + $("#scDropDown option[value='" + zahl2 + "']").text()); $("#UnterschriftEmployee").val('Mitarbeiter: ' + record.Employee.FirstName + ' ' + record.Employee.LastName); @@ -861,18 +861,18 @@ function initCalendar() { $("html, body").animate({ scrollTop: 0 }, "fast"); var newtoday; - const datumStr = $("#KalenderDatum").val(); + var datumStr = $("#KalenderDatum").val(); var nextdatum; if(datumStr === "") { nextdatum = new Date(); - const ddi0 = nextdatum.getDate(); - const mmi0 = nextdatum.getMonth() + 1; - const yyyyi0 = nextdatum.getFullYear(); + var ddi0 = nextdatum.getDate(); + var mmi0 = nextdatum.getMonth() + 1; + var yyyyi0 = nextdatum.getFullYear(); - const ddStri0 = ddi0 < 10 ? "0" + ddi0 : ddi0; - const mmStri0 = mmi0 < 10 ? "0" + mmi0 : mmi0; + var ddStri0 = ddi0 < 10 ? "0" + ddi0 : ddi0; + var mmStri0 = mmi0 < 10 ? "0" + mmi0 : mmi0; $("#KalenderDatum").val(yyyyi0 + "-" + mmStri0 + "-" + ddStri0); @@ -885,15 +885,15 @@ function initCalendar() { } function initAppointmentEditForm() { - const currTime = new Date(); + var currTime = new Date(); if (currTime.getMinutes() <= 30) { - const k = 30 - currTime.getMinutes(); + var k = 30 - currTime.getMinutes(); currTime.setMinutes(currTime.getMinutes() + k); } if (currTime.getMinutes() > 30) { - const j = 60 - currTime.getMinutes(); + var j = 60 - currTime.getMinutes(); currTime.setMinutes(currTime.getMinutes() + j); } @@ -932,12 +932,12 @@ function hideEditForm() { } function nextDayButtonClick() { - const nextdatum = new Date($("#KalenderDatum").val()); + var nextdatum = new Date($("#KalenderDatum").val()); nextdatum.setDate((nextdatum.getDate() + 1)); $("#KalenderDatum").val(toDateStringYearMonthDay(nextdatum)); - const newtoday = getDateStringWithLeadingZeros(nextdatum); + var newtoday = getDateStringWithLeadingZeros(nextdatum); $("#KalenderDatumFormat").val(newtoday); @@ -1049,7 +1049,7 @@ function loadUnterschriftFeldFunktion() { if (e.touches) { if (e.touches.length === 1) { - const touch = e.touches[0]; + var touch = e.touches[0]; touchX = touch.pageX - touch.target.offsetLeft; touchY = touch.pageY - touch.target.offsetTop; } @@ -1255,7 +1255,7 @@ function klientenLaden() { showSanduhr(); - const oid = parseInt($("#customersDropDown").find(":selected").val()); + var oid = parseInt($("#customersDropDown").find(":selected").val()); if(oid === -1) { $("#klientenTabelle").css("display", "none"); @@ -1336,7 +1336,7 @@ function KlientenVM() { this.mobileLink('tel:' + data.Handy); this.landLineLink('tel:' + data.Telefon); - const mappedUmfeldpersonen = $.map(data.Umfeldpersonen, function (item) { return new UmfPers(item); }); + var mappedUmfeldpersonen = $.map(data.Umfeldpersonen, function (item) { return new UmfPers(item); }); if (mappedUmfeldpersonen.length === 0) { $("#WohnheimContainer").css("display", "none"); @@ -1396,10 +1396,10 @@ function calcPropFieldMinSizes() { $(".eigenschaftsdiv").each( function (index, element) { - const x = $(element).clone().css({ "height": "auto", "width": "auto" }).appendTo("body"); + var x = $(element).clone().css({ "height": "auto", "width": "auto" }).appendTo("body"); - const temporaryWidth = x.outerWidth(true); - const temporaryHeight = x.outerHeight(true); + var temporaryWidth = x.outerWidth(true); + var temporaryHeight = x.outerHeight(true); x.remove(); @@ -1419,7 +1419,7 @@ function calcPropFieldMinSizes() { } function updateEigenschaftsfelder() { - const customerTableWidth = $("#klientenTabelle").width(); + var customerTableWidth = $("#klientenTabelle").width(); $("#map-canvas").css("width", customerTableWidth - 16); $("#map-canvas").css("height", customerTableWidth - 16); @@ -1428,7 +1428,7 @@ function updateEigenschaftsfelder() { return; } - const mitPadding = minSizes.minWidth; + var mitPadding = minSizes.minWidth; var maxAnzahl = parseInt(customerTableWidth / mitPadding); if(maxAnzahl > minSizes.divCount) { @@ -1485,8 +1485,8 @@ function submitDeletionForm() { } function toggleErrorPopup(errorMessage, i) { - const isDisplayNone = $("#errorPopupDiv").css("display") === "none"; - const displayValue = isDisplayNone ? "block" : "none"; + var isDisplayNone = $("#errorPopupDiv").css("display") === "none"; + var displayValue = isDisplayNone ? "block" : "none"; $("#errorPopupDiv").css("display", displayValue); $(".modalWrapper").css("display", displayValue); @@ -1510,12 +1510,12 @@ function toggleErrorPopup(errorMessage, i) { $("#errorPopupOkBtn").onclick = "toggleErrorPopup('')"; } - const errorPopupTitleOuterHeight = $("#errorPopupTitle").outerHeight(); - const errorPopupTextOuterHeight = $("#errorPopupText").outerHeight(); - const errorPopupButtonOuterHeight = $("#errorPopupBtnDiv").outerHeight(); - const errorPopupOkButtonOuterHeight = $("#errorPopupOkBtn").outerHeight(); + var errorPopupTitleOuterHeight = $("#errorPopupTitle").outerHeight(); + var errorPopupTextOuterHeight = $("#errorPopupText").outerHeight(); + var errorPopupButtonOuterHeight = $("#errorPopupBtnDiv").outerHeight(); + var errorPopupOkButtonOuterHeight = $("#errorPopupOkBtn").outerHeight(); - const height = errorPopupTitleOuterHeight + errorPopupTextOuterHeight + errorPopupButtonOuterHeight + errorPopupOkButtonOuterHeight + errorPopupOkButtonOuterHeight; + var height = errorPopupTitleOuterHeight + errorPopupTextOuterHeight + errorPopupButtonOuterHeight + errorPopupOkButtonOuterHeight + errorPopupOkButtonOuterHeight; $("#errorPopupDiv").css("height", height + "px"); @@ -1527,8 +1527,8 @@ function toggleErrorPopup(errorMessage, i) { } function toggleSuccessPopup(message, i) { - const isDisplayNone = $("#SuccessPopupDiv").css("display") === "none"; - const displayValue = isDisplayNone ? "block" : "none"; + var isDisplayNone = $("#SuccessPopupDiv").css("display") === "none"; + var displayValue = isDisplayNone ? "block" : "none"; $("#SuccessPopupDiv").css("display", displayValue); $(".modalWrapper").css("display", displayValue); @@ -1554,13 +1554,13 @@ function toggleSuccessPopup(message, i) { if(isDisplayNone) { $("#SuccessPopupText").text(message); - const successPopupTitleOuterHeight = $("#SuccessPopupTitle").outerHeight(); - const successPopupTextOuterHeight = $("#SuccessPopupText").outerHeight(); - const successPopupButtonOuterHeight = $("#SuccessPopupBtnDiv").outerHeight(); - const successPopupOkButtonOuterHeight = $(".SuccessPopupOkBtn").outerHeight(); - const successPopupSignatureButtonOuterHeight = $(".SuccessPopupUSchrift").outerHeight(); + var successPopupTitleOuterHeight = $("#SuccessPopupTitle").outerHeight(); + var successPopupTextOuterHeight = $("#SuccessPopupText").outerHeight(); + var successPopupButtonOuterHeight = $("#SuccessPopupBtnDiv").outerHeight(); + var successPopupOkButtonOuterHeight = $(".SuccessPopupOkBtn").outerHeight(); + var successPopupSignatureButtonOuterHeight = $(".SuccessPopupUSchrift").outerHeight(); - const height = successPopupTitleOuterHeight + successPopupTextOuterHeight + successPopupButtonOuterHeight + successPopupOkButtonOuterHeight + successPopupSignatureButtonOuterHeight; + var height = successPopupTitleOuterHeight + successPopupTextOuterHeight + successPopupButtonOuterHeight + successPopupOkButtonOuterHeight + successPopupSignatureButtonOuterHeight; $("#SuccessPopupDiv").css("height", height + "px"); @@ -1572,8 +1572,8 @@ function toggleSuccessPopup(message, i) { } function toggleUpdateAppointmentPopup(message) { - const isDisplayNone = $("#AendernPopupDiv").css("display") === "none"; - const displayValue = isDisplayNone ? "block" : "none"; + var isDisplayNone = $("#AendernPopupDiv").css("display") === "none"; + var displayValue = isDisplayNone ? "block" : "none"; $("#AendernPopupDiv").css("display", displayValue); $(".modalWrapper").css("display", displayValue); @@ -1582,13 +1582,13 @@ function toggleUpdateAppointmentPopup(message) { if(isDisplayNone) { $("#AendernPopupText").text(message); - const aendernPopupTitleOuterHeight = $("#AendernPopupTitle").outerHeight(); - const aenderPopupTextOuterHeight = $("#AendernPopupText").outerHeight(); - const aendernPopupButtonDivOuterHeight = $("#AendernPopupBtnDiv").outerHeight(); - const aendernPopupOkButtonOuterHeight = $(".AendernPopupOkBtn").outerHeight(); - const aendernPopupSignatureOuterHeight = $(".AendernPopupUSchrift").outerHeight(); + var aendernPopupTitleOuterHeight = $("#AendernPopupTitle").outerHeight(); + var aenderPopupTextOuterHeight = $("#AendernPopupText").outerHeight(); + var aendernPopupButtonDivOuterHeight = $("#AendernPopupBtnDiv").outerHeight(); + var aendernPopupOkButtonOuterHeight = $(".AendernPopupOkBtn").outerHeight(); + var aendernPopupSignatureOuterHeight = $(".AendernPopupUSchrift").outerHeight(); - const height = aendernPopupTitleOuterHeight + aenderPopupTextOuterHeight + aendernPopupButtonDivOuterHeight + aendernPopupOkButtonOuterHeight + aendernPopupSignatureOuterHeight; + var height = aendernPopupTitleOuterHeight + aenderPopupTextOuterHeight + aendernPopupButtonDivOuterHeight + aendernPopupOkButtonOuterHeight + aendernPopupSignatureOuterHeight; $("#AendernPopupDiv").css("height", height + "px"); @@ -1633,7 +1633,7 @@ function preselectCustomer() { } function setSelectedEmployee() { - const oid = parseInt($("#employeesDropDown").find(":selected").val()); + var oid = parseInt($("#employeesDropDown").find(":selected").val()); console.log('selected employee oid: ' + oid); @@ -1650,15 +1650,15 @@ function SaveOnly() { if(typeof(Storage) != "undefined") { clearLocalStorage(1); - const costBearer2SupportConceptOid = $("#scDropDown").val(); - const hilfeplan = $("#scDropDown option[value='" + zahl + "']").text(); - const mitarbeiter = $("#employeesDropDown option:selected").text(); - const kategorie = $("#kategorien_select option:selected").text(); - const leistung = $("#leistungen_select option:selected").val(); - const duration = $("#duration_textbox").val(); - let notiz = $("#notiz_textbox").val(); + var costBearer2SupportConceptOid = $("#scDropDown").val(); + var hilfeplan = $("#scDropDown option[value='" + zahl + "']").text(); + var mitarbeiter = $("#employeesDropDown option:selected").text(); + var kategorie = $("#kategorien_select option:selected").text(); + var leistung = $("#leistungen_select option:selected").val(); + var duration = $("#duration_textbox").val(); + var notiz = $("#notiz_textbox").val(); - let notiz2, notiz3, notiz4, notiz5; + var notiz2, notiz3, notiz4, notiz5; if($("#notiz_textbox1").val() !== "") { notiz = $("#notiz_textbox1").val(); @@ -1695,11 +1695,11 @@ function clearLocalStorage(i) { } function saveZeiterfassungAfterCrash(datum, startd, endd, dauer, doku, leistung, costBearer2SupportConceptOid, doku2, doku3, doku4, doku5, enddatum) { - const x = getDateObj(true); - const y = getDateObj(false); + var x = getDateObj(true); + var y = getDateObj(false); - const vonDatum = getDateTimeStringWithLeadingZeros(x); - const bisDatum = getDateTimeStringWithLeadingZeros(y); + var vonDatum = getDateTimeStringWithLeadingZeros(x); + var bisDatum = getDateTimeStringWithLeadingZeros(y); if (costBearer2SupportConceptOid === -2) { $.ajax({ @@ -1726,7 +1726,7 @@ function saveZeiterfassungAfterCrash(datum, startd, endd, dauer, doku, leistung, data: { von: vonDatum, bis: bisDatum, inEditMode: false, dateString: datum, startString: startd, endString: endd, costbearerOId: costBearer2SupportConceptOid, leistung:leistung}, success: function (json) { - const hasSufficientRights = json; + var hasSufficientRights = json; if (hasSufficientRights === "True") { $.ajax({ @@ -1753,8 +1753,8 @@ function saveZeiterfassungAfterCrash(datum, startd, endd, dauer, doku, leistung, } function showErrorAfterCrash() { - const errorAfterCrashSwitch = $("#ErrorZeiterfassungAfterCrashSchalter"); - const switchValue = errorAfterCrashSwitch.val(); + var errorAfterCrashSwitch = $("#ErrorZeiterfassungAfterCrashSchalter"); + var switchValue = errorAfterCrashSwitch.val(); var errorMessage = ""; if(switchValue === 2 || switchValue === 3) { @@ -1784,8 +1784,8 @@ function focusOnTab(tabIdentifier) { setTimeout(function() { var displayValue; - for(let i = 0; i < window.numberOfDocumentationTypes; i++) { - const idNumber = i + 1; + for(var i = 0; i < window.numberOfDocumentationTypes; i++) { + var idNumber = i + 1; displayValue = idNumber === tabIdentifier ? "block" : "none"; $('#notiz_textbox' + idNumber).css("display", displayValue); diff --git a/BeWoPlanerMobil/Scripts/statistics.js b/BeWoPlanerMobil/Scripts/statistics.js index e5c5a9aef..f081c6a8b 100644 --- a/BeWoPlanerMobil/Scripts/statistics.js +++ b/BeWoPlanerMobil/Scripts/statistics.js @@ -11,7 +11,7 @@ function showStatistics() { $("#Statistics").css("display", "none"); $("#SupportStatistik").css("display", "block"); - const supportConceptOid = $("#scDropDown").val(); + var supportConceptOid = $("#scDropDown").val(); if(supportConceptOid >= 0) { $("#StatisticUberschrift").html('Hilfeplan Statistik: ' + $('#scDropDown option[value=\'' + supportConceptOid + '\']').text()); @@ -27,7 +27,7 @@ function showStatistics() { } function statisticDesign(wert1, wert2, string1, string2) { - const data = [ + var data = [ { value: wert1, color: "#F7464A", @@ -41,7 +41,7 @@ function statisticDesign(wert1, wert2, string1, string2) { label: string2 }]; - const options = { + var options = { scaleShowLabelBackdrop: true, scaleBackdropColor: "rgba(255,255,255,0.75)", scaleBeginAtZero: true, @@ -65,7 +65,7 @@ function statisticDesign(wert1, wert2, string1, string2) { "" } - const ctx = $("#myChart").get(0).getContext("2d"); + var ctx = $("#myChart").get(0).getContext("2d"); if(chartAnz != null) { chartAnz.destroy(); @@ -80,7 +80,7 @@ function loadSupportConceptStatistics(oid) { url: loadStatisticsUrl, data: { oid: oid }, success: function(jsonServiceRecord) { - const supportConceptStatistics = $.parseJSON(jsonServiceRecord); + var supportConceptStatistics = $.parseJSON(jsonServiceRecord); var provided = supportConceptStatistics.MinutesProvidedThisWeek; var approved = supportConceptStatistics.MinutesApprovedPerWeek; diff --git a/BeWoPlanerMobil/Scripts/utils.js b/BeWoPlanerMobil/Scripts/utils.js index 21acd328a..06ad5f868 100644 --- a/BeWoPlanerMobil/Scripts/utils.js +++ b/BeWoPlanerMobil/Scripts/utils.js @@ -9,11 +9,12 @@ }); } -function removeElementFromArray(pArray, pKey) { - const newArray = {}; - for(let key in pArray) { - const keyAsNumber = Number(key); +function removeElementFromArray(pArray, pKey) { + var newArray = {}; + + for(var key in pArray) { + var keyAsNumber = Number(key); if(keyAsNumber !== pKey) { newArray[keyAsNumber] = pArray[keyAsNumber]; @@ -24,7 +25,7 @@ function removeElementFromArray(pArray, pKey) { } function toggleLabel(inputId) { - const label = $('label[for="' + inputId + '"]'); + var label = $('label[for="' + inputId + '"]'); var topValue; if($('#' + inputId).is(":focus")) { @@ -42,7 +43,7 @@ function toggleLabel(inputId) { } function adjustLabel(inputId) { - const label = $('label[for="' + inputId + '"]'); + var label = $('label[for="' + inputId + '"]'); var topValue; topValue = "12px"; @@ -60,16 +61,19 @@ function isInEditingMode() { function isElementInArray(array, element) { try { - for(let item of array) { - if(item === element) { - return true; - } - } - return false; - } catch(error) { + var contains = false; + array.forEach(function (e, index) { + if (e === element) { + contains = true; + } + }); + + return contains; + } catch (error) { console.log(error.message); return false; } } + diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml index 383b53805..f71da14ce 100644 --- a/BeWoPlanerMobil/Views/Main/Main.cshtml +++ b/BeWoPlanerMobil/Views/Main/Main.cshtml @@ -1055,8 +1055,8 @@ url: CheckDokuReiterUrl, success: function (json) { - const s = $.parseJSON(json); - const x = s.length; + var s = $.parseJSON(json); + var x = s.length; if (x === 0) { window.focusedDokuTextarea = $("#notiz_textbox"); @@ -1073,10 +1073,10 @@ serviceRecordEmployeeOid = '@Model.Employee.EmployeeOid'; function karteAnzeigen() { - const blubb = $("#adressfeld").html().split(' '); + var blubb = $("#adressfeld").html().split(' '); var strString = ""; - for(let it = 0; it < blubb.length; it++) { + for(var it = 0; it < blubb.length; it++) { strString += blubb[it]; if(it < blubb.length - 1) { @@ -1084,7 +1084,7 @@ } } - strString += `,${$("#plzfeld").html()}+${$("#ortfeld").html()}`; + strString += ',' + $("#plzfeld").html()+$("#ortfeld").html(); window.open("https://www.google.de/maps/place/" + strString); } diff --git a/BeWoPlanerMobil/Views/Shared/Error.cshtml b/BeWoPlanerMobil/Views/Shared/Error.cshtml index 93b92a5fb..26aae1d0a 100644 --- a/BeWoPlanerMobil/Views/Shared/Error.cshtml +++ b/BeWoPlanerMobil/Views/Shared/Error.cshtml @@ -7,7 +7,7 @@ Error - +
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 0192be905..96697dade 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -7,21 +7,21 @@ - - - - + + + + - - - - - - + + + + + + - - - + + + diff --git a/BeWoPlanerMobil/Web.config b/BeWoPlanerMobil/Web.config index 6f8a7483f..4c052cad6 100644 --- a/BeWoPlanerMobil/Web.config +++ b/BeWoPlanerMobil/Web.config @@ -118,9 +118,8 @@ - - - + + diff --git a/Host/Multitenancy/demo.config b/Host/Multitenancy/demo.config index e495d6f53..9938abaea 100644 --- a/Host/Multitenancy/demo.config +++ b/Host/Multitenancy/demo.config @@ -24,7 +24,7 @@ --> - Server=localhost;Password=root;User ID=root;Initial Catalog=bewodemo + Server=localhost;Password=root;User ID=root;Initial Catalog=sbdtest diff --git a/ReportImp/CaritasGuenzburgNeuUlm/ServicesOverviewReport.Designer.cs b/ReportImp/CaritasGuenzburgNeuUlm/ServicesOverviewReport.Designer.cs index de8666bc9..db482a91d 100644 --- a/ReportImp/CaritasGuenzburgNeuUlm/ServicesOverviewReport.Designer.cs +++ b/ReportImp/CaritasGuenzburgNeuUlm/ServicesOverviewReport.Designer.cs @@ -265,6 +265,7 @@ namespace CaritasGuenzburgNeuUlm // this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")}); + this.xrTableCell17.Multiline = true; this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); this.xrTableCell17.StylePriority.UseFont = false; diff --git a/ReportImp/CaritasGuenzburgNeuUlm/ServicesOverviewReport.cs b/ReportImp/CaritasGuenzburgNeuUlm/ServicesOverviewReport.cs index 0e0fc1a48..68d1ca351 100644 --- a/ReportImp/CaritasGuenzburgNeuUlm/ServicesOverviewReport.cs +++ b/ReportImp/CaritasGuenzburgNeuUlm/ServicesOverviewReport.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.IO; +using System.Text; using System.Text.RegularExpressions; +using BeWo.Data.Access; +using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; using BeWo.Service.DCEntityMapper; @@ -11,6 +13,7 @@ using BS.Shared.Core; using BS.Shared.Extensions; using DevExpress.XtraPrinting.Native; using DevExpress.XtraReports.UI; +using Image = System.Drawing.Image; namespace CaritasGuenzburgNeuUlm { @@ -34,9 +37,49 @@ namespace CaritasGuenzburgNeuUlm if (s.IsBillable) { ServicesOverviewRO.CreateSignatureString(s); - + ServicesOverviewRO.CreateGoalList(s); minutes += s.Minutes; servicesBillable.Add(s); + if (!String.IsNullOrWhiteSpace(s.GoalList)) + { + if (!String.IsNullOrWhiteSpace(s.Notice)) + { + s.Notice += "\n" + s.GoalList; + } + else + { + s.Notice = s.GoalList; + } + + } + + if (s.IsGroup) + { + var sr = DAOFactory.GenericDAO.LoadByID(s.ServiceRecordOid); + StringBuilder ma = new StringBuilder(); + foreach (var groupSr in sr.Group.ServiceRecordList) + { + String name = ""; + + if (!String.IsNullOrWhiteSpace(groupSr.Employee.Person.Abbreviation)) + { + name = groupSr.Employee.Person.Abbreviation; + } + else + { + name = String.Format("{0}. {1}", groupSr.Employee.Person.FirstName.Substring(0, 1), + groupSr.Employee.Person.LastName); + } + if (!ma.ToString().Contains(name)) + { + if (ma.Length > 0) + ma.Append(", "); + ma.Append(name); + } + } + + s.EmployeeAbbr = ma.ToString(); + } } } diff --git a/ReportImp/DiakonieNeustadtAisch/DiakonieNeustadtAisch.csproj b/ReportImp/DiakonieNeustadtAisch/DiakonieNeustadtAisch.csproj index 6a190f3e0..0055a5b7b 100644 --- a/ReportImp/DiakonieNeustadtAisch/DiakonieNeustadtAisch.csproj +++ b/ReportImp/DiakonieNeustadtAisch/DiakonieNeustadtAisch.csproj @@ -33,8 +33,15 @@ false + + + + + + + @@ -45,8 +52,18 @@ + + Component + + + ServiceRecordListReport.cs + + + {40D8B312-EA64-49E3-A31A-5E57ED4D5654} + Report + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} Service @@ -56,6 +73,12 @@ Shared + + + + ServiceRecordListReport.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + anbei sende ich Ihnen die unterschriebenen Nachweise über die im Rahmen des Betreuten Wohnens für [Salutation2] [CustomerName] erbrachten Leistungen zu. Nach unserer Berechnung ergeben sich für den Betreuungszeitraum [AccountingPeriod] hieraus: + + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/SkmLeverkusen/SkmLeverkusen.csproj b/ReportImp/SkmLeverkusen/SkmLeverkusen.csproj index 33d7295c5..5dd96aa37 100644 --- a/ReportImp/SkmLeverkusen/SkmLeverkusen.csproj +++ b/ReportImp/SkmLeverkusen/SkmLeverkusen.csproj @@ -55,18 +55,36 @@ ServicesOverviewReport.cs + + Component + + + SettlementReport.cs + ServicesOverviewReport.cs + + SettlementReport.cs + Designer + + + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + Data + {40D8B312-EA64-49E3-A31A-5E57ED4D5654} Report + + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} + Shared + \ No newline at end of file diff --git a/ReportImp/skmRheydt/ServicesOverviewReport.Designer.cs b/ReportImp/skmRheydt/ServicesOverviewReport.Designer.cs index 58a9ece97..e037db4bb 100644 --- a/ReportImp/skmRheydt/ServicesOverviewReport.Designer.cs +++ b/ReportImp/skmRheydt/ServicesOverviewReport.Designer.cs @@ -88,6 +88,8 @@ namespace SkmRheydt this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -341,9 +343,6 @@ namespace SkmRheydt // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleStartDate.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleStartDate.Name = "formattingRuleStartDate"; // @@ -536,9 +535,6 @@ namespace SkmRheydt // this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleServiceDesc.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc"; // @@ -546,9 +542,6 @@ namespace SkmRheydt // this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleCostBearer.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleCostBearer.Name = "formattingRuleCostBearer"; // @@ -556,9 +549,6 @@ namespace SkmRheydt // this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleEmployeeName.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName"; // @@ -577,12 +567,14 @@ namespace SkmRheydt // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel3, + this.xrLabel4, this.xrLabel2, this.xrLabel1, this.xrLabel7, this.xrLabel5}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); - this.ReportFooter.HeightF = 124.4583F; + this.ReportFooter.HeightF = 193F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // @@ -602,7 +594,7 @@ namespace SkmRheydt // this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrLabel1.Font = new System.Drawing.Font("Arial", 11F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35.41667F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 35F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 22F); @@ -613,21 +605,21 @@ namespace SkmRheydt // xrLabel7 // this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(370F, 106.4583F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(345.0002F, 105F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(280F, 17.99997F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(304.9998F, 17.99997F); this.xrLabel7.StylePriority.UseBorders = false; this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Unterschrift A Klient/in"; + this.xrLabel7.Text = "Unterschrift Klient/in"; // // xrLabel5 // this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 106.4583F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(370F, 17.99997F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(345.0002F, 17.99997F); this.xrLabel5.StylePriority.UseBorders = false; this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Ort, Datum"; @@ -658,6 +650,28 @@ namespace SkmRheydt this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldGruppe.Name = "fieldGruppe"; // + // xrLabel3 + // + this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 175F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(345.0002F, 17.99997F); + this.xrLabel3.StylePriority.UseBorders = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Ort, Datum"; + // + // xrLabel4 + // + this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(345.0002F, 175F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(304.9998F, 17.99997F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "Unterschrift verantwortliche/r Mitarbeiter/in"; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -683,7 +697,7 @@ namespace SkmRheydt this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.SnapGridSize = 9F; - this.Version = "13.1"; + this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -752,5 +766,7 @@ namespace SkmRheydt private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; private DevExpress.XtraReports.UI.XRRichText xrRichText15; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; } } diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 03cbc0c0b..830434028 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -125,7 +125,7 @@ namespace BeWo.Service.Plugins //t = "8872796313"; // WMB //t = "6297638711"; // ASB Bergisch Gladbach //t = "5553641242"; // RheinSupport (ehem. Aids und Drogenberatung) - t = "1218057423"; // LH Koblenz + //t = "1218057423"; // LH Koblenz //t = "3517812158"; // Haus Theresia //t = "7058292376"; // BeWo Heinsberg //t = "3227700467"; // Psychosozialer Trägerverein @@ -180,7 +180,7 @@ namespace BeWo.Service.Plugins //t = "1931553444"; // HIBA //t = "7185338722"; // BeWo Walz & Paiva //t = "3196643272"; // Betreutes Wohnen Lisa Wöll - //t = "3432911735"; // Caritas Günzburg - Neu Ulm + t = "3432911735"; // Caritas Günzburg - Neu Ulm //t = "2591682148"; // Humanitas //t = "9805564204"; // LeWo Aachen //t = "7215356798"; // Triathlon diff --git a/Shared/Core/Utils.cs b/Shared/Core/Utils.cs index 1b278f15a..4c892d8f3 100644 --- a/Shared/Core/Utils.cs +++ b/Shared/Core/Utils.cs @@ -538,18 +538,23 @@ namespace BS.Shared.Core if (x > max.X) max.X = x; if (y > max.Y) max.Y = y; } - } + } } - // Create a new bitmap from the crop rectangle - Rectangle cropRectangle = new Rectangle(min.X, min.Y, max.X - min.X, max.Y - min.Y); - Bitmap newBitmap = new Bitmap(cropRectangle.Width, cropRectangle.Height); - using (Graphics g = Graphics.FromImage(newBitmap)) + // Create a new bitmap from the crop rectangleig + if (min.X < int.MaxValue && min.Y < int.MaxValue && max.X > int.MinValue && max.Y > int.MinValue) { - g.DrawImage(originalBitmap, 0, 0, cropRectangle, GraphicsUnit.Pixel); + Rectangle cropRectangle = new Rectangle(min.X, min.Y, max.X - min.X, max.Y - min.Y); + Bitmap newBitmap = new Bitmap(cropRectangle.Width, cropRectangle.Height); + using (Graphics g = Graphics.FromImage(newBitmap)) + { + g.DrawImage(originalBitmap, 0, 0, cropRectangle, GraphicsUnit.Pixel); + } + return newBitmap; } - - return newBitmap; + + return originalBitmap; + } private static Size CalcSize(int originalWidth, int originalHeight, int desiredWidth, int desiredHeight)