codificar / scaffolder

src/Scaffolder/Compilers/Blade/EditViewCompiler.php

Indentation +131 added lines, -131 removed lines

@@ -11,136 +11,136 @@
 
 class EditViewCompiler extends AbstractViewCompiler
 {
-	use InputTypeResolverTrait;
-
-	/**
-	 * Compiles the edit view.
-	 *
-	 * @param      $stub
-	 * @param      $modelName
-	 * @param      $modelData
-	 * @param      $scaffolderConfig
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
-		{
-			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
-		{
-			$this->stub = $stub;
-
-			return $this->replaceClassName($modelName)
-				->replaceBreadcrumb($modelName)
-				->addFields($modelData)
-				->replacePrimaryKey($modelData)
-				->replaceRoutePrefix($scaffolderConfig->generator->routing->prefix)
-				->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
-		}
-	}
-
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param               $modelName
-	 * @param               $scaffolderConfig
-	 * @param               $compiled
-	 * @param FileToCompile $fileToCompile
-	 *
-	 * @return string
-	 */
-	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
-	{
-		$folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
+    use InputTypeResolverTrait;
+
+    /**
+     * Compiles the edit view.
+     *
+     * @param      $stub
+     * @param      $modelName
+     * @param      $modelData
+     * @param      $scaffolderConfig
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
+        {
+            return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
+        }
+        else
+        {
+            $this->stub = $stub;
+
+            return $this->replaceClassName($modelName)
+                ->replaceBreadcrumb($modelName)
+                ->addFields($modelData)
+                ->replacePrimaryKey($modelData)
+                ->replaceRoutePrefix($scaffolderConfig->generator->routing->prefix)
+                ->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
+        }
+    }
+
+    /**
+     * Store the compiled stub.
+     *
+     * @param               $modelName
+     * @param               $scaffolderConfig
+     * @param               $compiled
+     * @param FileToCompile $fileToCompile
+     *
+     * @return string
+     */
+    protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
+    {
+        $folder = PathParser::parse($scaffolderConfig->generator->paths->views) . strtolower($modelName) ;
 		
-		// create folder directory
-		Directory::createIfNotExists($folder, 0755, true);
-
-		$path   = $folder . '/edit.blade.php';
-
-		// Store in cache
-		if ($fileToCompile->cached)
-		{
-			File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-		else
-		{
-			File::put(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
-			File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Add fields to the edit view.
-	 *
-	 * @param $modelData
-	 *
-	 * @return $this
-	 */
-	private function addFields($modelData)
-	{
-		$fields = '';
-		$firstIteration = true;
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($firstIteration)
-			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
-			}
-		}
-
-		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the prefix.
-	 *
-	 * @param $prefix
-	 *
-	 * @return $this
-	 */
-	private function replaceRoutePrefix($prefix)
-	{
-		$this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the primary key.
-	 *
-	 * @param $modelData
-	 */
-	private function replacePrimaryKey($modelData)
-	{
-		$primaryKey = 'id';
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($field->index == 'primary')
-			{
-				$primaryKey = $field->name;
-				break;
-			}
-		}
-
-		$this->stub = str_replace('{{primaryKey}}', $primaryKey, $this->stub);
-
-		return $this;
-	}
+        // create folder directory
+        Directory::createIfNotExists($folder, 0755, true);
+
+        $path   = $folder . '/edit.blade.php';
+
+        // Store in cache
+        if ($fileToCompile->cached)
+        {
+            File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+        }
+        else
+        {
+            File::put(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
+            File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+        }
+
+        return $path;
+    }
+
+    /**
+     * Add fields to the edit view.
+     *
+     * @param $modelData
+     *
+     * @return $this
+     */
+    private function addFields($modelData)
+    {
+        $fields = '';
+        $firstIteration = true;
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($firstIteration)
+            {
+                $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+            }
+        }
+
+        $this->stub = str_replace('{{fields}}', $fields, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the prefix.
+     *
+     * @param $prefix
+     *
+     * @return $this
+     */
+    private function replaceRoutePrefix($prefix)
+    {
+        $this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the primary key.
+     *
+     * @param $modelData
+     */
+    private function replacePrimaryKey($modelData)
+    {
+        $primaryKey = 'id';
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($field->index == 'primary')
+            {
+                $primaryKey = $field->name;
+                break;
+            }
+        }
+
+        $this->stub = str_replace('{{primaryKey}}', $primaryKey, $this->stub);
+
+        return $this;
+    }
 }
\ No newline at end of file

src/Scaffolder/Compilers/View/CreateViewCompiler.php

Indentation +95 added lines, -95 removed lines

@@ -11,112 +11,112 @@
 
 class CreateViewCompiler extends AbstractViewCompiler
 {
-	use InputTypeResolverTrait;
+    use InputTypeResolverTrait;
 
-	/**
-	 * Compiles the create view.
-	 *
-	 * @param      $stub
-	 * @param      $modelName
-	 * @param      $modelData
-	 * @param      $scaffolderConfig
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
-		{
-			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
-		{
-			$this->stub = $stub;
+    /**
+     * Compiles the create view.
+     *
+     * @param      $stub
+     * @param      $modelName
+     * @param      $modelData
+     * @param      $scaffolderConfig
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT)))
+        {
+            return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
+        }
+        else
+        {
+            $this->stub = $stub;
 
-			return $this->replaceClassName($modelName)
-				->replaceBreadcrumb($modelName)
-				->addFields($modelData)
-				->replaceRoutePrefix($scaffolderConfig->routing->prefix)
-				->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
-		}
-	}
+            return $this->replaceClassName($modelName)
+                ->replaceBreadcrumb($modelName)
+                ->addFields($modelData)
+                ->replaceRoutePrefix($scaffolderConfig->routing->prefix)
+                ->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
+        }
+    }
 
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param               $modelName
-	 * @param               $scaffolderConfig
-	 * @param               $compiled
-	 * @param FileToCompile $fileToCompile
-	 *
-	 * @return string
-	 */
-	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
-	{
-		$folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
+    /**
+     * Store the compiled stub.
+     *
+     * @param               $modelName
+     * @param               $scaffolderConfig
+     * @param               $compiled
+     * @param FileToCompile $fileToCompile
+     *
+     * @return string
+     */
+    protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
+    {
+        $folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
 		
-		// create folder directory
-		Directory::createIfNotExists($folder, 0755, true);
+        // create folder directory
+        Directory::createIfNotExists($folder, 0755, true);
 
-		$path = $folder  . '/create.blade.php';
+        $path = $folder  . '/create.blade.php';
 
-		// Store in cache
-		if ($fileToCompile->cached)
-		{
-			File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-		else
-		{
-			File::put(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
-			File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
+        // Store in cache
+        if ($fileToCompile->cached)
+        {
+            File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+        }
+        else
+        {
+            File::put(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
+            File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+        }
 
-		return $path;
-	}
+        return $path;
+    }
 
-	/**
-	 * Add fields to the create view.
-	 *
-	 * @param $modelData
-	 *
-	 * @return $this
-	 */
-	private function addFields($modelData)
-	{
-		$fields = '';
-		$firstIteration = true;
+    /**
+     * Add fields to the create view.
+     *
+     * @param $modelData
+     *
+     * @return $this
+     */
+    private function addFields($modelData)
+    {
+        $fields = '';
+        $firstIteration = true;
 
-		foreach ($modelData->fields as $field)
-		{
-			if ($firstIteration)
-			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
-			}
-		}
+        foreach ($modelData->fields as $field)
+        {
+            if ($firstIteration)
+            {
+                $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+            }
+        }
 
-		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
+        $this->stub = str_replace('{{fields}}', $fields, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Replace the prefix.
-	 *
-	 * @param $prefix
-	 *
-	 * @return $this
-	 */
-	private function replaceRoutePrefix($prefix)
-	{
-		$this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
+    /**
+     * Replace the prefix.
+     *
+     * @param $prefix
+     *
+     * @return $this
+     */
+    private function replaceRoutePrefix($prefix)
+    {
+        $this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 }
\ No newline at end of file

src/Scaffolder/Compilers/View/EditViewCompiler.php

Indentation +131 added lines, -131 removed lines

@@ -11,136 +11,136 @@
 
 class EditViewCompiler extends AbstractViewCompiler
 {
-	use InputTypeResolverTrait;
-
-	/**
-	 * Compiles the edit view.
-	 *
-	 * @param      $stub
-	 * @param      $modelName
-	 * @param      $modelData
-	 * @param      $scaffolderConfig
-	 * @param      $hash
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
-		{
-			return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
-		}
-		else
-		{
-			$this->stub = $stub;
-
-			return $this->replaceClassName($modelName)
-				->replaceBreadcrumb($modelName)
-				->addFields($modelData)
-				->replacePrimaryKey($modelData)
-				->replaceRoutePrefix($scaffolderConfig->routing->prefix)
-				->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
-		}
-	}
-
-	/**
-	 * Store the compiled stub.
-	 *
-	 * @param               $modelName
-	 * @param               $scaffolderConfig
-	 * @param               $compiled
-	 * @param FileToCompile $fileToCompile
-	 *
-	 * @return string
-	 */
-	protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
-	{
-		$folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
+    use InputTypeResolverTrait;
+
+    /**
+     * Compiles the edit view.
+     *
+     * @param      $stub
+     * @param      $modelName
+     * @param      $modelData
+     * @param      $scaffolderConfig
+     * @param      $hash
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT)))
+        {
+            return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
+        }
+        else
+        {
+            $this->stub = $stub;
+
+            return $this->replaceClassName($modelName)
+                ->replaceBreadcrumb($modelName)
+                ->addFields($modelData)
+                ->replacePrimaryKey($modelData)
+                ->replaceRoutePrefix($scaffolderConfig->routing->prefix)
+                ->store($modelName, $scaffolderConfig, $this->stub, new FileToCompile(false, $hash));
+        }
+    }
+
+    /**
+     * Store the compiled stub.
+     *
+     * @param               $modelName
+     * @param               $scaffolderConfig
+     * @param               $compiled
+     * @param FileToCompile $fileToCompile
+     *
+     * @return string
+     */
+    protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile)
+    {
+        $folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ;
 		
-		// create folder directory
-		Directory::createIfNotExists($folder, 0755, true);
-
-		$path   = $folder . '/edit.blade.php';
-
-		// Store in cache
-		if ($fileToCompile->cached)
-		{
-			File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-		else
-		{
-			File::put(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
-			File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Add fields to the edit view.
-	 *
-	 * @param $modelData
-	 *
-	 * @return $this
-	 */
-	private function addFields($modelData)
-	{
-		$fields = '';
-		$firstIteration = true;
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($firstIteration)
-			{
-				$fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
-				$firstIteration = false;
-			}
-			else
-			{
-				$fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
-			}
-		}
-
-		$this->stub = str_replace('{{fields}}', $fields, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the prefix.
-	 *
-	 * @param $prefix
-	 *
-	 * @return $this
-	 */
-	private function replaceRoutePrefix($prefix)
-	{
-		$this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
-
-		return $this;
-	}
-
-	/**
-	 * Replace the primary key.
-	 *
-	 * @param $modelData
-	 */
-	private function replacePrimaryKey($modelData)
-	{
-		$primaryKey = 'id';
-
-		foreach ($modelData->fields as $field)
-		{
-			if ($field->index == 'primary')
-			{
-				$primaryKey = $field->name;
-				break;
-			}
-		}
-
-		$this->stub = str_replace('{{primaryKey}}', $primaryKey, $this->stub);
-
-		return $this;
-	}
+        // create folder directory
+        Directory::createIfNotExists($folder, 0755, true);
+
+        $path   = $folder . '/edit.blade.php';
+
+        // Store in cache
+        if ($fileToCompile->cached)
+        {
+            File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+        }
+        else
+        {
+            File::put(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
+            File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path);
+        }
+
+        return $path;
+    }
+
+    /**
+     * Add fields to the edit view.
+     *
+     * @param $modelData
+     *
+     * @return $this
+     */
+    private function addFields($modelData)
+    {
+        $fields = '';
+        $firstIteration = true;
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($firstIteration)
+            {
+                $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name);
+                $firstIteration = false;
+            }
+            else
+            {
+                $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name);
+            }
+        }
+
+        $this->stub = str_replace('{{fields}}', $fields, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the prefix.
+     *
+     * @param $prefix
+     *
+     * @return $this
+     */
+    private function replaceRoutePrefix($prefix)
+    {
+        $this->stub = str_replace('{{route_prefix}}', $prefix, $this->stub);
+
+        return $this;
+    }
+
+    /**
+     * Replace the primary key.
+     *
+     * @param $modelData
+     */
+    private function replacePrimaryKey($modelData)
+    {
+        $primaryKey = 'id';
+
+        foreach ($modelData->fields as $field)
+        {
+            if ($field->index == 'primary')
+            {
+                $primaryKey = $field->name;
+                break;
+            }
+        }
+
+        $this->stub = str_replace('{{primaryKey}}', $primaryKey, $this->stub);
+
+        return $this;
+    }
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ListControllerCompiler.php

Indentation +61 added lines, -61 removed lines

@@ -10,82 +10,82 @@
 
 class ListControllerCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'list_controller_';
-	protected $stubFilename = 'ListController.js' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'list_controller_';
+    protected $stubFilename = 'ListController.js' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->replaceColumns()
-					->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->replaceColumns()
+                    ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 
-	/**
-	 * replace columns
-	 *
-	 * @return $this
-	 */
-	public function replaceColumns(){
+    /**
+     * replace columns
+     *
+     * @return $this
+     */
+    public function replaceColumns(){
 
-		$columns = $this->getGridColumns();
+        $columns = $this->getGridColumns();
 
-		$this->stub = str_replace('{{grid_columns}}',  join(",\n ", $columns) , $this->stub); 
+        $this->stub = str_replace('{{grid_columns}}',  join(",\n ", $columns) , $this->stub); 
 
-		return $this ;
+        return $this ;
 
-	}
+    }
 
-	public function getGridColumns(){
+    public function getGridColumns(){
 
-		$columns = [];
+        $columns = [];
 
-		foreach ($this->modelData->fields as $field)
-		{
-			array_push($columns,  "\t\t\t".sprintf('{ name: vm. $t("%s.columns.%s"), field: "%s%s" }',  $this->modelData->tableName, $field->name, $this->eagerTable, $field->name ) );
+        foreach ($this->modelData->fields as $field)
+        {
+            array_push($columns,  "\t\t\t".sprintf('{ name: vm. $t("%s.columns.%s"), field: "%s%s" }',  $this->modelData->tableName, $field->name, $this->eagerTable, $field->name ) );
 
-			// Check foreign key
-			if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
-			{
-				// search eager fields
-				$foreignModelData = $this->getModelData($field->foreignKey->table);
-				$foreignControllerCompiler = new ListControllerCompiler($this->scaffolderConfig, $foreignModelData);
-				$foreignControllerCompiler->setEagerTable($field->foreignKey->table);
-				$eagerColumns 	= $foreignControllerCompiler->getGridColumns();
+            // Check foreign key
+            if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
+            {
+                // search eager fields
+                $foreignModelData = $this->getModelData($field->foreignKey->table);
+                $foreignControllerCompiler = new ListControllerCompiler($this->scaffolderConfig, $foreignModelData);
+                $foreignControllerCompiler->setEagerTable($field->foreignKey->table);
+                $eagerColumns 	= $foreignControllerCompiler->getGridColumns();
 
-				$columns = array_merge($columns, $eagerColumns);
-			}
-		}
+                $columns = array_merge($columns, $eagerColumns);
+            }
+        }
 
-		return $columns; 
+        return $columns; 
 
-	}
+    }
 	
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_list.controller.js';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_list.controller.js';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ListTemplateCompiler.php

Indentation +166 added lines, -166 removed lines

@@ -13,201 +13,201 @@
 
 class ListTemplateCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'list_template_';
-	protected $stubFilename = 'ListTemplate.html' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'list_template_';
+    protected $stubFilename = 'ListTemplate.html' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->replaceInputFields()
-					->replaceBelongsToManyFields()
-					->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->replaceInputFields()
+                    ->replaceBelongsToManyFields()
+                    ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 
-	/**
-	 * Replace input fields
-	 *
-	 * @return $this
-	 */
-	private function replaceInputFields(){
+    /**
+     * Replace input fields
+     *
+     * @return $this
+     */
+    private function replaceInputFields(){
 
-		$inputFields = $this->getInputFields();
+        $inputFields = $this->getInputFields();
 
-		$this->stub = str_replace('{{columns_inputs}}', $inputFields, $this->stub);
+        $this->stub = str_replace('{{columns_inputs}}', $inputFields, $this->stub);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * get search conditions
-	 *
-	 * @return $this
-	 */
-	public function getInputFields(){
+    /**
+     * get search conditions
+     *
+     * @return $this
+     */
+    public function getInputFields(){
 
-		$inputFields = $eagerFields = '';
+        $inputFields = $eagerFields = '';
 
-		foreach ($this->modelData->fields as $field)
-		{
-			$fieldStub = $this->getInputStubByField($field);
+        foreach ($this->modelData->fields as $field)
+        {
+            $fieldStub = $this->getInputStubByField($field);
 
-			if($field->foreignKey){
-				$fieldStub 	= $this->replaceForeingStrings($field, $fieldStub) ;
-				$fieldStub = str_replace('{{foreign_model_name}}', strtolower(CamelCase::convertToCamelCase($field->foreignKey->table)), $fieldStub);
-			}
+            if($field->foreignKey){
+                $fieldStub 	= $this->replaceForeingStrings($field, $fieldStub) ;
+                $fieldStub = str_replace('{{foreign_model_name}}', strtolower(CamelCase::convertToCamelCase($field->foreignKey->table)), $fieldStub);
+            }
 
-			$inputFields .= $this->replaceFieldInput($field, $fieldStub) ;
+            $inputFields .= $this->replaceFieldInput($field, $fieldStub) ;
 
-			// Check foreign key
-			if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
-			{
-				// search eager fields
-				$foreignModelData = $this->getModelData($field->foreignKey->table);
-				$foreignControllerCompiler = new ListTemplateCompiler($this->scaffolderConfig, $foreignModelData);
-				$foreignControllerCompiler->setEagerTable($this->modelData->tableName);
-				$eagerFields 	.= $foreignControllerCompiler->getInputFields();
-			}
+            // Check foreign key
+            if ($field->foreignKey && isset($field->foreignKey->eager) && $field->foreignKey->eager)
+            {
+                // search eager fields
+                $foreignModelData = $this->getModelData($field->foreignKey->table);
+                $foreignControllerCompiler = new ListTemplateCompiler($this->scaffolderConfig, $foreignModelData);
+                $foreignControllerCompiler->setEagerTable($this->modelData->tableName);
+                $eagerFields 	.= $foreignControllerCompiler->getInputFields();
+            }
 
-		}
+        }
 
-		// replace table name
-		$inputFields = str_replace('{{table_name}}', $this->modelData->tableName, $inputFields);
+        // replace table name
+        $inputFields = str_replace('{{table_name}}', $this->modelData->tableName, $inputFields);
 		
-		$this->stub = str_replace('{{eager_objects_inputs}}', $eagerFields, $this->stub); 
-
-		return $inputFields ;
-
-	}
-
-	/**
-	 * replace field stub with fields and validations
-	 *
-	 * @param string $field
-	 * @param string $fieldStub
-	 *
-	 * @return $this
-	 */
-	protected function replaceFieldInput($field, $fieldStub){
-		$fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
-		$fieldStub = $this->replaceFieldValidations($field, $fieldStub) ;
-
-		return $fieldStub ;
-	}
-
-	/**
-	 * replace field stub with fields and validations
-	 *
-	 * @param string $field
-	 * @param string $fieldStub
-	 *
-	 * @return $this
-	 */
-	protected function replaceFieldValidations($field, $fieldStub){
-		$fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
+        $this->stub = str_replace('{{eager_objects_inputs}}', $eagerFields, $this->stub); 
+
+        return $inputFields ;
+
+    }
+
+    /**
+     * replace field stub with fields and validations
+     *
+     * @param string $field
+     * @param string $fieldStub
+     *
+     * @return $this
+     */
+    protected function replaceFieldInput($field, $fieldStub){
+        $fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
+        $fieldStub = $this->replaceFieldValidations($field, $fieldStub) ;
+
+        return $fieldStub ;
+    }
+
+    /**
+     * replace field stub with fields and validations
+     *
+     * @param string $field
+     * @param string $fieldStub
+     *
+     * @return $this
+     */
+    protected function replaceFieldValidations($field, $fieldStub){
+        $fieldStub = $this->replaceFieldStrings($field, $fieldStub) ;
 		
-		$validationsConverted = Validator::convertValidations($field->validations, true);
+        $validationsConverted = Validator::convertValidations($field->validations, true);
 
-		$inputValidations = '' ; 
+        $inputValidations = '' ; 
 
-		foreach ($validationsConverted as $attribute => $value) {
-			if($value)
-				$inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
-			else
-				$inputValidations .=  ' '.$attribute  ; 
-		}
+        foreach ($validationsConverted as $attribute => $value) {
+            if($value)
+                $inputValidations .=  ' '.$attribute.'="'. $value.'"' ;
+            else
+                $inputValidations .=  ' '.$attribute  ; 
+        }
 
-		$fieldStub = str_replace('{{field_validation}}', $inputValidations, $fieldStub);
+        $fieldStub = str_replace('{{field_validation}}', $inputValidations, $fieldStub);
 
-		return $fieldStub ;
-	}
+        return $fieldStub ;
+    }
 
-	/**
-	 * Replace belongs to many fields
-	 *
-	 * @return $this
-	 */
-	protected function replaceBelongsToManyFields() {
+    /**
+     * Replace belongs to many fields
+     *
+     * @return $this
+     */
+    protected function replaceBelongsToManyFields() {
 		
-		$belongToManyFields = '';
+        $belongToManyFields = '';
 		
-		foreach ($this->modelData->reverseRelationships as $relationship)
-		{
-			if ($relationship->type == "belongsToMany") {
-				$fieldStub = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($relationship->ui). '.html');
-
-				$fieldStub = str_replace('{{related_table}}',CamelCase::convertToCamelCase($relationship->relatedTable), $fieldStub);
-				$fieldStub = str_replace('{{related_table_lw}}', strtolower(CamelCase::convertToCamelCase($relationship->relatedTable)), $fieldStub);
-				$fieldStub = str_replace('{{table_name}}', $this->modelData->tableName, $fieldStub);
-				$fieldStub = str_replace('{{related_table_lw_pl}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $fieldStub);
+        foreach ($this->modelData->reverseRelationships as $relationship)
+        {
+            if ($relationship->type == "belongsToMany") {
+                $fieldStub = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($relationship->ui). '.html');
+
+                $fieldStub = str_replace('{{related_table}}',CamelCase::convertToCamelCase($relationship->relatedTable), $fieldStub);
+                $fieldStub = str_replace('{{related_table_lw}}', strtolower(CamelCase::convertToCamelCase($relationship->relatedTable)), $fieldStub);
+                $fieldStub = str_replace('{{table_name}}', $this->modelData->tableName, $fieldStub);
+                $fieldStub = str_replace('{{related_table_lw_pl}}', CamelCase::pluralize(strtolower($relationship->relatedTable)), $fieldStub);
 				
-				$belongToManyFields .= $fieldStub;	
-			}
-		}
+                $belongToManyFields .= $fieldStub;	
+            }
+        }
 
-		$this->stub = str_replace('{{belongs_to_many_inputs}}', $belongToManyFields, $this->stub); 
+        $this->stub = str_replace('{{belongs_to_many_inputs}}', $belongToManyFields, $this->stub); 
 
-		return $this;
-	}
+        return $this;
+    }
 
 	
-	/**
-	 * get input field stub by ui type
-	 *
-	 * @param string $field
-	 *
-	 * @return $this
-	 */
-	private $inputStub = [];
-	private function getInputStubByField($field){
+    /**
+     * get input field stub by ui type
+     *
+     * @param string $field
+     *
+     * @return $this
+     */
+    private $inputStub = [];
+    private function getInputStubByField($field){
 		
-		if($field->index == 'primary'){
-			$uiType = 'primary' ;
-		}
-		elseif(isset($field->foreignKey) && $field->foreignKey){
-			if(isset($field->foreignKey->eager) && $field->foreignKey->eager)
-				$uiType = 'foreign_eager' ;
-			else 
-				$uiType = $field->type->ui ;
-		}
-		else {
-			$uiType = $field->type->ui ;
-		}
-
-		if(array_key_exists($uiType, $this->inputStub)){
-			return $this->inputStub[$uiType];
-		}
-		else {
-			$this->inputStub[$uiType] = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($uiType). '.html');
-
-			return $this->inputStub[$uiType];
-		}
-	}
+        if($field->index == 'primary'){
+            $uiType = 'primary' ;
+        }
+        elseif(isset($field->foreignKey) && $field->foreignKey){
+            if(isset($field->foreignKey->eager) && $field->foreignKey->eager)
+                $uiType = 'foreign_eager' ;
+            else 
+                $uiType = $field->type->ui ;
+        }
+        else {
+            $uiType = $field->type->ui ;
+        }
+
+        if(array_key_exists($uiType, $this->inputStub)){
+            return $this->inputStub[$uiType];
+        }
+        else {
+            $this->inputStub[$uiType] = File::get($this->stubsDirectory . 'List/'. CamelCase::convertToCamelCase($uiType). '.html');
+
+            return $this->inputStub[$uiType];
+        }
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_list.html';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_list.html';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ListDetailCompiler.php

Indentation +32 added lines, -32 removed lines

@@ -10,40 +10,40 @@
 
 class ListDetailCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'list_detail_';
-	protected $stubFilename = 'DetailDialog.html' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'list_detail_';
+    protected $stubFilename = 'DetailDialog.html' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .$this->modelData->tableName . '_details.dialog.html';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/list/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .$this->modelData->tableName . '_details.dialog.html';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/IndexApiCompiler.php

Indentation +45 added lines, -45 removed lines

@@ -10,56 +10,56 @@
 
 class IndexApiCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'index_api_';
-	protected $stubFilename = 'IndexApi.js' ;
+    protected $cachePrefix 	= 'index_api_';
+    protected $stubFilename = 'IndexApi.js' ;
 
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
 
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
-		return $this->store(new FileToCompile(false, $this->cachePrefix));
-	}
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
+        return $this->store(new FileToCompile(false, $this->cachePrefix));
+    }
 
-	/**
-	 * Compiles .
-	 *
-	 * @param null $extra
-	 *
-	 * @return string
-	 */
-	public function compile($extra = null)
-	{
-		if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . self::CACHE_EXT)))
-		{
-			return $this->store(new FileToCompile(true, $this->cachePrefix));
-		}
-		else
-		{
+    /**
+     * Compiles .
+     *
+     * @param null $extra
+     *
+     * @return string
+     */
+    public function compile($extra = null)
+    {
+        if (File::exists(base_path('scaffolder-config/cache/' . $this->cachePrefix  . self::CACHE_EXT)))
+        {
+            return $this->store(new FileToCompile(true, $this->cachePrefix));
+        }
+        else
+        {
 
-			return $this->replaceAndStore();
-		}
-	}
+            return $this->replaceAndStore();
+        }
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->index);
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->index);
 
-		return $folder  . 'index.api.js';
-	}
+        return $folder  . 'index.api.js';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/TranslateCompiler.php

Indentation +65 added lines, -65 removed lines

@@ -13,73 +13,73 @@
 
 class TranslateCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'translate_';
-	protected $stubFilename = 'Translate.js' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
+    protected $cachePrefix 	= 'translate_';
+    protected $stubFilename = 'Translate.js' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
 		
-		return $this->replaceColumns()
-					->replaceArea()
-					->store(new FileToCompile(false, $this->modelData->modelHash));
+        return $this->replaceColumns()
+                    ->replaceArea()
+                    ->store(new FileToCompile(false, $this->modelData->modelHash));
 		
-	}
-
-	/**
-	 * replace columns
-	 *
-	 * @return $this
-	 */
-	public function replaceArea(){
-		$this->stub = str_replace('{{singular}}', ucwords($this->modelData->tableName), $this->stub); 
-		$this->stub = str_replace('{{plural}}', ucwords(CamelCase::pluralize($this->modelData->tableName)), $this->stub); 
-		return $this;
-	}
-
-	/**
-	 * replace columns
-	 *
-	 * @return $this
-	 */
-	public function replaceColumns(){
-
-		$columns = [];
-
-		foreach ($this->modelData->fields as $field)
-		{
-			array_push($columns,  "\t\t".sprintf('"%s" : "%s"',  $field->name,  CamelCase::convertToCamelCase($field->name) ));
-		}
-
-		$this->stub = str_replace('{{columns}}', join(",\n", $columns), $this->stub); 
-
-		return $this ;
-
-	}
+    }
+
+    /**
+     * replace columns
+     *
+     * @return $this
+     */
+    public function replaceArea(){
+        $this->stub = str_replace('{{singular}}', ucwords($this->modelData->tableName), $this->stub); 
+        $this->stub = str_replace('{{plural}}', ucwords(CamelCase::pluralize($this->modelData->tableName)), $this->stub); 
+        return $this;
+    }
+
+    /**
+     * replace columns
+     *
+     * @return $this
+     */
+    public function replaceColumns(){
+
+        $columns = [];
+
+        foreach ($this->modelData->fields as $field)
+        {
+            array_push($columns,  "\t\t".sprintf('"%s" : "%s"',  $field->name,  CamelCase::convertToCamelCase($field->name) ));
+        }
+
+        $this->stub = str_replace('{{columns}}', join(",\n", $columns), $this->stub); 
+
+        return $this ;
+
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/i18n/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder . 'en.json';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/i18n/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder . 'en.json';
+    }
 
 }
\ No newline at end of file

src/Scaffolder/Compilers/AngularJs/ResourceCompiler.php

Indentation +32 added lines, -32 removed lines

@@ -10,38 +10,38 @@
 
 class ResourceCompiler extends AbstractCompiler
 {
-	protected $cachePrefix 	= 'resource_';
-	protected $stubFilename = 'Resource.js' ;
-
-	public function __construct($scaffolderConfig, $modelData = null)
-	{
-		$this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
-		parent::__construct($scaffolderConfig, $modelData);
-	}
-
-	/**
-	 * Replace and store the Stub.
-	 *
-	 * @return string
-	 */
-	public function replaceAndStore()
-	{
-		return $this->store(new FileToCompile(false, $this->modelData->modelHash));
-	}
+    protected $cachePrefix 	= 'resource_';
+    protected $stubFilename = 'Resource.js' ;
+
+    public function __construct($scaffolderConfig, $modelData = null)
+    {
+        $this->stubsDirectory = __DIR__ . '/../../../../stubs/AngularJs/';
+        parent::__construct($scaffolderConfig, $modelData);
+    }
+
+    /**
+     * Replace and store the Stub.
+     *
+     * @return string
+     */
+    public function replaceAndStore()
+    {
+        return $this->store(new FileToCompile(false, $this->modelData->modelHash));
+    }
 	
-	/**
-	 * Get output filename
-	 *
-	 *
-	 * @return $this
-	 */
-	protected function getOutputFilename()
-	{
-		$folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/' ;
-
-		Directory::createIfNotExists($folder, 0755, true);
-
-		return $folder .  $this->modelData->tableName . '.resource.js';
-	}
+    /**
+     * Get output filename
+     *
+     *
+     * @return $this
+     */
+    protected function getOutputFilename()
+    {
+        $folder = PathParser::parse($this->scaffolderConfig->generator->paths->pages).$this->modelData->tableName.'/' ;
+
+        Directory::createIfNotExists($folder, 0755, true);
+
+        return $folder .  $this->modelData->tableName . '.resource.js';
+    }
 
 }
\ No newline at end of file