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

PSM-Quittierungsbeleg alle Unterschriften werden jetzt angezeigt

Browse Source 
MoK: Betreuung beim Klienten hinzugefügt, ist aber bisher nur im Debug-Modus sichtbar
This commit is contained in:
Lyndon Jetten
2023-12-19 10:58:34 +01:00
parent e3d3985431
commit 255d0d7c7a
6 changed files with 120 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -1952,6 +1952,11 @@ namespace BeWoPlanerMobil.Controllers
return;
}
if(Model.IsInGroupBookingMode || Model.IsInMultiBookingMode)
{
return;
}
Model.ServiceRecords = new List<ServiceRecordDC>();
if(Model.CostBearer2SupportConceptOid.HasValue && Model.CostBearer2SupportConceptOid.Value == -1)
@@ -1976,6 +1981,7 @@ namespace BeWoPlanerMobil.Controllers
OperationsService.GetEmployeesServiceRecordsWithStartEndDate(Model.Employee.EmployeeOid.Value, Model.SelectedZeitraum.StartDate.Value, Model.SelectedZeitraum.EndDate.Value).ToList() :
OperationsService.GetEmployeesServiceRecords2(Model.Employee.EmployeeOid.Value, selectedDayCount).ToList();
}
// ToDo: Nicht bei Gruppenbuchung!
else
{
records = Model.ServiceRecordTimeInterval == ServiceRecordTimeInterval.ZeitraumWaehlen || Model.ServiceRecordTimeInterval == ServiceRecordTimeInterval.Monatsauswahl ?
@@ -2110,8 +2116,9 @@ namespace BeWoPlanerMobil.Controllers
return SerializeObject(serviceRecord2Monatsunterschrift);
}
// ToDo: Dokutexte übergeben!
[Authorize]
public string CheckRights(string von, string bis, bool inEditMode, string dateString, string startString, string endString)
public string CheckRights(string von, string bis, bool inEditMode, string dateString, string startString, string endString, string doku1, string doku2, string doku3, string doku4, string doku5)
{
if (Model is null)
{
@@ -2150,16 +2157,22 @@ namespace BeWoPlanerMobil.Controllers
}
var checkServiceRecord = new ServiceRecordDC();
if (inEditMode)
if(inEditMode)
{
checkServiceRecord = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid.HasValue && f.ServiceRecordOid.Value.Equals(Model.SelectedServiceRecordOid));
}
if (checkServiceRecord is null)
if(checkServiceRecord is null)
{
checkServiceRecord = new ServiceRecordDC();
}
checkServiceRecord.Notice = doku1;
checkServiceRecord.Notice2 = doku2;
checkServiceRecord.Notice3 = doku3;
checkServiceRecord.Notice4 = doku4;
checkServiceRecord.Notice5 = doku5;
checkServiceRecord.Goals = Model.SelectedGoals;
checkServiceRecord.Start = startDt;

46
BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/main.js
View File

@@ -227,7 +227,8 @@ function validateForm(form, prefix) {
var start = startAndEndDates[0];
var end = startAndEndDates[1];
$.get(getCheckRightsUrl(), { von: start.format("DD.MM.YYYY"), bis: end.format("DD.MM.YYYY"), inEditMode: isInEditingMode, dateString: start.format("DD.MM.YYYY"), startString: start.format("HH:mm"), endString: end.format("HH:mm") }).done(function (result) {
var [doku1, doku2, doku3, doku4, doku5] = getDokuTexte();
$.get(getCheckRightsUrl(), {von: start.format("DD.MM.YYYY"), bis: end.format("DD.MM.YYYY"), inEditMode: isInEditingMode, dateString: start.format("DD.MM.YYYY"), startString: start.format("HH:mm"), endString: end.format("HH:mm"), doku1, doku2, doku3, doku4, doku5 }).done(function (result) {
var message = $.parseJSON(result);
if(message.Message === null) {
@@ -255,6 +256,49 @@ function validateForm(form, prefix) {
}
}
function getDokuTexte() {
try {
var noticeList = [null, null, null, null, null];
var isMultiBooking = $("#mb-dokufeld").length > 0 || $("#mb-doku-textarea-0").length > 0;
var multiBookingPrefix = isMultiBooking ? "mb-" : "";
var hasMultipleDokufelder = $("#" + multiBookingPrefix + "dokufeld").length === 0;
var dokufeldCounter = 0;
if(hasMultipleDokufelder) {
for(var i = 0; i < 5; i++) {
var dokufeld = $("#" + multiBookingPrefix + "doku-textarea-" + i);
if(dokufeld.length > 0) {
noticeList[i] = dokufeld.val();
dokufeldCounter++;
}
}
} else {
noticeList[0] = $("#" + multiBookingPrefix + "dokufeld").val();
dokufeldCounter = 1;
}
var x = "";
for (var ii = 0; ii < dokufeldCounter; ii++) {
x += noticeList[ii];
if (ii < noticeList.length - 1) {
x += ", ";
}
}
logInfo3(`Es wurden ${dokufeldCounter} Dokufelder identifiziert mit folgenden Werten: ${x}`);
return noticeList;
} catch (error) {
showErrorPopup(error);
}
}
function showGoalRatingPopup(goalOid) {
try {
$("#goal-rating-popup").modal("show");

2
BeWoPlanerMobil/Views/Customer/Customer.cshtml
View File

@@ -969,7 +969,7 @@
var isAllowedToViewBargeldkassen = AbstractModel.HasRightToViewAllCustomersBargeldkassen || (isRelatedCustomer && AbstractModel.HasRightToViewOwnCustomersBargeldkassen);
}
@* Bargeldverwaltung *@
@* Bargeldverwaltung TODO: NOCH NICHT FERTIG! *@
@if(Html.IsInDebugMode() && isAllowedToViewBargeldkassen && !(Model.Bargeldkassen is null) && Model.Bargeldkassen.Any())
{
<!-- Bargeldkassen -->

124
BeWoPlanerMobil/Views/Customer/CustomerBetreuungPartial.cshtml
View File

@@ -12,70 +12,50 @@
<h5>Betreuung</h5>
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4">
<div style="display: flex !important;">
@foreach(var relation in Model.SelectedCustomer.RelatedEmployees)
{
var start = relation.StartDate.HasValue ? $"{relation.StartDate.Value:dd.MM.yyyy}" : "";
var end = relation.EndDate.HasValue ? $"{relation.EndDate.Value:dd.MM.yyyy}" : "";
<div class="col mb-3">
<div class="card">
<div class="card-body">
<div class="row mb-3">
<div class="col text-secondary">
Betreuer
</div>
<div class="col">
@relation.Employee
</div>
</div>
<div class="row mb-3">
<div class="col text-secondary">
Rolle
</div>
<div class="col">
@relation.RelationRole.DisplayName
</div>
</div>
@if(!string.IsNullOrWhiteSpace(start))
{
<div class="row mb-3">
<div class="col text-secondary">
Startdatum
</div>
<div class="col">
@start
</div>
</div>
}
@if(!string.IsNullOrWhiteSpace(end))
{
<div class="row mb-3">
<div class="col text-secondary">
Enddatum
</div>
<div class="col">
@end
</div>
</div>
}
@if(!string.IsNullOrWhiteSpace(relation.Notice))
{
<div class="row mb-3">
<div class="col text-secondary">
Erläuterung
</div>
<div class="col">
@relation.Notice
</div>
</div>
}
</div>
@foreach(var relation in Model.SelectedCustomer.RelatedEmployees)
{
var start = relation.StartDate.HasValue ? $"{relation.StartDate.Value:dd.MM.yyyy}" : "";
var end = relation.EndDate.HasValue ? $"{relation.EndDate.Value:dd.MM.yyyy}" : "";
<div class="col mb-3">
<div class="card h-100">
<div class="card-body">
<table class="w-100">
<tbody>
<tr>
<td class="text-secondary">Betreuer:</td>
<td class="text-right">@relation.Employee</td>
</tr>
<tr>
<td class="text-secondary">Rolle:</td>
<td class="text-right">@relation.RelationRole.DisplayName</td>
</tr>
@if(!string.IsNullOrWhiteSpace(start))
{
<tr>
<td class="text-secondary">Startdatum:</td>
<td class="text-right">@start</td>
</tr>
}
@if(!string.IsNullOrWhiteSpace(end))
{
<tr>
<td class="text-secondary">Enddatum:</td>
<td class="text-right">@end</td>
</tr>
}
@if(!string.IsNullOrWhiteSpace(relation.Notice))
{
<tr>
<td class="text-secondary">Erläuterung:</td>
<td class="text-justify">@relation.Notice</td>
</tr>
}
</tbody>
</table>
</div>
</div>
}
</div>
</div>
}
</div>
}
@@ -86,13 +66,19 @@
foreach(var teamRelation in Model.SelectedCustomer.RelatedTeams)
{
<div class="row">
<div class="row mb-3">
<div class="col text-secondary">
Team
</div>
<div class="col">
@teamRelation.Team.Name
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4">
<div class="col mb-3">
<div class="card h-100">
<div class="card-body">
<table class="w-100">
<tbody>
<tr>
<td class="text-secondary">Team:</td>
<td class="text-right">@teamRelation.Team.Name</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>

1
ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs generated
View File

@@ -1017,7 +1017,6 @@ namespace PSM
this.xrLabel14.SizeF = new System.Drawing.SizeF(137.3333F, 35.50008F);
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrLabel14.Visible = false;
//
// lblUnterschriftKlient
//

6
Service/Plugins/PluginLoader.cs
View File

@@ -31,7 +31,7 @@ namespace BeWo.Service.Plugins
//t = "1076891970"; // Assistenza
//t = "0216265667"; // LH Hannover
//t = "1774789565"; // LH Essen
//t = "9342168675"; // ABC Betreuungen - jetzt Schubkraft
t = "9342168675"; // ABC Betreuungen - jetzt Schubkraft
//t = "1193188501"; // Aids Hilfe Dortmund
//t = "7860351957"; // SKF Alsdorf
//t = "3311520228"; // Die Düne
@@ -147,7 +147,7 @@ namespace BeWo.Service.Plugins
//t = "9975231461"; // Selwo
//t = "8181286349"; // BeWo am Rhein
//t = "4595275645"; // Eigenständig
t = "7912635399"; // Prof. Dr. Eggers Stiftung
//t = "7912635399"; // Prof. Dr. Eggers Stiftung
//t = "3549726254"; // Socia
//t = "1992495802"; // Monvita
//t = "7381352241"; // Ressource e.V.
@@ -373,7 +373,7 @@ namespace BeWo.Service.Plugins
//t = "4431610343"; // B-B-C-Terwort GmbH
//t = "2235342307"; // Suchtkrankenhilfe Ostfriesland
//t = "1733934665"; // Auf eigenen Füßen stehen (Birgit Apel de Santos & Stefan Haefs)
//t = "9814444882"; // PSM gGmbH (Paritätische Sozialdienste in Meerbusch)
t = "9814444882"; // PSM gGmbH (Paritätische Sozialdienste in Meerbusch)
return t;
#else
if (MultitenancyOperationContextExt.Current != null)