fbarachino/bubofamily
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Compare commits

base: fbarachino:9f0c93c9215b2e5c709d477e6a8f14d176e25f44
Branches Tags
fbarachino:master
fbarachino:devel
fbarachino:user_role
fbarachino:0.1.1.a
fbarachino:v0.1.0-alpha
..
compare: fbarachino:0f382d4182e004957a07a5cfa9ded4f04c6e2146
Branches Tags
fbarachino:master
fbarachino:devel
fbarachino:user_role
fbarachino:0.1.1.a
fbarachino:v0.1.0-alpha

No commits in common. "9f0c93c9215b2e5c709d477e6a8f14d176e25f44" and "0f382d4182e004957a07a5cfa9ded4f04c6e2146" have entirely different histories.
9f0c93c921 ... 0f382d4182

4 changed files with 11 additions and 27 deletions
Show Stats Expand all files Collapse all files

7
app/Http/Controllers/MovimentiController.php
View File

@ -6,11 +6,8 @@ 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
@ -45,8 +42,8 @@ class MovimentiController extends Controller
$entrate=Movimenti::getEntrate(date('Y'));
$uscite=Movimenti::getUscite(date('Y'));
$saldo=Movimenti::getSaldoTot();
$mieiTasks=Task::getTaskAssignedToUser(Auth::id());
$TasksAssegnati=Task::getTaskAssignedByUser(Auth::id());
// $mieiTasks=Task::getTaskAssignedToUser(Auth::user()->id);
// $TasksAssegnati=Task::getTaskAssignedByUser(Auth::user()->id);
return view('layouts.dashboard',[
'entrate'=>$entrate,

8
public/js/app/movimenti.js vendored
View File

@ -117,14 +117,10 @@ $(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)
)
});
});
*/
});*/

8
resources/views/layouts/dashboard.blade.php
View File

@ -8,7 +8,7 @@
<div class="row">
@hasanyrole('user|admin')
<!-- WIDGET Bilancio -->
<div class="col-lg-3 col-md-8">
<div class="col-lg-4 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-3 col-md-8">
<div class="col-lg-4 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-3 col-md-8">
<div class="col-lg-4 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-3 col-md-8">
<div class="col-lg-4 col-md-8">
<div class="panel panel-yellow">
<div class="panel-heading">
<div class="row">

15
resources/views/tasks/list.blade.php
View File

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