diff --git a/README.md b/README.md index 1369c0f..bbca887 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ Al momento sono presenti: - inserire le informazioni del database (username,password,dbname) - lanciare ``` composer install ``` - lanciare ``` php artisan migrate --seed``` - - preparare Apache copiando e modificando secondo le proprie impostazioni il file ``` bubofamily.conf ``` in ```/etc/apache2/sites-available ``` e quindi impostare in ```/etc/hosts``` il proprio fqdn relativo al gestionale. Ora applicare la modifica ad apache digitando ``` a2ensite bubofamily.conf``` e poi ``` systemctl restart apache2``` - di default si crea l'utente ``` admin ``` con password ```admin ``` per accedere la prima volta. diff --git a/app/Models/User.php b/app/Models/User.php index a56ac13..ec1ae58 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -8,14 +8,24 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Laravel\Sanctum\HasApiTokens; +<<<<<<< HEAD use Spatie\Permission\Traits\HasRoles; use Illuminate\Foundation\Auth\Access\Authorizable; +======= + //use LdapRecord\Laravel\Auth\Authenticatable; + +use Junges\ACL\Concerns\HasGroups; +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 class User extends Authenticatable { +<<<<<<< HEAD use HasApiTokens, HasFactory, Notifiable, HasRoles,Authorizable; +======= + use HasApiTokens, HasFactory, Notifiable, HasGroups, SoftDeletes; +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 /** * The attributes that are mass assignable. @@ -75,6 +85,7 @@ class User extends Authenticatable { return DB::table('users')->orderBy('name')->get(); } +<<<<<<< HEAD // Aggiunge un utente e assegna un ruolo public static function addUser($params) @@ -88,6 +99,10 @@ class User extends Authenticatable } +======= + + +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 } diff --git a/composer.json b/composer.json index 5f1be95..e26cd1a 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,10 @@ "require" : { "php": "^7.3|^8.0", "barryvdh/laravel-dompdf": "^2.0", +<<<<<<< HEAD "directorytree/ldaprecord": "^2.9", +======= +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 "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 db84f33..bbc08c7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,11 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], +<<<<<<< HEAD "content-hash": "e6ac2be787f145ea140b72b55e302e90", +======= + "content-hash": "04bb6926c8a763a3a3da227f31661f3d", +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 "packages": [ { "name": "asm89/stack-cors", @@ -63,6 +67,157 @@ "time": "2022-01-18T09:12:03+00:00" }, { +<<<<<<< HEAD +======= + "name": "aws/aws-crt-php", + "version": "v1.2.1", + "source": { + "type": "git", + "url": "https://github.com/awslabs/aws-crt-php.git", + "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5", + "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5", + "yoast/phpunit-polyfills": "^1.0" + }, + "suggest": { + "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality." + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "AWS SDK Common Runtime Team", + "email": "aws-sdk-common-runtime@amazon.com" + } + ], + "description": "AWS Common Runtime for PHP", + "homepage": "https://github.com/awslabs/aws-crt-php", + "keywords": [ + "amazon", + "aws", + "crt", + "sdk" + ], + "support": { + "issues": "https://github.com/awslabs/aws-crt-php/issues", + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1" + }, + "time": "2023-03-24T20:22:19+00:00" + }, + { + "name": "aws/aws-sdk-php", + "version": "3.263.10", + "source": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-php.git", + "reference": "d5f40cff8fe2fe75a8415618f04c987472184eba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d5f40cff8fe2fe75a8415618f04c987472184eba", + "reference": "d5f40cff8fe2fe75a8415618f04c987472184eba", + "shasum": "" + }, + "require": { + "aws/aws-crt-php": "^1.0.4", + "ext-json": "*", + "ext-pcre": "*", + "ext-simplexml": "*", + "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", + "guzzlehttp/promises": "^1.4.0", + "guzzlehttp/psr7": "^1.8.5 || ^2.3", + "mtdowling/jmespath.php": "^2.6", + "php": ">=5.5" + }, + "require-dev": { + "andrewsville/php-token-reflection": "^1.4", + "aws/aws-php-sns-message-validator": "~1.0", + "behat/behat": "~3.0", + "composer/composer": "^1.10.22", + "dms/phpunit-arraysubset-asserts": "^0.4.0", + "doctrine/cache": "~1.4", + "ext-dom": "*", + "ext-openssl": "*", + "ext-pcntl": "*", + "ext-sockets": "*", + "nette/neon": "^2.3", + "paragonie/random_compat": ">= 2", + "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5", + "psr/cache": "^1.0", + "psr/simple-cache": "^1.0", + "sebastian/comparator": "^1.2.3 || ^4.0", + "yoast/phpunit-polyfills": "^1.0" + }, + "suggest": { + "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", + "doctrine/cache": "To use the DoctrineCacheAdapter", + "ext-curl": "To send requests using cURL", + "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", + "ext-sockets": "To use client-side monitoring" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Aws\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Amazon Web Services", + "homepage": "http://aws.amazon.com" + } + ], + "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", + "homepage": "http://aws.amazon.com/sdkforphp", + "keywords": [ + "amazon", + "aws", + "cloud", + "dynamodb", + "ec2", + "glacier", + "s3", + "sdk" + ], + "support": { + "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", + "issues": "https://github.com/aws/aws-sdk-php/issues", + "source": "https://github.com/aws/aws-sdk-php/tree/3.263.10" + }, + "time": "2023-04-13T18:19:56+00:00" + }, + { +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 "name": "barryvdh/laravel-dompdf", "version": "v2.0.1", "source": { @@ -426,6 +581,7 @@ "time": "2022-10-27T11:44:00+00:00" }, { +<<<<<<< HEAD "name": "directorytree/ldaprecord", "version": "v2.20.4", "source": { @@ -500,6 +656,8 @@ "time": "2023-05-19T20:13:32+00:00" }, { +======= +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 "name": "doctrine/inflector", "version": "2.0.6", "source": { @@ -3760,6 +3918,7 @@ }, { "name": "psy/psysh", +<<<<<<< HEAD "version": "v0.11.18", "source": { "type": "git", @@ -3770,6 +3929,18 @@ "type": "zip", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", +======= + "version": "v0.11.15", + "source": { + "type": "git", + "url": "https://github.com/bobthecow/psysh.git", + "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5350ce0ec8ecf2c5b5cf554cd2496f97b444af85", + "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85", +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 "shasum": "" }, "require": { @@ -3830,9 +4001,15 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", +<<<<<<< HEAD "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" }, "time": "2023-05-23T02:31:11+00:00" +======= + "source": "https://github.com/bobthecow/psysh/tree/v0.11.15" + }, + "time": "2023-04-07T21:57:09+00:00" +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 }, { "name": "ralouphie/getallheaders", @@ -7512,6 +7689,7 @@ } ], "time": "2023-05-25T13:05:00+00:00" +<<<<<<< HEAD }, { "name": "tightenco/collect", @@ -7566,6 +7744,8 @@ "source": "https://github.com/tighten/collect/tree/v9.52.7" }, "time": "2023-04-14T21:51:36+00:00" +======= +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -9149,6 +9329,7 @@ }, { "name": "phpunit/phpunit", +<<<<<<< HEAD "version": "9.6.8", "source": { "type": "git", @@ -9159,6 +9340,18 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", +======= + "version": "9.6.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", + "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 "shasum": "" }, "require": { @@ -9232,7 +9425,11 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", +<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" +======= + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7" +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 }, "funding": [ { @@ -9248,7 +9445,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2023-05-11T05:14:45+00:00" +======= + "time": "2023-04-14T08:58:40+00:00" +>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41 }, { "name": "sebastian/cli-parser", 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 +});