10 Commits

23 changed files with 234 additions and 422 deletions

View File

@@ -81,7 +81,7 @@ class MovimentiController extends Controller
foreach ($movimenti as $movimento)
{
$lista[]=[
'Data'=>$movimento->Data,
'Data'=> date_format(date_create($movimento->Data),'d/m/Y'),
'Categoria'=>$movimento->Categoria,
'Tag'=>$movimento->Tag,
'Descrizione'=>$movimento->Descrizione,

39
app/Mail/myTestEmail.php Normal file
View File

@@ -0,0 +1,39 @@
<?php
namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class myTestEmail extends Mailable
{
use Queueable, SerializesModels;
public $email;
/**
* Create a new message instance.
*
* @return void
*/
public function __construct($email)
{
//
$this->email=$email;
}
/**
* Build the message.
*
* @return $this
*/
public function build()
{
$name='none';
return $this
->subject('Email di Test')
->markdown('mail.test',['name' => $name]);
}
}

View File

@@ -54,4 +54,16 @@ class Progetti extends Model
DB::table('progettis')->delete($progetto_id);
}
public static function chiudiProgetto($progetto_id)
{
// chiude il progetto e lo rende non cancellabile e non più editabile
// potrà solo essere esportato in PDF
DB::table('progettis')
->where('id','=', $progetto_id)
->update([
'stato'=>'chiuso',
'data_fine'=>date('Y-m-d'),
]);
}
}

View File

@@ -11,8 +11,6 @@ use Laravel\Sanctum\HasApiTokens;
use Spatie\Permission\Traits\HasRoles;
use Illuminate\Foundation\Auth\Access\Authorizable;
class User extends Authenticatable
{
use HasApiTokens, HasFactory, Notifiable, HasRoles,Authorizable;
@@ -86,8 +84,4 @@ class User extends Authenticatable
])->assignRole($params['role']);
}
}

View File

@@ -10,10 +10,7 @@
"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",

369
composer.lock generated
View File

@@ -4,11 +4,7 @@
"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",
@@ -67,157 +63,6 @@
"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": {
@@ -581,7 +426,6 @@
"time": "2022-10-27T11:44:00+00:00"
},
{
<<<<<<< HEAD
"name": "directorytree/ldaprecord",
"version": "v2.20.4",
"source": {
@@ -656,8 +500,6 @@
"time": "2023-05-19T20:13:32+00:00"
},
{
=======
>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
"name": "doctrine/inflector",
"version": "2.0.6",
"source": {
@@ -2500,33 +2342,36 @@
},
{
"name": "maennchen/zipstream-php",
"version": "v2.4.0",
"version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/maennchen/ZipStream-PHP.git",
"reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3"
"reference": "b46726e666b5d2ad32959ae9492ee1034e798162"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3",
"reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3",
"url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b46726e666b5d2ad32959ae9492ee1034e798162",
"reference": "b46726e666b5d2ad32959ae9492ee1034e798162",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"myclabs/php-enum": "^1.5",
"php": "^8.0",
"psr/http-message": "^1.0"
"ext-zlib": "*",
"php-64bit": "^8.1"
},
"require-dev": {
"ext-zip": "*",
"friendsofphp/php-cs-fixer": "^3.9",
"guzzlehttp/guzzle": "^6.5.3 || ^7.2.0",
"friendsofphp/php-cs-fixer": "^3.16",
"guzzlehttp/guzzle": "^7.5",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.4",
"phpunit/phpunit": "^8.5.8 || ^9.4.2",
"php-coveralls/php-coveralls": "^2.5",
"phpunit/phpunit": "^10.0",
"vimeo/psalm": "^5.0"
},
"suggest": {
"guzzlehttp/psr7": "^2.4",
"psr/http-message": "^2.0"
},
"type": "library",
"autoload": {
"psr-4": {
@@ -2562,7 +2407,7 @@
],
"support": {
"issues": "https://github.com/maennchen/ZipStream-PHP/issues",
"source": "https://github.com/maennchen/ZipStream-PHP/tree/v2.4.0"
"source": "https://github.com/maennchen/ZipStream-PHP/tree/3.0.2"
},
"funding": [
{
@@ -2574,7 +2419,7 @@
"type": "open_collective"
}
],
"time": "2022-12-08T12:29:14+00:00"
"time": "2023-04-19T19:51:03+00:00"
},
{
"name": "markbaker/complex",
@@ -2852,69 +2697,6 @@
],
"time": "2023-02-06T13:44:46+00:00"
},
{
"name": "myclabs/php-enum",
"version": "1.8.4",
"source": {
"type": "git",
"url": "https://github.com/myclabs/php-enum.git",
"reference": "a867478eae49c9f59ece437ae7f9506bfaa27483"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483",
"reference": "a867478eae49c9f59ece437ae7f9506bfaa27483",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": "^7.3 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "1.*",
"vimeo/psalm": "^4.6.2"
},
"type": "library",
"autoload": {
"psr-4": {
"MyCLabs\\Enum\\": "src/"
},
"classmap": [
"stubs/Stringable.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP Enum contributors",
"homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
}
],
"description": "PHP Enum implementation",
"homepage": "http://github.com/myclabs/php-enum",
"keywords": [
"enum"
],
"support": {
"issues": "https://github.com/myclabs/php-enum/issues",
"source": "https://github.com/myclabs/php-enum/tree/1.8.4"
},
"funding": [
{
"url": "https://github.com/mnapoli",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
"type": "tidelift"
}
],
"time": "2022-08-04T09:53:51+00:00"
},
{
"name": "nesbot/carbon",
"version": "2.67.0",
@@ -3379,16 +3161,16 @@
},
{
"name": "phpoffice/phpspreadsheet",
"version": "1.28.0",
"version": "1.29.0",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
"reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a"
"reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
"reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/fde2ccf55eaef7e86021ff1acce26479160a0fa0",
"reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0",
"shasum": ""
},
"require": {
@@ -3406,7 +3188,7 @@
"ext-zip": "*",
"ext-zlib": "*",
"ezyang/htmlpurifier": "^4.15",
"maennchen/zipstream-php": "^2.1",
"maennchen/zipstream-php": "^2.1 || ^3.0",
"markbaker/complex": "^3.0",
"markbaker/matrix": "^3.0",
"php": "^7.4 || ^8.0",
@@ -3418,12 +3200,12 @@
"dealerdirect/phpcodesniffer-composer-installer": "dev-main",
"dompdf/dompdf": "^1.0 || ^2.0",
"friendsofphp/php-cs-fixer": "^3.2",
"mitoteam/jpgraph": "^10.2.4",
"mitoteam/jpgraph": "^10.3",
"mpdf/mpdf": "^8.1.1",
"phpcompatibility/php-compatibility": "^9.3",
"phpstan/phpstan": "^1.1",
"phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^8.5 || ^9.0",
"phpunit/phpunit": "^8.5 || ^9.0 || ^10.0",
"squizlabs/php_codesniffer": "^3.7",
"tecnickcom/tcpdf": "^6.5"
},
@@ -3478,9 +3260,9 @@
],
"support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.28.0"
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.0"
},
"time": "2023-02-25T12:24:49+00:00"
"time": "2023-06-14T22:48:31+00:00"
},
{
"name": "phpoption/phpoption",
@@ -3764,16 +3546,16 @@
},
{
"name": "psr/http-message",
"version": "1.1",
"version": "2.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-message.git",
"reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
"reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
"reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
"url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
"reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
"shasum": ""
},
"require": {
@@ -3782,7 +3564,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
"dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -3797,7 +3579,7 @@
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
"homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP messages",
@@ -3811,9 +3593,9 @@
"response"
],
"support": {
"source": "https://github.com/php-fig/http-message/tree/1.1"
"source": "https://github.com/php-fig/http-message/tree/2.0"
},
"time": "2023-04-04T09:50:52+00:00"
"time": "2023-04-04T09:54:51+00:00"
},
{
"name": "psr/log",
@@ -3918,7 +3700,6 @@
},
{
"name": "psy/psysh",
<<<<<<< HEAD
"version": "v0.11.18",
"source": {
"type": "git",
@@ -3929,18 +3710,6 @@
"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": {
@@ -4001,15 +3770,9 @@
],
"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",
@@ -7689,7 +7452,6 @@
}
],
"time": "2023-05-25T13:05:00+00:00"
<<<<<<< HEAD
},
{
"name": "tightenco/collect",
@@ -7744,8 +7506,6 @@
"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",
@@ -8421,16 +8181,16 @@
},
{
"name": "fakerphp/faker",
"version": "v1.22.0",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
"reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2"
"reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f85772abd508bd04e20bb4b1bbe260a68d0066d2",
"reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
"reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
"shasum": ""
},
"require": {
@@ -8483,9 +8243,9 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
"source": "https://github.com/FakerPHP/Faker/tree/v1.22.0"
"source": "https://github.com/FakerPHP/Faker/tree/v1.23.0"
},
"time": "2023-05-14T12:31:37+00:00"
"time": "2023-06-12T08:44:38+00:00"
},
{
"name": "filp/whoops",
@@ -8676,22 +8436,22 @@
},
{
"name": "mockery/mockery",
"version": "1.6.0",
"version": "1.6.2",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
"reference": "bac1765cb52bbd3364a870e920cb69cd859ee302"
"reference": "13a7fa2642c76c58fa2806ef7f565344c817a191"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/bac1765cb52bbd3364a870e920cb69cd859ee302",
"reference": "bac1765cb52bbd3364a870e920cb69cd859ee302",
"url": "https://api.github.com/repos/mockery/mockery/zipball/13a7fa2642c76c58fa2806ef7f565344c817a191",
"reference": "13a7fa2642c76c58fa2806ef7f565344c817a191",
"shasum": ""
},
"require": {
"hamcrest/hamcrest-php": "^2.0.1",
"lib-pcre": ">=7.0",
"php": "^7.3 || ^8.0"
"php": "^7.4 || ^8.0"
},
"conflict": {
"phpunit/phpunit": "<8.0"
@@ -8704,7 +8464,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
"dev-main": "1.6.x-dev"
}
},
"autoload": {
@@ -8748,9 +8508,9 @@
],
"support": {
"issues": "https://github.com/mockery/mockery/issues",
"source": "https://github.com/mockery/mockery/tree/1.6.0"
"source": "https://github.com/mockery/mockery/tree/1.6.2"
},
"time": "2023-05-03T12:55:29+00:00"
"time": "2023-06-07T09:07:52+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -9329,29 +9089,16 @@
},
{
"name": "phpunit/phpunit",
<<<<<<< HEAD
"version": "9.6.8",
"version": "9.6.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e"
"reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
},
"dist": {
"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
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
"reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
"shasum": ""
},
"require": {
@@ -9425,11 +9172,7 @@
"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
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
},
"funding": [
{
@@ -9445,11 +9188,7 @@
"type": "tidelift"
}
],
<<<<<<< HEAD
"time": "2023-05-11T05:14:45+00:00"
=======
"time": "2023-04-14T08:58:40+00:00"
>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
"time": "2023-06-11T06:13:56+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -10546,5 +10285,5 @@
"php": "^7.3|^8.0"
},
"platform-dev": [],
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.2.0"
}

View File

@@ -1,6 +1,6 @@
$(document).ready(function() {
$('#automobili').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data",
@@ -10,7 +10,7 @@ $(document).ready(function() {
});
$('#contatti').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data",

View File

@@ -1,6 +1,6 @@
$(document).ready(function() {
$('#automobili').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data",

View File

@@ -1,5 +1,11 @@
$(document).ready(function() {
$('#listaLettureEnel').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data lettura",
type: "datetime"
}
]
});
});

View File

@@ -1,5 +1,11 @@
$(document).ready(function() {
$('#listaLettureGas').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data lettura",
type: "datetime"
}
]
});
});

View File

@@ -1,6 +1,12 @@
$(document).ready(function() {
$('#listamovimenti').DataTable({
"responsive": true,
fields: [
{
label:"Data",
type: "datetime"
}
],
"order": [[0, "desc"]]
});
});

View File

@@ -1,7 +1,7 @@
$(document).ready(function() {
$('#tab_progetti').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data",

View File

@@ -1,6 +1,6 @@
$(document).ready(function() {
$('#tab_progetti').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data",
@@ -8,7 +8,7 @@ $(document).ready(function() {
}
]
});
});
$('#form').click(function() {
$('form').toggle();
});
@@ -41,4 +41,4 @@ $(document).ready(function() {
$('#myModal_addRow').modal('show');
// $('#form_new').attr('action', 'progetti/new');
});
});

View File

@@ -88,7 +88,7 @@
@foreach($operazione as $operazioni)
@if ($operazioni->type =='revisione')
<tr>
<td>{{ $operazioni->data; }}</td>
<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
<td>{{ $operazioni->km; }}</td>
@if($revisione[$operazioni->id][0]->superata >0)
<td>Superata</td>
@@ -135,7 +135,7 @@
@foreach($operazione as $operazioni)
@if ($operazioni->type =='manutenzione')
<tr>
<td>{{ $operazioni->data; }}</td>
<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
<td>{{ $operazioni->km; }}</td>
<td>{{ $manutenzione[$operazioni->id][0]->descrizione; }}</td>
<td>{{ $operazioni->importo; }}</td>
@@ -175,7 +175,7 @@
@foreach($operazione as $operazioni)
@if ($operazioni->type=='accessori')
<tr>
<td>{{ $operazioni->data; }}</td>
<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
<td>{{ $operazioni->km; }}</td>
<td>{{ $accessori[$operazioni->id][0]->descrizione; }}</td>
<td>{{ $operazioni->importo; }}</td>
@@ -217,7 +217,7 @@
@foreach($operazione as $operazioni)
@if ($operazioni->type =='rifornimento')
<tr>
<td>{{ $operazioni->data; }}</td>
<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
<td>{{ $operazioni->km; }}</td>
<td>{{ $rifornimento[$operazioni->id][0]->distributore; }}</td>
<td>{{ $rifornimento[$operazioni->id][0]->eurolitro; }}</td>

View File

@@ -97,7 +97,7 @@ table{
@foreach($operazione as $operazioni)
@if ($operazioni->type =='revisione')
<tr>
<td>{{ $operazioni->data; }}</td>
<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
<td>{{ $operazioni->km; }}</td>
<td>{{ $revisione[$operazioni->id][0]->superata; }}</td>
<td>{{ $revisione[$operazioni->id][0]->centrorevisione; }}</td>
@@ -140,7 +140,7 @@ table{
@foreach($operazione as $operazioni)
@if ($operazioni->type =='manutenzione')
<tr>
<td>{{ $operazioni->data; }}</td>
<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
<td>{{ $operazioni->km; }}</td>
<td>{{ $manutenzione[$operazioni->id][0]->descrizione; }}</td>
<td>{{ $operazioni->importo; }}</td>
@@ -180,7 +180,7 @@ table{
@foreach($operazione as $operazioni)
@if ($operazioni->type=='accessori')
<tr>
<td>{{ $operazioni->data; }}</td>
<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
<td>{{ $operazioni->km; }}</td>
<td>{{ $accessori[$operazioni->id][0]->descrizione; }}</td>
<td>{{ $operazioni->importo; }}</td>
@@ -222,7 +222,7 @@ table{
@foreach($operazione as $operazioni)
@if ($operazioni->type =='rifornimento')
<tr>
<td>{{ $operazioni->data; }}</td>
<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
<td>{{ $operazioni->km; }}</td>
<td>{{ $rifornimento[$operazioni->id][0]->distributore; }}</td>
<td>{{ $rifornimento[$operazioni->id][0]->eurolitro; }}</td>

View File

@@ -31,7 +31,7 @@
<tbody>
@foreach( $movimenti as $movimento )
<tr>
<td>{{ $movimento->mov_data; }}</td>
<td>{{ date_format(date_create($movimento->mov_data),'d/m/Y'); }}</td>
<td>{{ $movimento->cat_name; }}</td>
<td>{{ $movimento->mov_descrizione; }}</td>
<td>&euro; {{ $movimento->mov_importo; }}</td>

View File

@@ -25,7 +25,7 @@
<tbody>
@foreach( $dataSpesa as $dato )
<tr>
<td><a href="movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
<td>{{ $dato->resoconto; }}</td>
</tr>
@@ -55,7 +55,7 @@
<tbody>
@foreach( $dataEntrate as $dato )
<tr>
<td><a href="movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
<td>{{ $dato->resoconto; }}</td>
</tr>
@@ -72,4 +72,3 @@
@section('script')
<script src="/js/app/conti_categorie.js"></script>
@endsection

View File

@@ -62,7 +62,7 @@
<tbody>
@foreach($lettureEnel as $lettura)
<tr>
<td>{{ $lettura->enel_date; }}</td>
<td>{{ date_format(date_create($lettura->enel_date),'d/m/Y'); }}</td>
<td>{{ $lettura->enel_A; }}</td>
<td>{{ $lettura->enel_R; }}</td>
<td>{{ $lettura->enel_F1; }}</td>
@@ -83,4 +83,3 @@
@section('script')
<script src="/js/app/enel.js"></script>
@endsection

View File

@@ -71,7 +71,7 @@
}
@endphp
<tr>
<td>{{ $lettura->gas_date; }}</td>
<td>{{ date_format(date_create($lettura->gas_date),'d/m/Y'); }}</td>
<td>{{ $lettura->gas_lettura; }}</td>
@if(!is_null($dateprec))
<td>{{ $diffdate ?? '' }}</td>
@@ -101,4 +101,3 @@
@section('script')
<script src="/js/app/gas.js"></script>
@endsection

View File

@@ -0,0 +1,11 @@
@component('mail::message')
Ciao {{ Auth::user()->name ?? $name }},
Hai configurato correttamente la posta elettronica!
@component('mail::button', ['url' => 'https://gestionale.lavorain.cloud/'])
Ciao.
@endcomponent
Buona giornata,<br>
{{ config('app.name') }}
@endcomponent

View File

@@ -86,7 +86,7 @@
<div class="row">
<div class="col-xs-10">
<div class="row p-3">
<button class="btn btn-primary open_modal_addRow">Nuova riga</button>
@if($progetto->stato !='chiuso')<button class="btn btn-primary open_modal_addRow">Nuova riga</button>@endif
</div>
<div class="row">
<table class="table table-striped table-bordered table-hover"
@@ -107,11 +107,11 @@
<td>{{ $riga->descrizione }}</td>
<td>{{ $riga->ore }}</td>
<td>{{ $riga->prezzo }}</td>
<td><a
<td>@if($progetto->stato !='chiuso')<a
href="/admin/progetti/delete_row/{{ $riga->id }}/return/{{ $progetto->id }}"
class="btn btn-danger">X</a> &nbsp;
<button class="btn btn-warning btn-detail open_modal"
value="{{$riga->id}}">Edit</button></td>
value="{{$riga->id}}">Edit</button>@endif</td>
</tr>
@else

View File

@@ -38,12 +38,12 @@
<tr>
<td><a href="progetti/detail/{{ $progetto->progetto }}">{{
$progetto->nome; }}</a></td>
<td>{{ $progetto->data_creazione; }}</td>
<td>{{ date_format(date_create($progetto->data_creazione),'d/m/Y'); }}</td>
<td>{{ $progetto->stato; }}</td>
<td>{{ $progetto->name; }}</td>
<td>{{ $progetto->budget; }}</td>
<td><a href="progetti/delete?id={{ $progetto->progetto }}"
class="btn btn-danger">Cancella</a></td>
<td>@if($progetto->stato != 'chiuso')<a href="progetti/delete?id={{ $progetto->progetto }}"
class="btn btn-danger">Cancella</a>@endif</td>
</tr>
@endforeach
</tbody>

View File

@@ -15,6 +15,7 @@ use App\Http\Controllers\AutoController;
use App\Http\Controllers\AnagraficaController;
use App\Http\Controllers\Utenti;
use App\Http\Controllers\ProgettiController;
use App\Mail\myTestEmail;
/*
|--------------------------------------------------------------------------
@@ -151,3 +152,7 @@ Route::group(['middleware'=>['permission:progetti']], function(){
Route::get('test/user_role',[CondominioController::class,'user_role']);
Route::get('test/userclass',[Utenti::class,'userClass']);
Route::get('testmail',function(){
$name='Flavio';
Mail::to('git@lavorain.cloud')->send(new myTestEmail($name));
});