diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php index 60648a1..f637979 100644 --- a/app/Http/Controllers/CategorieController.php +++ b/app/Http/Controllers/CategorieController.php @@ -54,7 +54,7 @@ class CategorieController extends Controller $categorie=Categorie::listSpesa(); return json_encode($categorie); } - + public function apiListEntrata() { $categorie=Categorie::listEntrata(); diff --git a/app/Models/Categorie.php b/app/Models/Categorie.php index 42414bf..8891334 100644 --- a/app/Models/Categorie.php +++ b/app/Models/Categorie.php @@ -22,7 +22,7 @@ class Categorie extends Model public static function listSpesa() { - return DB::table('categories')->where('cat_spesa','=',1)->get(); + return DB::table('categories')->where('cat_uscita','=',1)->get(); } public static function listEntrata() diff --git a/public/js/app/movimenti.js b/public/js/app/movimenti.js index 627a726..c2a67fa 100644 --- a/public/js/app/movimenti.js +++ b/public/js/app/movimenti.js @@ -23,7 +23,8 @@ var strDate = d.getFullYear() + '-' + $(document).on('click', '.open_modal_spesa', function() { console.log(strDate); - $('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"],select').val(""); + $("#categoria").empty(); + $('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"],option').val(""); $('#form').find('input[type="date"]').val(strDate); $('#myModal').modal('show'); $('.modal-title').text(' Nuovo movimento in uscita'); @@ -40,7 +41,8 @@ $(document).on('click', '.open_modal_spesa', function() { $(document).on('click', '.open_modal_entrata', function() { console.log(strDate); - $('#form').find('input[type="text"], textarea, input[type="number"],select').val(""); + $("#categoria").empty(); + $('#form').find('input[type="text"], textarea, input[type="number"],option').val(""); $('#form').find('input[type="date"]').val(strDate); $('#myModal').modal('show'); $('.modal-title').text('Nuovo movimento in entrata'); @@ -58,6 +60,7 @@ $(document).on('click', '.open_modal_entrata', function() { $(document).on('click', '.open_modal_modifica', function() { var url = "/admin/movimenti/modify"; var riga_id = $(this).val(); + $("#categoria").empty(); $.getJSON(url + '/' + riga_id, function(data) { // success data console.log(data[0]);