diff --git a/public/js/app/conti_categorie.js b/public/js/app/conti_categorie.js index 9a110e5..bb20387 100644 --- a/public/js/app/conti_categorie.js +++ b/public/js/app/conti_categorie.js @@ -7,4 +7,27 @@ $(document).ready(function() { $('#listrapportoE').DataTable({ responsive: true }); -}); \ No newline at end of file +}); + + $(document).ready(function() { + $('#categorie').DataTable({ + responsive: true + }); + + $(document).on('click','.open_modal',function(){ + var url = "catmodify"; + var riga_id= $(this).val(); + $.getJSON(url + '/' + riga_id, function (data) { + //success data + console.log(data[0]); + console.log(data[0].cat_name); + $('#H_cat_cat_name').val(data[0].cat_name); + $('#H_cat_id').val(data[0].id); + $('#myModal').modal('show'); + }); + }); + $(document).on('click','.open_modal_new',function(){ + $('#myModal_new').modal('show'); + + }); + }); \ No newline at end of file diff --git a/public/js/app/dashboard.js b/public/js/app/dashboard.js new file mode 100644 index 0000000..a730aae --- /dev/null +++ b/public/js/app/dashboard.js @@ -0,0 +1,6 @@ + +$(document).ready(function() { + $('#categorie').DataTable({ + responsive: true + }); +}); diff --git a/public/js/app/enel.js b/public/js/app/enel.js new file mode 100644 index 0000000..d44bd94 --- /dev/null +++ b/public/js/app/enel.js @@ -0,0 +1,5 @@ +$(document).ready(function() { + $('#listaLettureEnel').DataTable({ + responsive: true + }); +}); \ No newline at end of file diff --git a/public/js/app/gas.js b/public/js/app/gas.js new file mode 100644 index 0000000..5192b9a --- /dev/null +++ b/public/js/app/gas.js @@ -0,0 +1,5 @@ +$(document).ready(function() { + $('#listaLettureGas').DataTable({ + responsive: true + }); +}); \ No newline at end of file diff --git a/public/js/app/tag.js b/public/js/app/tag.js new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index aa206c7..55e4060 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -1,120 +1,54 @@ -
  • - Riepilogo +
  • Riepilogo
    • -
  • - Spese/Incassi - - -
    • -
  • - Consumi +
  • Spese/Incassi +
    • +
  • Consumi - -
    • -
  • - Automobili +
    • +
  • + Automobili
    • +
  • Contatti - -
    • -
  • - Progetti - -
    • -
  • - Amministrazione - - -
    • + +
  • + Progetti
    • +
  • Amministrazione +
    • diff --git a/resources/views/components/usermenu.blade.php b/resources/views/components/usermenu.blade.php index a4cb4c0..6dba177 100644 --- a/resources/views/components/usermenu.blade.php +++ b/resources/views/components/usermenu.blade.php @@ -1,19 +1,14 @@ -
  • - - @if(Auth::check()) - {{ Auth::user()->name }} -@endif - - -
    • +
  • @if(Auth::check()) {{ + Auth::user()->name }} @endif + +
    • diff --git a/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php index 50e9985..33105ab 100644 --- a/resources/views/conti/categorie/list.blade.php +++ b/resources/views/conti/categorie/list.blade.php @@ -113,28 +113,5 @@ @endsection @section('script') - + @endsection diff --git a/resources/views/conti/documenti/insert.blade.php b/resources/views/conti/documenti/insert.blade.php index ddbba56..c1a39a3 100644 --- a/resources/views/conti/documenti/insert.blade.php +++ b/resources/views/conti/documenti/insert.blade.php @@ -63,11 +63,5 @@ @endsection @section('script') - + @endsection diff --git a/resources/views/conti/movimenti/new.blade.php b/resources/views/conti/movimenti/new.blade.php index 4ca2363..b5b886c 100644 --- a/resources/views/conti/movimenti/new.blade.php +++ b/resources/views/conti/movimenti/new.blade.php @@ -72,12 +72,6 @@ @endsection @section('script') - + @endsection diff --git a/resources/views/conti/tags/list.blade.php b/resources/views/conti/tags/list.blade.php index 4b599ba..37ec20f 100644 --- a/resources/views/conti/tags/list.blade.php +++ b/resources/views/conti/tags/list.blade.php @@ -91,27 +91,5 @@ @endsection @section('script') - + @endsection diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index 84a24cd..f3439ec 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -56,11 +56,5 @@ @endsection @section('script') - + @endsection \ No newline at end of file diff --git a/resources/views/letture/enel/list.blade.php b/resources/views/letture/enel/list.blade.php index 3dd4cd2..411f425 100644 --- a/resources/views/letture/enel/list.blade.php +++ b/resources/views/letture/enel/list.blade.php @@ -81,12 +81,6 @@ @endsection @section('script') - + @endsection \ No newline at end of file diff --git a/resources/views/letture/gas/list.blade.php b/resources/views/letture/gas/list.blade.php index 963975d..545419b 100644 --- a/resources/views/letture/gas/list.blade.php +++ b/resources/views/letture/gas/list.blade.php @@ -99,12 +99,6 @@ @endsection @section('script') - + @endsection \ No newline at end of file