Mercurial > packages > magicforger

changeset 28:f88d2d5dee30 codex

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated inputs and routes
author Luka Sitas <sitas.luka.97@gmail.com>
date Mon, 09 Jun 2025 19:51:31 -0400
parents b17f81b804ff
children 010ace248d14
files src/Generator/Model/ModelGenerator.php src/Generator/Model/snippets/filter.stub src/Generator/Model/stubs/model.stub src/Generator/Route/stubs/routes.stub src/Generator/View/snippets/input/checkbox.stub src/Generator/View/snippets/input/date.stub src/Generator/View/snippets/input/select.stub src/Generator/View/snippets/input/text.stub src/Generator/View/snippets/input/textarea.stub
diffstat 9 files changed, 38 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/src/Generator/Model/ModelGenerator.php	Mon Jun 02 21:51:09 2025 -0400
+++ b/src/Generator/Model/ModelGenerator.php	Mon Jun 09 19:51:31 2025 -0400
@@ -93,6 +93,17 @@
 			
 		}
 
+		protected function renderFilters() {
+        $insert = '';
+        foreach ($this->get_columns() as $column) {
+            if (in_array($column['name'], $this->columns_to_ignore)) {
+                continue;
+            }
+            $insert .= sprintf("'%s',", $column['name'])."\n";
+        }
+
+		}
+
 		protected function renderRelations($relations) {
 			$renders = [
 				'belongsTo' => [],
@@ -175,6 +186,7 @@
 
         return $string;
     }
+
     /**
      * Get available insertions including model relationships.
      *
@@ -186,8 +198,9 @@
         $inserts = parent::get_available_inserts();
 
         // Gather and render relationships for this model
-        $relations = RelationshipNavigator::getRelations($this->getCurrentTable());
+        $relations = $this->gatherRelations();
         $rendered = $this->renderRelations($relations);
+				$filters = $this->renderFilters();
 
         // Build code blocks for each relation type
         $belongs = !empty($rendered['belongsTo']) ? implode("\n    ", $rendered['belongsTo']) : '';
@@ -202,6 +215,7 @@
         $inserts['# {{ has_many_relationships }}'] = $hasMany;
         $inserts['# {{ has_many_through_relationships }}'] = $belongsMany;
 				$inserts['# {{ defaultRelationsInsertPoint }}'] = $default_relations;
+				$inserts['# {{ defaultFiltersInsertPoint }}'] = $filters;
 
         return $inserts;
     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Generator/Model/snippets/filter.stub	Mon Jun 09 19:51:31 2025 -0400
@@ -0,0 +1,6 @@
+'{{columnName}}' => [
+	'column_name' => '{{columnName}}',
+	'table' => '{{tableName}}',
+	'display' => '{{columnDisplay}}',
+	'type' => '{{value}}',
+],
--- a/src/Generator/Model/stubs/model.stub	Mon Jun 02 21:51:09 2025 -0400
+++ b/src/Generator/Model/stubs/model.stub	Mon Jun 09 19:51:31 2025 -0400
@@ -35,21 +35,14 @@
 			# {{ defaultRelationsInsertPoint }}
 		];
 
-		//MARK FOR MODEL
-		public static function boot() : void {
-			parent::boot();
+		protecte static $filters = [
+			# {{ defaultFiltersInsertPoint }}
+		];
 
-			self::creating(function ($item) {
-				$item->created_by = \Auth::user()?->id ?? '';
-				$item->updated_by = \Auth::user()?->id ?? '';
-			});
-
-			self::saving(function ($item) {
-				$item->updated_by = \Auth::user()?->id ?? '';
-			});
+		public static function get_filters() {
+			return static::filters;
 		}
 
-
 		//relations
 
 		// BelongsTo
@@ -89,38 +82,14 @@
 			return $data;
 		}
 
-		//MARK FOR MODEL
-		public static function load_index() {
-			return static::load_auxilary_data();
-		}
-
-		//MARK FOR MODEL
-		public static function load_create() {
-			return static::load_auxilary_data();
-		}
-
-		//MARK FOR MODEL
-		public static function load_edit() {
-			return static::load_auxilary_data();
-		}
-
 
 		/**
 		 * Retrieve a query builder instance with default relations loaded.
 		 *
 		 * @return \Illuminate\Database\Eloquent\Builder
 		 */
-		//MARK FOR MODEL
 		public static function data_query() {
-		    $query = static::query();
-		
-				$instance = new static();
-
-		    foreach($instance->default_relations as $relation) {
-		        $query->with($relation);
-		    }
-		
-		    return $query;
+			return parent::data_query();
 		}
 
 		/**
@@ -128,9 +97,9 @@
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public static function get_data()
+    public static function get_data(array $validated = [])
     {
-        return static::data_query()->get();
+        return parent::get_data($validated);
     }
 
 }
--- a/src/Generator/Route/stubs/routes.stub	Mon Jun 02 21:51:09 2025 -0400
+++ b/src/Generator/Route/stubs/routes.stub	Mon Jun 09 19:51:31 2025 -0400
@@ -8,11 +8,11 @@
 	->group( function () {
 		Route::get('/', 'index')->name('index');
 		Route::get('/create', 'create')->name('create');
-		Route::get('/{ticket}/edit', 'edit')->name('edit');
-		Route::get('/{ticket}', 'show')->name('show');
-		Route::get('/{ticket}/load', 'load')->name('load');
+		Route::get('/{{{ modelVariable }}}/edit', 'edit')->name('edit');
+		Route::get('/{{{ modelVariable }}}', 'show')->name('show');
+		Route::get('/{{{ modelVariable }}}/load', 'load')->name('load');
 
 		Route::post('/store', 'store')->name('store');
 		Route::put('/udpate/{{{ modelVariable }}}', 'update')->name('update');
-		Route::delete('/destory/{{{ modelVariable }}}', 'destory')->name('destory');
+		Route::delete('/destroy/{{{ modelVariable }}}', 'destroy')->name('destroy');
 	});
--- a/src/Generator/View/snippets/input/checkbox.stub	Mon Jun 02 21:51:09 2025 -0400
+++ b/src/Generator/View/snippets/input/checkbox.stub	Mon Jun 09 19:51:31 2025 -0400
@@ -1,5 +1,5 @@
 <x-form.checkbox
 	name="{{fieldName}}"
 	label="{{fieldLabel}}"
-	:checked="old('{{fieldName}}', $item?->{{fieldName}} ?? 'false')"
+	:checked="request('{{fieldName}}', $item?->{{fieldName}} ?? 'false')"
 ></x-form.checkbox>
--- a/src/Generator/View/snippets/input/date.stub	Mon Jun 02 21:51:09 2025 -0400
+++ b/src/Generator/View/snippets/input/date.stub	Mon Jun 09 19:51:31 2025 -0400
@@ -1,6 +1,6 @@
 <x-form.date
 	name="{{fieldName}}"
 	label="{{fieldLabel}}"
-	:value="old('{{fieldName}}', $item?->{{fieldName}} ?? '')"
+	:value="request('{{fieldName}}', $item?->{{fieldName}} ?? '')"
 	:required="{{required}}"
 ></x-form.date>
--- a/src/Generator/View/snippets/input/select.stub	Mon Jun 02 21:51:09 2025 -0400
+++ b/src/Generator/View/snippets/input/select.stub	Mon Jun 09 19:51:31 2025 -0400
@@ -2,6 +2,6 @@
 	name="{{fieldName}}"
 	label="{{fieldLabel}}"
 	:options="{{options}}"
-	:value="old('{{fieldName}}', $item?->{{fieldName}} ?? '')"
+	:value="request('{{fieldName}}', $item?->{{fieldName}} ?? '')"
 	:required="{{required}}"
 ></x-form.select>
--- a/src/Generator/View/snippets/input/text.stub	Mon Jun 02 21:51:09 2025 -0400
+++ b/src/Generator/View/snippets/input/text.stub	Mon Jun 09 19:51:31 2025 -0400
@@ -1,6 +1,6 @@
 <x-form.text
 	name="{{fieldName}}"
 	label="{{fieldLabel}}"
-	:value="old('{{fieldName}}', $item?->{{fieldName}} ?? '')"
+	:value="request('{{fieldName}}', $item?->{{fieldName}} ?? '')"
 	:required="{{required}}"
 ></x-form.text>
--- a/src/Generator/View/snippets/input/textarea.stub	Mon Jun 02 21:51:09 2025 -0400
+++ b/src/Generator/View/snippets/input/textarea.stub	Mon Jun 09 19:51:31 2025 -0400
@@ -1,6 +1,6 @@
 <x-form.textarea
 	name="{{fieldName}}"
 	label="{{fieldLabel}}"
-	:value="old('{{fieldName}}', $item?->{{fieldName}} ?? '')"
+	:value="request('{{fieldName}}', $item?->{{fieldName}} ?? '')"
 	:required="{{required}}"
 ></x-form.textarea>