|
@@ -903,6 +903,11 @@ class GenController {
|
|
}
|
|
}
|
|
$tokens = explode(":", $tokens[0]);
|
|
$tokens = explode(":", $tokens[0]);
|
|
$name = $tokens[0];
|
|
$name = $tokens[0];
|
|
|
|
+ $required = false;
|
|
|
|
+ if($name[strlen($name) - 1] === '*') { // required field?
|
|
|
|
+ $required = true;
|
|
|
|
+ $name = substr($name, 0, strlen($name) - 1);
|
|
|
|
+ }
|
|
$display = $name;
|
|
$display = $name;
|
|
$dotPos = strpos($name, ".");
|
|
$dotPos = strpos($name, ".");
|
|
if($dotPos !== FALSE) {
|
|
if($dotPos !== FALSE) {
|
|
@@ -927,12 +932,15 @@ class GenController {
|
|
}
|
|
}
|
|
if($type !== 'hidden' && $type !== 'bool') {
|
|
if($type !== 'hidden' && $type !== 'bool') {
|
|
$code[] = "<div class='form-group mb-3'>";
|
|
$code[] = "<div class='form-group mb-3'>";
|
|
- $code[] = "<label class='control-label'>{$this->camelToTitleCase($this->snakeToTitleCase($display))}</label>";
|
|
|
|
|
|
+ $code[] = "<label class='control-label'>{$this->camelToTitleCase($this->snakeToTitleCase($display))} " .
|
|
|
|
+ ($required ? "*" : "") .
|
|
|
|
+ "</label>";
|
|
}
|
|
}
|
|
$valueLine = "value='{{ old('$name') ? old('$name') : " . ($default ? "\$record->$default" : '\'\'') . " }}' ";
|
|
$valueLine = "value='{{ old('$name') ? old('$name') : " . ($default ? "\$record->$default" : '\'\'') . " }}' ";
|
|
switch ($type) {
|
|
switch ($type) {
|
|
case "select":
|
|
case "select":
|
|
$code[] = "<select class='form-control' name='$name' " . $valueLine .
|
|
$code[] = "<select class='form-control' name='$name' " . $valueLine .
|
|
|
|
+ ($required ? "required" : "") .
|
|
">";
|
|
">";
|
|
$code[] = "<option value=''>-- Select --</option>";
|
|
$code[] = "<option value=''>-- Select --</option>";
|
|
foreach ($options as $o) {
|
|
foreach ($options as $o) {
|
|
@@ -944,6 +952,7 @@ class GenController {
|
|
break;
|
|
break;
|
|
case "record":
|
|
case "record":
|
|
$code[] = "<select class='form-control' name='$name' " . $valueLine .
|
|
$code[] = "<select class='form-control' name='$name' " . $valueLine .
|
|
|
|
+ ($required ? "required" : "") .
|
|
">";
|
|
">";
|
|
$code[] = "<option value=''>-- Select --</option>";
|
|
$code[] = "<option value=''>-- Select --</option>";
|
|
$code[] = "<?php \$dbOptions = \Illuminate\Support\Facades\DB::table('{$options['table']}')->get(); ?>";
|
|
$code[] = "<?php \$dbOptions = \Illuminate\Support\Facades\DB::table('{$options['table']}')->get(); ?>";
|
|
@@ -956,12 +965,17 @@ class GenController {
|
|
break;
|
|
break;
|
|
case "bool":
|
|
case "bool":
|
|
$code[] = "<div class='form-group mb-3'>";
|
|
$code[] = "<div class='form-group mb-3'>";
|
|
- $code[] = "<label class='control-label'>{$this->camelToTitleCase($this->snakeToTitleCase($display))} ";
|
|
|
|
- $code[] = "<input class='ml-2' type='checkbox' name='$name'>";
|
|
|
|
|
|
+ $code[] = "<label class='control-label'>{$this->camelToTitleCase($this->snakeToTitleCase($display))} " .
|
|
|
|
+ ($required ? "*" : "");
|
|
|
|
+ $code[] = "<input class='ml-2' type='checkbox' name='$name' " .
|
|
|
|
+ ($required ? "required" : "") .
|
|
|
|
+ ">";
|
|
$code[] = "</label>";
|
|
$code[] = "</label>";
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
- $code[] = "<input class='form-control' type='$type' name='$name' " . $valueLine . ">";
|
|
|
|
|
|
+ $code[] = "<input class='form-control' type='$type' name='$name' " . $valueLine .
|
|
|
|
+ ($required ? "required" : "") .
|
|
|
|
+ ">";
|
|
}
|
|
}
|
|
if($type !== 'hidden') {
|
|
if($type !== 'hidden') {
|
|
$code[] = "</div>";
|
|
$code[] = "</div>";
|