Merge pull request #161 from H2-invent/dev

Dev
H2-invent · May 28, 2023 · 646394e · 646394e
2 parents df39c0e + f48d97d
commit 646394e
Show file tree

Hide file tree

Showing 421 changed files with 25,570 additions and 26,272 deletions.
diff --git a/.env b/.env
@@ -52,10 +52,10 @@ [email protected]
 #MAILER_URL=null://localhost
 ###< symfony/swiftmailer-bundle ###
 
-
 ###ODC Parameters###
 imprint=test
 dataPrivacy=test
+superAdminRole=odc-super-admin
 
 ###Cron Parameters###
 CRON_TOKEN=tpyv5yDIV54ifahrVJmuJ40qExRdNa2344DFADFsdsfenN3rCMkQW8Br1o1W9JP9uUc1N
@@ -74,4 +74,4 @@ demo_installation=prod #demo
 
 ###> LaF ###
 laF_version=2.0.0-dev
-###< LaF ###
+###< LaF ###
diff --git a/.env.sample b/.env.sample
@@ -1,18 +1,12 @@
 DATABASE_URL=mysql://<user>:<password>@<server>:3306/<database>
-DATABSE_SERVER=<mariadb-10.4.6>
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev/prod
 APP_DEBUG=1/0
 APP_SECRET=<app_secret>
 
 ###> symfony/swift_mailer ###
-MAILER_HOST=<host>
-MAILER_PORT=587
-MAILER_PASSWORD=<password>
-MAILER_USERNAME=<username>
-MAILER_ENCRYPTION=tls
-MAILER_TRANSPORT=smtp
+MAILER_DSN=null://null
 
 ###ODC Parameters###
 imprint=</impressum>

diff --git a/README.md b/README.md
@@ -5,6 +5,11 @@ __Open Source Datenschutzmanagement System__
 
 Der Open Datenschutzcenter (ODC) ist ein Open Source Datenschutzmanagement-System für Unternehmen und Datenschutzbeauftragte. Der ODC wird kontinuierlich mit einer aktiven Community von Unternehmen, Datenschutzbeauftragten und Informationssicherheitsbeauftragten weiterentwickelt. Open Source bedeutet, dass der Quellcode der Software öffentlich zugänglich zur Verfügung steht. Unternehmen können den ODC auf einem eigenen Server betrieben, eigene Funktionen entwickeln und die Funktionalität erweitern. Die H2 Invent GmbH ist das Unternehmen hinter dem Open Datenschutzcenter und verwaltet das Repository, das Wiki und die Releases. H2 Invent entwickelt für Unternehmen neue ODC Funktionen um diesen den Anforderungen des Unternehmens anzupassen.
 
+### Übersetzungen [![Crowdin](https://badges.crowdin.net/open-datenschutz-center/localized.svg)](https://crowdin.com/project/open-datenschutz-center)
+Helfen Sie mit den Open Datenschutz Center noch besser zu machen. Wir suchen jederzeit neue Übersetungen in alle Sprachen.
+Übersetzungen werden über Crowdin organisiert und können dort einfach und unkompliziert Übersetzt werden.
+https://crowdin.com/project/open-datenschutz-center
+
 # Funktionen
 Folgende Funktionen sind bereits im Open Datenschutzcenter integriert:
 * Datenschutzakademie für interne Datenschutzschulungen zum Nachweis der kontinuierlichen Datenschutzweitergildung der Beschäftigten.

diff --git a/assets/css/style.css b/assets/css/style.css
@@ -153,7 +153,39 @@ a:focus {
     margin: 40px 0;
 }
 
-/* ---------------------------------------------------
+.team-select .nav-link {
+    background: none !important;
+}
+
+.team-select .dropdown-item {
+    display: block !important;
+}
+
+.team-select .dropdown-item[disabled] {
+    color: #666 !important;
+    background: none !important;
+    cursor: auto;
+}
+
+.team-select {
+    padding-right: 1.5rem;
+}
+
+.team-select:after {
+    content: '';
+    position: absolute;
+    display: block;
+    width: 0;
+    height: 0;
+    border-right: .325rem solid transparent;
+    border-left: .325rem solid transparent;
+    border-top: .325rem solid #212529;
+    right: .75rem;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
+/* ----------------------- .navbar-nav .nav-item .nav-link:hover {----------------------------
     SIDEBAR STYLE
 ----------------------------------------------------- */
 
@@ -170,7 +202,7 @@ a:focus {
     left: -250px;
     height: 100vh;
     z-index: 999;
-    background-image: url("/images/navigation.jpg");
+    background-image: url("../../public/images/navigation.jpg");
     background-repeat: no-repeat;
     background-size: cover;
     color: #000000;
@@ -179,6 +211,17 @@ a:focus {
     box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.2);
 }
 
+#sidebarCollapse {
+    border: transparent;
+    background: transparent;
+    outline: none;
+}
+
+#sidebarCollapse span {
+    width: 1.75rem;
+    height: 1.75rem;
+}
+
 #sidebar.active {
     left: 0;
 }
@@ -301,10 +344,6 @@ a.article:hover {
     #sidebar.active {
         margin-left: 0;
     }
-
-    #sidebarCollapse span {
-        display: none;
-    }
 }
 
 /* ---------------------------------------------------
@@ -322,7 +361,7 @@ a.article:hover {
     Add Reuqired Symbole to Forms
 ----------------------------------------------------- */
 
-label.required:after {
+label:not(.form-check-label).required:after {
     content: " *";
 }
 
@@ -570,4 +609,5 @@ label.required:after {
 
 .thin::-webkit-scrollbar {
     width: 10px;
-}
+}
+
diff --git a/assets/js/app.js b/assets/js/app.js
@@ -9,6 +9,7 @@ import $ from 'jquery';
 import 'datatables.net-dt';
 import 'summernote/dist/summernote-bs4';
 import * as h2Button from 'h2-invent-apps';
+import {initFreeFields} from './freeField';
 
 global.$ = global.jQuery = $;
 
@@ -29,7 +30,6 @@ $(document).ready(function () {
         }, 3000);
     }, 500);
 
-
     $('#dismiss, .overlay').on('click', function () {
         // hide sidebar
         $('#sidebar').removeClass('active');
@@ -46,12 +46,39 @@ $(document).ready(function () {
         $('a[aria-expanded=true]').attr('aria-expanded', 'false');
     });
 
-
     $('#data-table').DataTable({
         dom: 'Bfrtip',
         buttons: [
-            'csv', 'excel'
+            {
+                extend: 'csv',
+                exportOptions: {
+                    columns: ':not(.hide-in-export)'
+                }
+            },
+            {
+                extend: 'excel',
+                exportOptions: {
+                    columns: ':not(.hide-in-export)'
+                }
+            }
+        ]
+    });
 
+    $('.data-table').DataTable({
+        dom: 'Bfrtip',
+        buttons: [
+            {
+                extend: 'csv',
+                exportOptions: {
+                    columns: ':not(.hide-in-export)'
+                }
+            },
+            {
+                extend: 'excel',
+                exportOptions: {
+                    columns: ':not(.hide-in-export)'
+                }
+            }
         ]
     });
 
@@ -88,6 +115,8 @@ $(document).ready(function () {
             $('.sendButton').addClass('disabled');
         }
     });
+
+    initFreeFields();
 });
 
 $(document).on('click', '.loadContent', function (e) {

diff --git a/assets/js/freeField.js b/assets/js/freeField.js
@@ -0,0 +1,37 @@
+import $ from "jquery";
+function addFormToCollection($collectionHolderClass) {
+    var $collectionHolder = $('.' + $collectionHolderClass);
+    var prototype = $collectionHolder.data('prototype');
+    var index = $collectionHolder.data('index');
+    var newForm = prototype;
+    newForm = newForm.replace(/__name__/g, index);
+    $collectionHolder.data('index', index + 1);
+    console.log('index', index);
+    let  $newFormLi = $('<li class="d-inline-block list-group-item d-flex justify-content-between align-items-center"></li>')
+        .append(newForm)
+    $collectionHolder.append($newFormLi);
+    addTagFormDeleteLink($newFormLi);
+}
+
+function addTagFormDeleteLink($tagFormLi) {
+    var $removeFormButton = $('<a href="#" class="deleteFreeField" type="remove-group"><div class="text-danger px-1 " data-toggle="tooltip" title="Lösche Freifeld" data-original-title="Lösche Freifeld">X</div></a>');
+    $tagFormLi.append($removeFormButton);
+    $removeFormButton.on('click', function(e) {
+        $tagFormLi.remove();
+    });
+}
+function initFreeFields(){
+    $('#add_item_link').off('click')
+    var $groupsCollectionHolder = $('ul.freeField');
+    $groupsCollectionHolder.find('li').each(function() {
+        addTagFormDeleteLink($(this));
+    });
+
+    $groupsCollectionHolder.data('index', $groupsCollectionHolder.find('input').length);
+    $('#add_item_link').on('click', function(e) {
+
+        var $collectionHolderClass = $(e.currentTarget).data('collectionHolderClass');
+        addFormToCollection($collectionHolderClass);
+    })
+};
+export {initFreeFields};
diff --git a/composer.json b/composer.json
@@ -2,75 +2,76 @@
   "type": "project",
   "license": "proprietary",
   "require": {
-    "php": "^7.4.25",
+    "php": "^8.1",
     "ext-ctype": "*",
     "ext-iconv": "*",
     "composer/package-versions-deprecated": "^1.10",
     "doctrine/annotations": "^1.0",
     "doctrine/doctrine-bundle": "^2.5",
     "doctrine/doctrine-migrations-bundle": "^3.2",
     "doctrine/orm": "^2.10",
-    "h2entwicklung/doctrine-encrypt-bundle": "^4.0",
     "knpuniversity/oauth2-client-bundle": "^2.5",
-    "laminas/laminas-code": "^3.4",
+    "laminas/laminas-code": "^4.5",
     "laminas/laminas-escaper": "^2.6",
+    "michaeldegroot/doctrine-encrypt-bundle": "^5.1",
     "nicoswd/php-gpg": "^1.7",
     "nucleos/dompdf-bundle": "^3.0",
-    "oneup/flysystem-bundle": "^3.4",
+    "oneup/flysystem-bundle": "^4.3",
     "phpdocumentor/reflection-docblock": "^5.3",
-    "phpoffice/phpword": "^0.17.0",
+    "phpoffice/phpword": "^1.0.0",
     "phpstan/phpdoc-parser": "^1.2",
-    "sensio/framework-extra-bundle": "^5.4",
+    "sensio/framework-extra-bundle": "^6.2",
     "stevenmaguire/oauth2-keycloak": "^2.2",
     "symfony/apache-pack": "^1.0",
-    "symfony/asset": "5.4.*",
-    "symfony/console": "5.4.*",
-    "symfony/dotenv": "5.4.*",
-    "symfony/expression-language": "5.4.*",
+    "symfony/asset": "6.2.*",
+    "symfony/console": "6.2.*",
+    "symfony/dotenv": "6.2.*",
+    "symfony/expression-language": "6.2.*",
     "symfony/flex": "^1.3.1",
-    "symfony/form": "5.4.*",
-    "symfony/framework-bundle": "5.4.*",
-    "symfony/http-client": "5.4.*",
-    "symfony/intl": "5.4.*",
-    "symfony/mailer": "5.4.*",
+    "symfony/form": "6.2.*",
+    "symfony/framework-bundle": "6.2.*",
+    "symfony/http-client": "6.2.*",
+    "symfony/intl": "6.2.*",
+    "symfony/mailer": "6.2.*",
     "symfony/monolog-bundle": "^3.1",
-    "symfony/process": "5.4.*",
-    "symfony/property-access": "5.4.*",
-    "symfony/property-info": "5.4.*",
-    "symfony/proxy-manager-bridge": "5.4.*",
-    "symfony/security-bundle": "5.4.*",
-    "symfony/serializer": "5.4.*",
-    "symfony/swiftmailer-bundle": "^3.4",
-    "symfony/templating": "5.4.*",
-    "symfony/translation": "5.4.*",
-    "symfony/twig-bundle": "5.4.*",
-    "symfony/validator": "5.4.*",
-    "symfony/web-link": "5.4.*",
+    "symfony/process": "6.2.*",
+    "symfony/property-access": "6.2.*",
+    "symfony/property-info": "6.2.*",
+    "symfony/proxy-manager-bridge": "6.2.*",
+    "symfony/runtime": "6.2.*",
+    "symfony/security-bundle": "6.2.*",
+    "symfony/serializer": "6.2.*",
+    "symfony/templating": "6.2.*",
+    "symfony/translation": "6.2.*",
+    "symfony/twig-bundle": "6.2.*",
+    "symfony/validator": "6.2.*",
+    "symfony/web-link": "6.2.*",
     "symfony/webpack-encore-bundle": "^1.7",
-    "symfony/yaml": "5.4.*",
+    "symfony/yaml": "6.2.*",
     "twig/cssinliner-extra": "^3.0",
     "twig/extra-bundle": "^2.12|^3.0",
     "twig/inky-extra": "^3.0",
     "twig/twig": "^2.0",
-    "vich/uploader-bundle": "^1.13"
+    "vich/uploader-bundle": "^1.13",
+    "ext-http": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
-    "symfony/browser-kit": "5.4.*",
-    "symfony/css-selector": "5.4.*",
-    "symfony/debug-bundle": "5.4.*",
+    "symfony/browser-kit": "6.2.*",
+    "symfony/css-selector": "6.2.*",
+    "symfony/debug-bundle": "6.2.*",
     "symfony/maker-bundle": "^1.38",
-    "symfony/phpunit-bridge": "^6.0",
-    "symfony/stopwatch": "5.4.*",
-    "symfony/web-profiler-bundle": "5.4.*",
-    "symfony/web-server-bundle": "4.4.*"
+    "symfony/phpunit-bridge": "^6.2",
+    "symfony/stopwatch": "6.2.*",
+    "symfony/web-profiler-bundle": "6.2.*"
   },
   "config": {
     "preferred-install": {
       "*": "dist"
     },
     "allow-plugins": {
-      "symfony/flex": true
+      "symfony/flex": true,
+      "symfony/runtime": true
     },
     "sort-packages": true
   },
@@ -102,6 +103,14 @@
     ],
     "post-update-cmd": [
       "@auto-scripts"
+    ],
+    "db-create": "php bin/console doctrine:database:create --if-not-exists",
+    "db-drop": "php bin/console doctrine:database:drop --force --if-exists",
+    "db-migrate": "php bin/console doctrine:migrations:migrate -n",
+    "db-reset": [
+      "@db-drop",
+      "@db-create",
+      "@db-migrate"
     ]
   },
   "conflict": {
@@ -110,7 +119,7 @@
   "extra": {
     "symfony": {
       "allow-contrib": false,
-      "require": "5.4.*"
+      "require": "6.2.*"
     }
   }
 }