correzioni varie

app/Http/Controllers/MovimentiController.php

@@ -6,8 +6,11 @@ use App\Models\Categorie;
 use App\Models\Movimenti;
 use App\Models\tag;
 use App\Models\Task;
+// use App\Models\User;
+// use App\Http\Controllers\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 use Rap2hpoutre\FastExcel\FastExcel;
 
 class MovimentiController extends Controller
@@ -42,8 +45,8 @@ class MovimentiController extends Controller
         $entrate=Movimenti::getEntrate(date('Y'));
         $uscite=Movimenti::getUscite(date('Y'));
         $saldo=Movimenti::getSaldoTot();
-        // $mieiTasks=Task::getTaskAssignedToUser(Auth::user()->id);
-        // $TasksAssegnati=Task::getTaskAssignedByUser(Auth::user()->id);
+        $mieiTasks=Task::getTaskAssignedToUser(Auth::id());
+        $TasksAssegnati=Task::getTaskAssignedByUser(Auth::id());
 
         return view('layouts.dashboard',[
             'entrate'=>$entrate,

public/js/app/movimenti.js

@@ -117,10 +117,14 @@ $(document).on('click', '.open_modal_modifica', function() {
 		
 });
 
-/*$.getJSON("/admin/service/taglist", {}, function(data) {
+/*
+
+$.getJSON("/admin/service/taglist", {}, function(data) {
 	$.each(data, function(i, item) {
 		$("select[name='mov_fk_tags']").append(
 			new Option(item.tag_name, item.id)
 		)
 	});
-});*/
+});
+
+*/

resources/views/layouts/dashboard.blade.php

@@ -8,7 +8,7 @@
 <div class="row">
 @hasanyrole('user|admin')
 <!-- WIDGET Bilancio -->
-	<div class="col-lg-4 col-md-8">
+	<div class="col-lg-3 col-md-8">
         <div class="panel panel-success">
             <div class="panel-heading">
                 <div class="row">
@@ -31,7 +31,7 @@
      	</div>
 	</div>
     <!-- WIDGET Bilancio -->
-	<div class="col-lg-4 col-md-8">
+	<div class="col-lg-3 col-md-8">
         <div class="panel panel-danger">
             <div class="panel-heading">
                 <div class="row">
@@ -55,7 +55,7 @@
 	</div>
 
 	<!-- WIDGET  -->
-	<div class="col-lg-4 col-md-8">
+	<div class="col-lg-3 col-md-8">
         <div class="panel panel-primary">
             <div class="panel-heading">
                 <div class="row">
@@ -77,7 +77,7 @@
            </a>
      	</div>
 	</div>
-    <div class="col-lg-4 col-md-8">
+    <div class="col-lg-3 col-md-8">
         <div class="panel panel-yellow">
             <div class="panel-heading">
                 <div class="row">

resources/views/tasks/list.blade.php

@@ -2,7 +2,7 @@
 @section('content')
 <div class="row">
 	<div class="col-lg-12">
-		<h1 class="page-header">Lista Progetti</h1>
+		<h1 class="page-header">Lista Attività</h1>
 	</div>
 </div>
 <div class="container">
@@ -10,6 +10,15 @@
 	<div class="row">
 		<div class="col-xs-12">
 			<button class="btn btn-primary open_modal_new"><i
-				class="fa fa-pencil-square-o fw"></i>Nuovo Progetto</button>
+				class="fa fa-pencil-square-o fw"></i>Nuova Attività</button>
 		</div>
 	</div>
+	<div class ="row">
+		<div class="col">
+		
+		</div>
+	</div>
+@endsection
+@section('script')
+	<script src="/js/app/tasks.js">
+@endsection