diff --git a/app/Models/User.php b/app/Models/User.php index 416ade0..8037efc 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -10,13 +10,13 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\DB; use Laravel\Sanctum\HasApiTokens; //use LdapRecord\Laravel\Auth\Authenticatable; -use LdapRecord\Laravel\Auth\AuthenticatesWithLdap; + use Junges\ACL\Concerns\HasGroups; class User extends Authenticatable { - use HasApiTokens, HasFactory, Notifiable, AuthenticateswithLdap, HasGroups, SoftDeletes; + use HasApiTokens, HasFactory, Notifiable, HasGroups, SoftDeletes; /** * The attributes that are mass assignable. @@ -73,6 +73,6 @@ class User extends Authenticatable return DB::table('users')->orderBy('name')->get(); } - + } diff --git a/composer.json b/composer.json index aaf55f8..51f351b 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,6 @@ "require" : { "php": "^7.3|^8.0", "barryvdh/laravel-dompdf": "^2.0", - "directorytree/ldaprecord": "^2.9", - "directorytree/ldaprecord-laravel": "^2.5", "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "laravel-notification-channels/telegram": "^2.0", diff --git a/composer.lock b/composer.lock index 0212b8b..0de20c5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "54f5d58038210c158e2f6aa9ddac0439", + "content-hash": "04bb6926c8a763a3a3da227f31661f3d", "packages": [ { "name": "asm89/stack-cors", @@ -574,146 +574,6 @@ }, "time": "2022-10-27T11:44:00+00:00" }, - { - "name": "directorytree/ldaprecord", - "version": "v2.20.3", - "source": { - "type": "git", - "url": "https://github.com/DirectoryTree/LdapRecord.git", - "reference": "f8cb5c9440f0bd54e9d4683c4d0bcf6c8bc40947" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/f8cb5c9440f0bd54e9d4683c4d0bcf6c8bc40947", - "reference": "f8cb5c9440f0bd54e9d4683c4d0bcf6c8bc40947", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-ldap": "*", - "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", - "nesbot/carbon": "^1.0|^2.0", - "php": ">=7.3", - "psr/log": "^1.0|^2.0|^3.0", - "psr/simple-cache": "^1.0|^2.0", - "symfony/polyfill-php80": "^1.25", - "tightenco/collect": "^5.6|^6.0|^7.0|^8.0|^9.0" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^9.0", - "spatie/ray": "^1.24" - }, - "type": "library", - "autoload": { - "psr-4": { - "LdapRecord\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Steve Bauman", - "email": "steven_bauman@outlook.com", - "role": "Developer" - } - ], - "description": "A fully-featured LDAP ORM.", - "homepage": "https://www.ldaprecord.com", - "keywords": [ - "active directory", - "ad", - "adLDAP", - "adldap2", - "directory", - "ldap", - "ldaprecord", - "orm", - "windows" - ], - "support": { - "docs": "https://ldaprecord.com", - "email": "steven_bauman@outlook.com", - "issues": "https://github.com/DirectoryTree/LdapRecord/issues", - "source": "https://github.com/DirectoryTree/LdapRecord" - }, - "funding": [ - { - "url": "https://github.com/stevebauman", - "type": "github" - } - ], - "time": "2023-03-10T15:22:31+00:00" - }, - { - "name": "directorytree/ldaprecord-laravel", - "version": "v2.7.3", - "source": { - "type": "git", - "url": "https://github.com/DirectoryTree/LdapRecord-Laravel.git", - "reference": "5f36d4ba6edbf56d97211fb892188aa6f9aceabc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DirectoryTree/LdapRecord-Laravel/zipball/5f36d4ba6edbf56d97211fb892188aa6f9aceabc", - "reference": "5f36d4ba6edbf56d97211fb892188aa6f9aceabc", - "shasum": "" - }, - "require": { - "directorytree/ldaprecord": "^2.4.4", - "ext-json": "*", - "ext-ldap": "*", - "illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0|^10.0", - "php": ">=7.3", - "ramsey/uuid": "*" - }, - "require-dev": { - "laravel/sanctum": "*", - "mockery/mockery": "^1.0", - "orchestra/testbench": "^3.7|^4.0|^5.0|^6.0|^7.0", - "phpunit/phpunit": "^7.0|^8.0|^9.0", - "spatie/ray": "^1.28" - }, - "type": "project", - "extra": { - "laravel": { - "providers": [ - "LdapRecord\\Laravel\\LdapServiceProvider", - "LdapRecord\\Laravel\\LdapAuthServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "LdapRecord\\Laravel\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "LDAP Authentication & Management for Laravel.", - "keywords": [ - "adldap2", - "laravel", - "ldap", - "ldaprecord" - ], - "support": { - "issues": "https://github.com/DirectoryTree/LdapRecord-Laravel/issues", - "source": "https://github.com/DirectoryTree/LdapRecord-Laravel/tree/v2.7.3" - }, - "funding": [ - { - "url": "https://github.com/stevebauman", - "type": "github" - } - ], - "time": "2023-02-09T14:29:14+00:00" - }, { "name": "doctrine/inflector", "version": "2.0.6", @@ -3244,16 +3104,16 @@ }, { "name": "nesbot/carbon", - "version": "2.66.0", + "version": "2.67.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "496712849902241f04902033b0441b269effe001" + "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001", - "reference": "496712849902241f04902033b0441b269effe001", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/c1001b3bc75039b07f38a79db5237c4c529e04c8", + "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8", "shasum": "" }, "require": { @@ -3342,7 +3202,7 @@ "type": "tidelift" } ], - "time": "2023-01-29T18:53:47+00:00" + "time": "2023-05-25T22:09:47+00:00" }, { "name": "nette/schema", @@ -5998,16 +5858,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", - "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { @@ -6016,7 +5876,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -6045,7 +5905,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" }, "funding": [ { @@ -6061,7 +5921,7 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:25:55+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/error-handler", @@ -6219,29 +6079,26 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd" + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd", - "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", "shasum": "" }, "require": { "php": ">=8.1", "psr/event-dispatcher": "^1" }, - "suggest": { - "symfony/event-dispatcher-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -6278,7 +6135,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" }, "funding": [ { @@ -6294,7 +6151,7 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:32:47+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/finder", @@ -7692,28 +7549,30 @@ }, { "name": "symfony/translation", - "version": "v6.2.8", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "817535dbb1721df8b3a8f2489dc7e50bcd6209b5" + "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/817535dbb1721df8b3a8f2489dc7e50bcd6209b5", - "reference": "817535dbb1721df8b3a8f2489dc7e50bcd6209b5", + "url": "https://api.github.com/repos/symfony/translation/zipball/f72b2cba8f79dd9d536f534f76874b58ad37876f", + "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f", "shasum": "" }, "require": { "php": ">=8.1", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^2.3|^3.0" + "symfony/translation-contracts": "^2.5|^3.0" }, "conflict": { "symfony/config": "<5.4", "symfony/console": "<5.4", "symfony/dependency-injection": "<5.4", + "symfony/http-client-contracts": "<2.5", "symfony/http-kernel": "<5.4", + "symfony/service-contracts": "<2.5", "symfony/twig-bundle": "<5.4", "symfony/yaml": "<5.4" }, @@ -7727,20 +7586,14 @@ "symfony/console": "^5.4|^6.0", "symfony/dependency-injection": "^5.4|^6.0", "symfony/finder": "^5.4|^6.0", - "symfony/http-client-contracts": "^1.1|^2.0|^3.0", + "symfony/http-client-contracts": "^2.5|^3.0", "symfony/http-kernel": "^5.4|^6.0", "symfony/intl": "^5.4|^6.0", "symfony/polyfill-intl-icu": "^1.21", "symfony/routing": "^5.4|^6.0", - "symfony/service-contracts": "^1.1.2|^2|^3", + "symfony/service-contracts": "^2.5|^3", "symfony/yaml": "^5.4|^6.0" }, - "suggest": { - "nikic/php-parser": "To use PhpAstExtractor", - "psr/log-implementation": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" - }, "type": "library", "autoload": { "files": [ @@ -7770,7 +7623,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.2.8" + "source": "https://github.com/symfony/translation/tree/v6.3.0" }, "funding": [ { @@ -7786,32 +7639,29 @@ "type": "tidelift" } ], - "time": "2023-03-31T09:14:44+00:00" + "time": "2023-05-19T12:46:45+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "dfec258b9dd17a6b24420d464c43bffe347441c8" + "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dfec258b9dd17a6b24420d464c43bffe347441c8", - "reference": "dfec258b9dd17a6b24420d464c43bffe347441c8", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/02c24deb352fb0d79db5486c0c79905a85e37e86", + "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86", "shasum": "" }, "require": { "php": ">=8.1" }, - "suggest": { - "symfony/translation-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -7851,7 +7701,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.3.0" }, "funding": [ { @@ -7867,20 +7717,20 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:32:47+00:00" + "time": "2023-05-30T17:17:10+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.22", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4" + "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", - "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8e12706bf9c68a2da633f23bfdc15b4dce5970b3", + "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3", "shasum": "" }, "require": { @@ -7889,7 +7739,6 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "phpunit/phpunit": "<5.4.3", "symfony/console": "<4.4" }, "require-dev": { @@ -7940,7 +7789,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.22" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.24" }, "funding": [ { @@ -7956,61 +7805,7 @@ "type": "tidelift" } ], - "time": "2023-03-25T09:27:28+00:00" - }, - { - "name": "tightenco/collect", - "version": "v9.52.0", - "source": { - "type": "git", - "url": "https://github.com/tighten/collect.git", - "reference": "d4772fe52bbc823d1d2e3d289d3f1ca8c0f3323b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tighten/collect/zipball/d4772fe52bbc823d1d2e3d289d3f1ca8c0f3323b", - "reference": "d4772fe52bbc823d1d2e3d289d3f1ca8c0f3323b", - "shasum": "" - }, - "require": { - "php": "^8.0", - "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0 || ^6.0" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "nesbot/carbon": "^2.23.0", - "phpunit/phpunit": "^8.3" - }, - "type": "library", - "autoload": { - "files": [ - "src/Collect/Support/helpers.php", - "src/Collect/Support/alias.php" - ], - "psr-4": { - "Tightenco\\Collect\\": "src/Collect" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - } - ], - "description": "Collect - Illuminate Collections as a separate package.", - "keywords": [ - "collection", - "laravel" - ], - "support": { - "issues": "https://github.com/tighten/collect/issues", - "source": "https://github.com/tighten/collect/tree/v9.52.0" - }, - "time": "2023-02-17T21:37:36+00:00" + "time": "2023-05-25T13:05:00+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", diff --git a/database/migrations/2023_06_08_162605_columns_anagrafica.php b/database/migrations/2023_06_08_162605_columns_anagrafica.php new file mode 100644 index 0000000..2b221e9 --- /dev/null +++ b/database/migrations/2023_06_08_162605_columns_anagrafica.php @@ -0,0 +1,37 @@ +longText('ang_indirizzo'); + $table->string('ang_CAP'); + $table->string('ang_Citta'); + $table->string('ang_Provincia'); + $table->string('ang_telefono'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('anagraficas', function (Blueprint $table) { + // + }); + } +} diff --git a/public/js/app/progetti.js b/public/js/app/progetti.js index d4f6a94..85a28a4 100644 --- a/public/js/app/progetti.js +++ b/public/js/app/progetti.js @@ -1,6 +1,13 @@ $(document).ready(function() { + $('#tab_progetti').DataTable({ responsive: true + fields: [ + { + label:"Data", + type: "datetime" + } + ] }); }); @@ -19,4 +26,4 @@ $.getJSON("progetti/coordinatori", {}, function(data) { ) } ); -}); \ No newline at end of file +}); diff --git a/public/js/app/rigaProgetti.js b/public/js/app/rigaProgetti.js index 9167575..7583c53 100644 --- a/public/js/app/rigaProgetti.js +++ b/public/js/app/rigaProgetti.js @@ -1,6 +1,12 @@ $(document).ready(function() { $('#tab_progetti').DataTable({ responsive: true + fields: [ + { + label:"Data", + type: "datetime" + } + ] }); $('#form').click(function() { @@ -35,4 +41,4 @@ $(document).ready(function() { $('#myModal_addRow').modal('show'); // $('#form_new').attr('action', 'progetti/new'); }); -}); \ No newline at end of file +});