Fix the destenation location of the form request.

Author: MikeAlhayek

src/Commands/CreateControllerCommand.php

@@ -428,7 +428,13 @@ protected function getUseClassCommand($name)
      */
     protected function getRelationAccessor(ForeignRelationship $collection)
     {
-        return sprintf('$%s = %s::all();', $collection->getCollectionName(), $collection->getForeignModel());
+
+        return sprintf('$%s = %s::pluck(\'%s\',\'%s\')->all();', 
+                            $collection->getCollectionName(), 
+                            $collection->getForeignModel(), 
+                            $collection->getField(),
+                            $collection->getPrimaryKeyForForeignModel()
+                     );
     }
 
     /**

src/Commands/CreateFormRequestCommand.php

@@ -44,7 +44,7 @@ public function handle()
 
         $stub = $this->getStubContent('form-request', $input->template);
         $fields = $this->getFields($input->fields, 'crestapps', $input->fieldsFile);
-        $destenationFile = Config::getRequestsPath() . $input->fileName . '.php';
+        $destenationFile = $this->getDestenationFile($input->fileName);
         $validations = $this->getValidationRules($fields);
 
         if ($this->alreadyExists($destenationFile)) {
@@ -60,6 +60,18 @@ public function handle()
              ->info('A new form-request have been crafted!');
     }
 
+    /**
+     * Gets the destenation's fullname
+     *
+     * @return string
+     */
+    protected function getDestenationFile($name)
+    {
+        $path = base_path($this->getAppNamespace() . Config::getRequestsPath());
+
+        return Helpers::postFixWith($path, '/') . $name . '.php';
+    }
+
     /**
      * Gets a clean user inputs.
      *

src/HtmlGenerators/LaravelCollectiveHtml.php

@@ -4,6 +4,7 @@
 
 use CrestApps\CodeGenerator\HtmlGenerators\HtmlGeneratorBase;
 use CrestApps\CodeGenerator\Models\Label;
+use CrestApps\CodeGenerator\Models\Field;
 
 class LaravelCollectiveHtml extends HtmlGeneratorBase
 {
@@ -112,7 +113,7 @@ protected function getFieldMultiple($isMulti)
      *
      * @return string
      */
-    protected function getFieldItems(field $field)
+    protected function getFieldItems(Field $field)
     {
         if ($field->hasForeignRelation() && $field->isOnFormView) {
             return sprintf('$%s', $field->getForeignRelation()->getCollectionName());

src/HtmlGenerators/StandardHtml.php

@@ -114,7 +114,7 @@ protected function getFieldMultiple($isMulti)
      *
      * @return string
      */
-    protected function getFieldItems(field $field)
+    protected function getFieldItems(Field $field)
     {
         if ($field->hasForeignRelation() && $field->isOnFormView) {
             return sprintf('$%s', $field->getForeignRelation()->getCollectionName());
@@ -187,7 +187,7 @@ protected function getMultipleCheckedItem($value, $name)
      */
     protected function getMultipleSelectedValue($name, $valueAccessor)
     {
-        return sprintf(" {{ %s ? 'selected' : '' }}", $this->getMultipleRawOptionValue($name, $valueAccessor));
+        return sprintf(" {{ %s ? 'selected' : '' }}", $name);
     }
 
     /**
@@ -200,7 +200,7 @@ protected function getMultipleSelectedValue($name, $valueAccessor)
      */
     protected function getSelectedValue($name, $valueAccessor)
     {
-        return sprintf(" {{ %s == %s ? 'selected' : '' }}", $this->getRawOptionValue($name, ''), $valueAccessor);
+        return sprintf(" {{ %s == %s ? 'selected' : '' }}", $this->getRawOptionValue($name, ''), '$key');
     }
 
     /**

src/Support/FieldOptimizer.php

@@ -75,7 +75,8 @@ public function optimize()
              ->optimizeBoolean()
              ->optimizePrimaryKey()
              ->optimizeValidations()
-             ->optimizeHtmlType();
+             ->optimizeHtmlType()
+             ->addPlaceHolder();
 
         return $this;
     }
@@ -124,6 +125,20 @@ protected function optimizeDateFields()
         return $this;
     }
 
+    /**
+     * If the field has a relation and the placeholder is missing, add generic one.
+     *
+     * @return $this
+    */
+    protected function addPlaceHolder()
+    {
+        if(empty($this->field->placeHolder) && $this->field->hasForeignRelation()) {
+            $this->field->placeHolder = 'Please select a ' . $this->field->getForeignRelation()->name;
+        }
+
+        return $this;
+    }
+
     /**
      * If the field is not visible on the form view, clear the validation.
      *

templates/default-collective/create.blade.stub

@@ -7,7 +7,7 @@
         <div class="panel-heading clearfix">
 
             <div class="pull-left">
-                <h3 class="mt-2 mb-0">Create New [% model_name_class %]</h3>
+                <h4 class="mt-5 mb-5">Create New [% model_name_class %]</h4>
             </div>
 
             <div class="btn-group btn-group-sm pull-right" role="group">

templates/default-collective/edit.blade.stub

@@ -7,7 +7,7 @@
         <div class="panel-heading clearfix">
 
             <div class="pull-left">
-                <h3 class="mt-2 mb-0">{{ !empty([% model_header %]) ? [% model_header %] : '[% model_name %]'}}</h3>
+                <h4 class="mt-5 mb-5">{{ !empty([% model_header %]) ? [% model_header %] : '[% model_name %]' }}</h4>
             </div>
 
             <div class="btn-group btn-group-sm pull-right" role="group">

templates/default-collective/form-file-field.blade.stub

@@ -1,3 +1,3 @@
         <label class="btn btn-default">
-        	Browse <input type="file" name="[% file_name %]" id="[% file_name %]" class="hidden[% class_class %]">
+        	Browse <input type="file" name="[% field_name %]" id="[% field_name %]" class="hidden[% class_class %]">
         </label>

templates/default-collective/form-helper-field.blade.stub

@@ -1 +1 @@
-        {!! $errors->first('[% file_name %]', '<p class="help-block">:message</p>') !!}
+        {!! $errors->first('[% field_name %]', '<p class="help-block">:message</p>') !!}

templates/default-collective/form-input-field.blade.stub

@@ -1 +1 @@
-        {!! Form::[% field_type %]('[% field_name %]',[% field_value %], ['class' => 'form-control[% css_class %]',[% min_length %][% max_length %][% min_value %][% max_value %][% required_field %][% placeholder %][% step %]) !!}
+        {!! Form::[% field_type %]('[% field_name %]',[% field_value %], ['class' => 'form-control[% css_class %]',[% min_length %][% max_length %][% min_value %][% max_value %][% required_field %][% placeholder %][% step %] ]) !!}