diff --git a/BeWoPlanerMobil/node_modules/.package-lock.json b/BeWoPlanerMobil/node_modules/.package-lock.json
index 1f5ac8860..a5db09998 100644
--- a/BeWoPlanerMobil/node_modules/.package-lock.json
+++ b/BeWoPlanerMobil/node_modules/.package-lock.json
@@ -28,6 +28,11 @@
"popper.js": "^1.16.0"
}
},
+ "node_modules/bootstrap4-fullscreen-modal": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/bootstrap4-fullscreen-modal/-/bootstrap4-fullscreen-modal-4.5.0.tgz",
+ "integrity": "sha512-tDnp5XNJxbjjXJPwyPymfbupdndVfS2aECUd1ziS2JFAjKLOmUszNehlMrq8yfcWqbCyFzJGQ6gQ69lHXjB6Lw=="
+ },
"node_modules/chainsaw": {
"version": "0.0.9",
"resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.0.9.tgz",
diff --git a/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/README.md b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/README.md
new file mode 100644
index 000000000..6bef54267
--- /dev/null
+++ b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/README.md
@@ -0,0 +1,60 @@
+# Bootstrap 4 fullscreen modal
+
+An easy solution to integrate fullscreen bootstrap modals.
+
+## Install
+
+### With npm
+
+```
+npm install --save bootstrap4-fullscreen-modal
+```
+
+**Then add into your html head**
+
+```
+
+```
+
+## Example
+
+Just add the class _.modal-fullscreen_ to your bootstrap 4 modal.
+
+```
+
+
+
+
+
+
+
+
+
+ This is a fullscreen modal
+
+
+
+
+
+```
+
+## Dependencies
+
+- [Bootstrap 4 ](https://getbootstrap.com/)
+
+## Authors
+
+- **Basile Bong**
+
+## Version
+
+1.0.5
diff --git a/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.css b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.css
new file mode 100644
index 000000000..e4c41b51b
--- /dev/null
+++ b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.css
@@ -0,0 +1,15 @@
+.modal.modal-fullscreen .modal-dialog {
+ width: 100vw;
+ height: 100vh;
+ margin: 0;
+ padding: 0;
+ max-width: none; }
+
+.modal.modal-fullscreen .modal-content {
+ height: auto;
+ height: 100vh;
+ border-radius: 0;
+ border: none; }
+
+.modal.modal-fullscreen .modal-body {
+ overflow-y: auto; }
diff --git a/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.min.css b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.min.css
new file mode 100644
index 000000000..d3f734fc5
--- /dev/null
+++ b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.min.css
@@ -0,0 +1,2 @@
+.modal.modal-fullscreen .modal-dialog{width:100vw;height:100vh;margin:0;padding:0;max-width:none}.modal.modal-fullscreen .modal-content{height:auto;height:100vh;border-radius:0;border:none}.modal.modal-fullscreen .modal-body{overflow-y:auto}
+/*# sourceMappingURL=bootstrap4-modal-fullscreen.min.css.map */
diff --git a/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.min.css.map b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.min.css.map
new file mode 100644
index 000000000..f9f515075
--- /dev/null
+++ b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/dist/bootstrap4-modal-fullscreen.min.css.map
@@ -0,0 +1 @@
+{"version":3,"names":[],"mappings":"","sources":["bootstrap4-modal-fullscreen.css"],"sourcesContent":[".modal.modal-fullscreen .modal-dialog{width:100vw;height:100vh;margin:0;padding:0;max-width:none}.modal.modal-fullscreen .modal-content{height:auto;height:100vh;border-radius:0;border:none}.modal.modal-fullscreen .modal-body{overflow-y:auto}"],"file":"bootstrap4-modal-fullscreen.min.css"}
\ No newline at end of file
diff --git a/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/package.json b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/package.json
new file mode 100644
index 000000000..b35921d88
--- /dev/null
+++ b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/package.json
@@ -0,0 +1,27 @@
+{
+ "name": "bootstrap4-fullscreen-modal",
+ "version": "4.5.0",
+ "description": "A easy way to create an bootstrap 4 fullscreen modal",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/basilebong/bootstrap4-fullscreen-modal.git"
+ },
+ "author": "Basile Bong",
+ "license": "ISC",
+ "bugs": {
+ "url": "https://github.com/basilebong/bootstrap4-fullscreen-modal/issues"
+ },
+ "homepage": "https://github.com/basilebong/bootstrap4-fullscreen-modal#readme",
+ "dependencies": {},
+ "devDependencies": {
+ "gulp": "4.0.2",
+ "gulp-cssmin": "^0.2.0",
+ "gulp-rename": "^2.0.0",
+ "gulp-sass": "4.1.0",
+ "gulp-sourcemaps": "^2.6.5",
+ "pump": "^3.0.0"
+ },
+ "scripts": {
+ "build": "npx gulp"
+ }
+}
diff --git a/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/src/bootstrap4-modal-fullscreen.scss b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/src/bootstrap4-modal-fullscreen.scss
new file mode 100644
index 000000000..b3c87b00d
--- /dev/null
+++ b/BeWoPlanerMobil/node_modules/bootstrap4-fullscreen-modal/src/bootstrap4-modal-fullscreen.scss
@@ -0,0 +1,25 @@
+.modal{
+ &.modal-fullscreen{
+
+ .modal{
+ &-dialog{
+ width: 100vw;
+ height: 100vh;
+ margin: 0;
+ padding: 0;
+ max-width: none;
+ }
+
+ &-content{
+ height: auto;
+ height: 100vh;
+ border-radius: 0;
+ border: none;
+ }
+
+ &-body{
+ overflow-y: auto;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/BeWoPlanerMobil/package-lock.json b/BeWoPlanerMobil/package-lock.json
index 232c05da6..bc1de1a79 100644
--- a/BeWoPlanerMobil/package-lock.json
+++ b/BeWoPlanerMobil/package-lock.json
@@ -10,6 +10,7 @@
"license": "ISC",
"dependencies": {
"bootstrap": "^4.4.1",
+ "bootstrap4-fullscreen-modal": "^4.5.0",
"cldr": "^7.4.0",
"globalize": "^1.7.0",
"jquery": "^3.6.4",
@@ -43,6 +44,11 @@
"popper.js": "^1.16.0"
}
},
+ "node_modules/bootstrap4-fullscreen-modal": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/bootstrap4-fullscreen-modal/-/bootstrap4-fullscreen-modal-4.5.0.tgz",
+ "integrity": "sha512-tDnp5XNJxbjjXJPwyPymfbupdndVfS2aECUd1ziS2JFAjKLOmUszNehlMrq8yfcWqbCyFzJGQ6gQ69lHXjB6Lw=="
+ },
"node_modules/chainsaw": {
"version": "0.0.9",
"resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.0.9.tgz",
diff --git a/BeWoPlanerMobil/package.json b/BeWoPlanerMobil/package.json
index 4f1cb8fa2..be1ca417d 100644
--- a/BeWoPlanerMobil/package.json
+++ b/BeWoPlanerMobil/package.json
@@ -10,6 +10,7 @@
"private": true,
"dependencies": {
"bootstrap": "^4.4.1",
+ "bootstrap4-fullscreen-modal": "^4.5.0",
"cldr": "^7.4.0",
"globalize": "^1.7.0",
"jquery": "^3.6.4",
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index e829fad67..f30dd7ddb 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -4359,6 +4359,7 @@ namespace BeWo.Data.Access
return result;
}
+ // ToDo: An neue Rechte anpassen!
// Methode, die herausfindet, ob eine Liste mit ServiceRecordOids zu genau einer Mitarbeiterunterschrift gehört
public ConfirmationReceiptSignature GetConfirmationReceiptSignatureForServiceRecords(List
serviceRecordOids, SignatureType signatureType)
{
diff --git a/ReportImp/BetreuWoReports/Service/ResourceService.cs b/ReportImp/BetreuWoReports/Service/ResourceService.cs
index 993ff2bec..0bddf4c95 100644
--- a/ReportImp/BetreuWoReports/Service/ResourceService.cs
+++ b/ReportImp/BetreuWoReports/Service/ResourceService.cs
@@ -21,9 +21,9 @@ namespace BetreuWoReports.Service
return new List();
}
- public override List CheckResourceAvailabilityWithBookingEmployees(DateTime start, DateTime end, List resourceOids, long? selectedAppointmentOid)
+ public override Dictionary> CheckResourceAvailabilityWithBookingEmployees(DateTime start, DateTime end, List resourceOids, long? selectedAppointmentOid, Guid? recurrenceId, int occurrenceIndex = 0, bool shouldSkipResourceAvailability = false)
{
- return new List();
+ return new Dictionary>();
}
}
}
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index b8f4dc72b..c1fb96485 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -3,7 +3,6 @@ using System.Configuration;
using System.IO;
using System.Linq;
using System.Reflection;
-using BeWo.Data;
using BS.Shared.Core;
namespace BeWo.Service.Plugins
@@ -17,7 +16,7 @@ namespace BeWo.Service.Plugins
#if DEBUG
var t = "demo";
- t = "irgendwaswasesnichtgibt";
+ //t = "irgendwaswasesnichtgibt";
//t = "5473568546"; //Interner Chat
//t = "2356097460"; // Lebenshilfe Würzburg
//t = "1234567890"; // Präsentationsdatenbank
@@ -177,7 +176,7 @@ namespace BeWo.Service.Plugins
//t = "5426234256"; // SKM Leverkusen
//t = "4137042939"; // MLG Lebengestalten / Haus Müllestumpe
//t = "5260936181"; // LORI
- t = "1931553444"; // HIBA
+ //t = "1931553444"; // HIBA
//t = "7185338722"; // BeWo Walz & Paiva
//t = "3196643272"; // Betreutes Wohnen Lisa Wöll
//t = "3432911735"; // Caritas Günzburg - Neu Ulm
@@ -338,7 +337,7 @@ namespace BeWo.Service.Plugins
//t = "2986016022"; // Ev Verein für Wohnraumhilfe Frankfurt a.M.
//t = "2181497347"; // BetreuungsserviceFuerAlltagUndWohnen (BAW Aachen)
//t = "5433105975"; // aha e.V.
- //t = "7396826106"; // SKF Sozialdienst katholischer Frauen e.V. Leverkusen
+ t = "7396826106"; // SKF Sozialdienst katholischer Frauen e.V. Leverkusen
//t = "4748304562"; // BeWo Darmstadt
//t = "5315865694"; // Wismarer Werkstätten GmbH
//t = "6971328056"; // SKM Krefeld
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index bea10a0f0..ae49c3533 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -6850,7 +6850,9 @@ namespace BeWo.Service.ServiceImplementations
{
var confirmationReceiptSignatureToDelete = DAOFactory.GenericDAO.LoadByID(confirmationReceiptSignatureOid);
- DAOFactory.GenericDAO.Delete(confirmationReceiptSignatureToDelete);
+ //DAOFactory.GenericDAO.Delete(confirmationReceiptSignatureToDelete);
+
+ ServiceLogic.SetActivationType(new Dictionary { { confirmationReceiptSignatureOid, confirmationReceiptSignatureToDelete.Version.Value } }, ActivationTypeId.Deleted);
}
catch (Exception exception)
{
diff --git a/Service/ServiceImplementations/QueryServiceImp.cs b/Service/ServiceImplementations/QueryServiceImp.cs
index fff6fdf74..172ff54c6 100644
--- a/Service/ServiceImplementations/QueryServiceImp.cs
+++ b/Service/ServiceImplementations/QueryServiceImp.cs
@@ -58,6 +58,7 @@ namespace BeWo.Service.ServiceImplementations
try
{
var qs = PluginLoader.FindClass();
+
return qs.GetAllQueriesOfType(pType);
}
catch (Exception e)
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 131ed51df..15150b961 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -566,7 +566,11 @@ namespace BS.Shared
ServiceRecord_AllowEditAfterEmployeeSignature = 171724,
ServiceRecord_AllowDeleteAfterEmployeeSignature = 171725,
- ConfirmationReceiptSignatures_Delete = 50000
+ ConfirmationReceiptSignatures_Delete = 50000,
+
+ Signature_ProvideSingleSignature = 60000,
+ Signature_ProvideMonthlySignature = 60001,
+ Signature_ProvideMonthlySignatureByProxy = 60002
}
public enum PersonType
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 38412cdbe..182ca470f 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -709,6 +709,15 @@ namespace BS.Shared.Core
},
{
UserRightType.Auswertungen_HilfeplanuebersichtAnsehen, Translator.Translate("Auswertungen->Hilfeplanübersicht")
+ },
+ {
+ UserRightType.Signature_ProvideSingleSignature, Translator.Translate($"{Translator.Translate("Klienten")}unterschriften leisten (einzeln)")
+ },
+ {
+ UserRightType.Signature_ProvideMonthlySignature, Translator.Translate($"{Translator.Translate("MitarbeiterPlural")}unterschriften für den Quittierungsbeleg leisten (monatlich)")
+ },
+ {
+ UserRightType.Signature_ProvideMonthlySignatureByProxy, Translator.Translate($"{Translator.Translate("MitarbeiterPlural")}unterschriften für den Quittierungsbeleg stellvertretend leisten (monatlich)")
}
};
#endregion