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

creazione della separazzione delle categorie

Browse Source
This commit is contained in:
Amministratore 2023-07-06 17:39:23 +02:00
parent 75761353ca
commit 8d0576099c
6 changed files with 84 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/CategorieController.php
View File

@ -48,4 +48,16 @@ class CategorieController extends Controller
$categorie = Categorie::getById($id);
return json_encode($categorie);
}
public function apiListSpesa()
{
$categorie=Categorie::listSpesa();
return json_encode($categorie);
}
public function apiListEntrata()
{
$categorie=Categorie::listEntrata();
return json_encode($categorie);
}
}

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

@ -53,7 +53,7 @@ class MovimentiController extends Controller
{
Movimenti::insSpesa($request);
$mov=Movimenti::getList();
$categorie=Categorie::list();
$categorie=Categorie::listSpesa();
$tags=tag::getList();
return view('conti.movimenti.list',
[
@ -68,7 +68,7 @@ class MovimentiController extends Controller
{
Movimenti::insEntrata($request);
$mov=Movimenti::getList();
$categorie=Categorie::list();
$categorie=Categorie::listEntrata();
$tags=tag::getList();
return view('conti.movimenti.list',
[

12
app/Models/Categorie.php
View File

@ -17,7 +17,17 @@ class Categorie extends Model
public static function list()
{
return DB::table('categories')->orderBy('cat_name')->get();
return self::all();
}
public static function listSpesa()
{
return DB::table('categories')->where('cat_spesa','=',1)->get();
}
public static function listEntrata()
{
return DB::table('categories')->where('cat_entrata','=',1)->get();
}
public static function inserisci($name){

37
database/migrations/2023_07_06_142451_update_categories_adding_spesa_entrata.php Normal file
View File

@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdateCategoriesAddingSpesaEntrata extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
//
Schema::table('categories', function (Blueprint $table) {
$table->smallInteger('cat_entrata')->after('cat_name')->default(0);
$table->smallInteger('cat_uscita')->after('cat_entrata')->default(0);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
Schema::table('categories', function (Blueprint $table) {
$table->dropColumn('cat_entrata');
$table->dropColumn('cat_uscita');
});
}
}

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

@ -23,20 +23,36 @@ 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"]').val("");
$('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"],select').val("");
$('#form').find('input[type="date"]').val(strDate);
$('#myModal').modal('show');
$('.modal-title').text(' Nuovo movimento in uscita');
$('#form').attr('action', '/admin/movimenti/spesa');
$.getJSON("/admin/service/catlistSpesa", {}, function(data) {
$.each(data, function(i, item) {
$("select[name='mov_fk_categoria']").append(
new Option(item.cat_name, item.id)
)
}
);
});
});
$(document).on('click', '.open_modal_entrata', function() {
console.log(strDate);
$('#form').find('input[type="text"], textarea, input[type="number"]').val("");
$('#form').find('input[type="text"], textarea, input[type="number"],select').val("");
$('#form').find('input[type="date"]').val(strDate);
$('#myModal').modal('show');
$('.modal-title').text('Nuovo movimento in entrata');
$('#form').attr('action', '/admin/movimenti/entrata');
$.getJSON("/admin/service/catlistEntrata", {}, function(data) {
$.each(data, function(i, item) {
$("select[name='mov_fk_categoria']").append(
new Option(item.cat_name, item.id)
)
}
);
});
});
$(document).on('click', '.open_modal_modifica', function() {
@ -62,7 +78,7 @@ $(document).on('click', '.open_modal_modifica', function() {
$('#form').attr('action', '/admin/movimenti/modify');
$('#form').append('<input type="hidden" name="id" value="' + riga_id + '">');
});
});
$.getJSON("/admin/service/catlist", {}, function(data) {
$.each(data, function(i, item) {
@ -72,6 +88,7 @@ $.getJSON("/admin/service/catlist", {}, function(data) {
}
);
});
});
$.getJSON("/admin/service/taglist", {}, function(data) {
$.each(data, function(i, item) {

2
routes/admin.php
View File

@ -67,6 +67,8 @@ Route::group(['middleware'=>['permission:conti']], function(){
Route::get('service/catlist', [CategorieController::class,'apiList']);
Route::get('service/taglist', [TagController::class,'apiList']);
Route::get('service/rolesList', [Utenti::class,'listRoles']);
Route::get('service/catlistSpesa', [CategorieController::class,'apiListSpesa']);
Route::get('service/catlistEntrata', [CategorieController::class,'apiListEntrata']);
// TAGS
Route::get('tags', [TagController::class,'listTags'])->name('tags');