Types refactor and localization

Menu
TypeGroups Localization and refactor
2021-06-03 22:15:32 +02:00 · 2021-06-03 20:46:54 +02:00 · 2021-06-03 20:44:31 +02:00 · 2021-06-03 20:25:24 +02:00 · 2021-06-03 19:57:37 +02:00 · 2021-06-03 18:34:22 +02:00
64 changed files with 1421 additions and 598 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,29 @@
-# TODO
+# Relations

- Type Creat Form localization
- Remove design phase databaase connection in Schema and Model
+## AircraftManufacturers
+
+- HasMany AircraftType
+
+## AircraftTypes
+
+- BelongsTo AircraftManufacturers
+- **TODO** BelongsTo Typeratings (External DB)
+- HasMany Aircrafts
+
+## Aircrafts
+
+- BelongsTo AircraftTypes
+- BelongsToMany AircraftTypeGroups
+- **TODO** BelongsTo Airports (External DB, Multiple)
+
+## AircraftTypeGroups
+
+- BelongsToMany AircraftTypes
+
+---
+
+# Todo
+
+## General
+
+- Remove design phase database connection in Schema and Model
--- a/controllers/AircraftTypes.php
+++ b/controllers/AircraftTypes.php
@ -3,7 +3,7 @@
 use Backend\Classes\Controller;
 use BackendMenu;

-class AircraftTypes extends Controller
+class Aircraft extends Controller
 {
  public $implement = ['Backend\Behaviors\ListController', 'Backend\Behaviors\FormController'];

--- a/controllers/AircraftManufacturers.php
+++ b/controllers/AircraftManufacturers.php
@ -3,7 +3,7 @@
 use Backend\Classes\Controller;
 use BackendMenu;

-class AircraftManufacturers extends Controller
+class AircraftManufacturer extends Controller
 {
  public $implement = ['Backend\Behaviors\ListController', 'Backend\Behaviors\FormController'];

--- a/controllers/AircraftType.php
+++ b/controllers/AircraftType.php
@ -0,0 +1,17 @@
+<?php namespace GermanAirlinesVa\Fleet\Controllers;
+
+use Backend\Classes\Controller;
+use BackendMenu;
+
+class AircraftType extends Controller
+{
+  public $implement = ['Backend\Behaviors\ListController', 'Backend\Behaviors\FormController'];
+
+  public $listConfig = 'config_list.yaml';
+  public $formConfig = 'config_form.yaml';
+
+  public function __construct()
+  {
+    parent::__construct();
+  }
+}
--- a/controllers/AircraftTypeGroup.php
+++ b/controllers/AircraftTypeGroup.php
@ -0,0 +1,17 @@
+<?php namespace GermanAirlinesVa\Fleet\Controllers;
+
+use Backend\Classes\Controller;
+use BackendMenu;
+
+class AircraftTypeGroup extends Controller
+{
+  public $implement = ['Backend\Behaviors\ListController', 'Backend\Behaviors\FormController'];
+
+  public $listConfig = 'config_list.yaml';
+  public $formConfig = 'config_form.yaml';
+
+  public function __construct()
+  {
+    parent::__construct();
+  }
+}
--- a/controllers/aircraft/_list_toolbar.htm
+++ b/controllers/aircraft/_list_toolbar.htm
@ -0,0 +1,21 @@
+<div data-control="toolbar">
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircraft/create') ?>" class="btn btn-primary oc-icon-plus"
+    ><?= e(trans('backend::lang.form.create')) ?></a
+  >
+  <button
+    class="btn btn-default oc-icon-trash-o"
+    disabled="disabled"
+    onclick="$(this).data('request-data', {
+            checked: $('.control-list').listWidget('getChecked')
+        })"
+    data-request="onDelete"
+    data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
+    data-trigger-action="enable"
+    data-trigger=".control-list input[type=checkbox]"
+    data-trigger-condition="checked"
+    data-request-success="$(this).prop('disabled', true)"
+    data-stripe-load-indicator
+  >
+    <?= e(trans('backend::lang.list.delete_selected')) ?>
+  </button>
+</div>
--- a/controllers/aircraft/config_form.yaml
+++ b/controllers/aircraft/config_form.yaml
@ -0,0 +1,10 @@
+name: Aircraft
+form: $/germanairlinesva/fleet/models/aircraft/fields.yaml
+modelClass: GermanAirlinesVa\Fleet\Models\Aircraft
+defaultRedirect: germanairlinesva/fleet/aircraft
+create:
+  redirect: 'germanairlinesva/fleet/aircraft/update/:id'
+  redirectClose: germanairlinesva/fleet/aircraft
+update:
+  redirect: germanairlinesva/fleet/aircraft
+  redirectClose: germanairlinesva/fleet/aircraft
--- a/controllers/aircraft/config_list.yaml
+++ b/controllers/aircraft/config_list.yaml
@ -0,0 +1,12 @@
+list: $/germanairlinesva/fleet/models/aircraft/columns.yaml
+modelClass: GermanAirlinesVa\Fleet\Models\Aircraft
+title: Aircrafts
+noRecordsMessage: 'backend::lang.list.no_records'
+showSetup: true
+showCheckboxes: true
+recordsPerPage: 20
+toolbar:
+  buttons: list_toolbar
+  search:
+    prompt: 'backend::lang.list.search_prompt'
+recordUrl: 'germanairlinesva/fleet/aircraft/update/:id'
--- a/controllers/aircraft/create.htm
+++ b/controllers/aircraft/create.htm
@ -0,0 +1,52 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafts') ?>">Aircrafts</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<?= Form::open(['class' =>
+'layout']) ?>
+
+<div class="layout-row"><?= $this->formRender() ?></div>
+
+<div class="form-buttons">
+  <div class="loading-indicator-container">
+    <button
+      type="submit"
+      data-request="onSave"
+      data-hotkey="ctrl+s, cmd+s"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-primary"
+    >
+      <?= e(trans('backend::lang.form.create')) ?>
+    </button>
+    <button
+      type="button"
+      data-request="onSave"
+      data-request-data="close:1"
+      data-hotkey="ctrl+enter, cmd+enter"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-default"
+    >
+      <?= e(trans('backend::lang.form.create_and_close')) ?>
+    </button>
+    <span class="btn-text">
+      <?= e(trans('backend::lang.form.or')) ?>
+      <a href="<?= Backend::url('germanairlinesva/fleet/aircraft') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
+    </span>
+  </div>
+</div>
+
+<?= Form::close() ?>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircraft') ?>" class="btn btn-default"
+    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
+  >
+</p>
+<?php endif ?>
--- a/controllers/aircraftmanufacturers/index.htm
+++ b/controllers/aircraftmanufacturers/index.htm
--- a/controllers/aircraft/preview.htm
+++ b/controllers/aircraft/preview.htm
@ -0,0 +1,20 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircraft') ?>">Aircrafts</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<div class="form-preview"><?= $this->formRenderPreview() ?></div>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e($this->fatalError) ?></p>
+<?php endif ?>
+
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircraft') ?>" class="btn btn-default oc-icon-chevron-left">
+    <?= e(trans('backend::lang.form.return_to_list')) ?>
+  </a>
+</p>
--- a/controllers/aircraft/update.htm
+++ b/controllers/aircraft/update.htm
@ -0,0 +1,60 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircraft') ?>">Aircrafts</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<?= Form::open(['class' =>
+'layout']) ?>
+
+<div class="layout-row"><?= $this->formRender() ?></div>
+
+<div class="form-buttons">
+  <div class="loading-indicator-container">
+    <button
+      type="submit"
+      data-request="onSave"
+      data-request-data="redirect:0"
+      data-hotkey="ctrl+s, cmd+s"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-primary"
+    >
+      <?= e(trans('backend::lang.form.save')) ?>
+    </button>
+    <button
+      type="button"
+      data-request="onSave"
+      data-request-data="close:1"
+      data-hotkey="ctrl+enter, cmd+enter"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-default"
+    >
+      <?= e(trans('backend::lang.form.save_and_close')) ?>
+    </button>
+    <button
+      type="button"
+      class="oc-icon-trash-o btn-icon danger pull-right"
+      data-request="onDelete"
+      data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
+      data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>"
+    ></button>
+
+    <span class="btn-text">
+      <?= e(trans('backend::lang.form.or')) ?>
+      <a href="<?= Backend::url('germanairlinesva/fleet/aircraft') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
+    </span>
+  </div>
+</div>
+<?= Form::close() ?>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircraft') ?>" class="btn btn-default"
+    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
+  >
+</p>
+<?php endif ?>
--- a/controllers/aircraftmanufacturer/_list_toolbar.htm
+++ b/controllers/aircraftmanufacturer/_list_toolbar.htm
@ -0,0 +1,23 @@
+<div data-control="toolbar">
+  <a
+    href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer/create') ?>"
+    class="btn btn-primary oc-icon-plus"
+    ><?= e(trans('backend::lang.form.create')) ?></a
+  >
+  <button
+    class="btn btn-default oc-icon-trash-o"
+    disabled="disabled"
+    onclick="$(this).data('request-data', {
+            checked: $('.control-list').listWidget('getChecked')
+        })"
+    data-request="onDelete"
+    data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
+    data-trigger-action="enable"
+    data-trigger=".control-list input[type=checkbox]"
+    data-trigger-condition="checked"
+    data-request-success="$(this).prop('disabled', true)"
+    data-stripe-load-indicator
+  >
+    <?= e(trans('backend::lang.list.delete_selected')) ?>
+  </button>
+</div>
--- a/controllers/aircraftmanufacturer/config_form.yaml
+++ b/controllers/aircraftmanufacturer/config_form.yaml
@ -0,0 +1,10 @@
+name: Aircraft Manufacturer
+form: $/germanairlinesva/fleet/models/aircraftmanufacturer/fields.yaml
+modelClass: GermanAirlinesVa\Fleet\Models\AircraftManufacturer
+defaultRedirect: germanairlinesva/fleet/aircraftmanufacturer
+create:
+  redirect: 'germanairlinesva/fleet/aircraftmanufacturer/update/:id'
+  redirectClose: germanairlinesva/fleet/aircraftmanufacturer
+update:
+  redirect: germanairlinesva/fleet/aircraftmanufacturer
+  redirectClose: germanairlinesva/fleet/aircraftmanufacturer
--- a/controllers/aircraftmanufacturers/config_list.yaml
+++ b/controllers/aircraftmanufacturers/config_list.yaml
@ -1,6 +1,6 @@
 list: $/germanairlinesva/fleet/models/aircraftmanufacturer/columns.yaml
 modelClass: GermanAirlinesVa\Fleet\Models\AircraftManufacturer
-title: AircraftManufacturers
+title: Aircraft Manufacturers
 noRecordsMessage: 'backend::lang.list.no_records'
 showSetup: true
 showCheckboxes: true
@ -9,4 +9,4 @@ toolbar:
  buttons: list_toolbar
  search:
    prompt: 'backend::lang.list.search_prompt'
-recordUrl: 'germanairlinesva/fleet/aircraftmanufacturers/update/:id'
+recordUrl: 'germanairlinesva/fleet/aircraftmanufacturer/update/:id'
--- a/controllers/aircraftmanufacturer/create.htm
+++ b/controllers/aircraftmanufacturer/create.htm
@ -0,0 +1,54 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer') ?>">Aircraft Manufacturers</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<?= Form::open(['class' =>
+'layout']) ?>
+
+<div class="layout-row"><?= $this->formRender() ?></div>
+
+<div class="form-buttons">
+  <div class="loading-indicator-container">
+    <button
+      type="submit"
+      data-request="onSave"
+      data-hotkey="ctrl+s, cmd+s"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-primary"
+    >
+      <?= e(trans('backend::lang.form.create')) ?>
+    </button>
+    <button
+      type="button"
+      data-request="onSave"
+      data-request-data="close:1"
+      data-hotkey="ctrl+enter, cmd+enter"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-default"
+    >
+      <?= e(trans('backend::lang.form.create_and_close')) ?>
+    </button>
+    <span class="btn-text">
+      <?= e(trans('backend::lang.form.or')) ?>
+      <a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer') ?>"
+        ><?= e(trans('backend::lang.form.cancel')) ?></a
+      >
+    </span>
+  </div>
+</div>
+
+<?= Form::close() ?>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer') ?>" class="btn btn-default"
+    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
+  >
+</p>
+<?php endif ?>
--- a/controllers/aircraftmanufacturer/index.htm
+++ b/controllers/aircraftmanufacturer/index.htm
--- a/controllers/aircraftmanufacturer/preview.htm
+++ b/controllers/aircraftmanufacturer/preview.htm
@ -0,0 +1,23 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer') ?>">Aircraft Manufacturers</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<div class="form-preview"><?= $this->formRenderPreview() ?></div>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e($this->fatalError) ?></p>
+<?php endif ?>
+
+<p>
+  <a
+    href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer') ?>"
+    class="btn btn-default oc-icon-chevron-left"
+  >
+    <?= e(trans('backend::lang.form.return_to_list')) ?>
+  </a>
+</p>
--- a/controllers/aircraftmanufacturer/update.htm
+++ b/controllers/aircraftmanufacturer/update.htm
@ -0,0 +1,62 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer') ?>">Aircraft Manufacturers</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<?= Form::open(['class' =>
+'layout']) ?>
+
+<div class="layout-row"><?= $this->formRender() ?></div>
+
+<div class="form-buttons">
+  <div class="loading-indicator-container">
+    <button
+      type="submit"
+      data-request="onSave"
+      data-request-data="redirect:0"
+      data-hotkey="ctrl+s, cmd+s"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-primary"
+    >
+      <?= e(trans('backend::lang.form.save')) ?>
+    </button>
+    <button
+      type="button"
+      data-request="onSave"
+      data-request-data="close:1"
+      data-hotkey="ctrl+enter, cmd+enter"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-default"
+    >
+      <?= e(trans('backend::lang.form.save_and_close')) ?>
+    </button>
+    <button
+      type="button"
+      class="oc-icon-trash-o btn-icon danger pull-right"
+      data-request="onDelete"
+      data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
+      data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>"
+    ></button>
+
+    <span class="btn-text">
+      <?= e(trans('backend::lang.form.or')) ?>
+      <a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer') ?>"
+        ><?= e(trans('backend::lang.form.cancel')) ?></a
+      >
+    </span>
+  </div>
+</div>
+<?= Form::close() ?>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturer') ?>" class="btn btn-default"
+    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
+  >
+</p>
+<?php endif ?>
--- a/controllers/aircraftmanufacturers/_list_toolbar.htm
+++ b/controllers/aircraftmanufacturers/_list_toolbar.htm
@ -1,18 +0,0 @@
-<div data-control="toolbar">
-        <a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?></a>
-            <button
-        class="btn btn-default oc-icon-trash-o"
-        disabled="disabled"
-        onclick="$(this).data('request-data', {
-            checked: $('.control-list').listWidget('getChecked')
-        })"
-        data-request="onDelete"
-        data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
-        data-trigger-action="enable"
-        data-trigger=".control-list input[type=checkbox]"
-        data-trigger-condition="checked"
-        data-request-success="$(this).prop('disabled', true)"
-        data-stripe-load-indicator>
-        <?= e(trans('backend::lang.list.delete_selected')) ?>
-    </button>
-</div>
--- a/controllers/aircraftmanufacturers/config_form.yaml
+++ b/controllers/aircraftmanufacturers/config_form.yaml
@ -1,10 +0,0 @@
-name: AircraftManufacturers
-form: $/germanairlinesva/fleet/models/aircraftmanufacturer/fields.yaml
-modelClass: GermanAirlinesVa\Fleet\Models\AircraftManufacturer
-defaultRedirect: germanairlinesva/fleet/aircraftmanufacturers
-create:
-  redirect: 'germanairlinesva/fleet/aircraftmanufacturers/update/:id'
-  redirectClose: germanairlinesva/fleet/aircraftmanufacturers
-update:
-  redirect: germanairlinesva/fleet/aircraftmanufacturers
-  redirectClose: germanairlinesva/fleet/aircraftmanufacturers
--- a/controllers/aircraftmanufacturers/create.htm
+++ b/controllers/aircraftmanufacturers/create.htm
@ -1,46 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers') ?>">AircraftManufacturers</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')) ?>
-                </button>
-                <button 
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')) ?>
-                </button>
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
-<?php endif ?>
--- a/controllers/aircraftmanufacturers/preview.htm
+++ b/controllers/aircraftmanufacturers/preview.htm
@ -1,22 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers') ?>">AircraftManufacturers</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <div class="form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-
-<?php else: ?>
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-<?php endif ?>
-
-<p>
-    <a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers') ?>" class="btn btn-default oc-icon-chevron-left">
-        <?= e(trans('backend::lang.form.return_to_list')) ?>
-    </a>
-</p>
--- a/controllers/aircraftmanufacturers/update.htm
+++ b/controllers/aircraftmanufacturers/update.htm
@ -1,54 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers') ?>">AircraftManufacturers</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.save')) ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.save_and_close')) ?>
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
-                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>">
-                </button>
-
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
-                </span>
-            </div>
-        </div>
-    <?= Form::close() ?>
-
-<?php else: ?>
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('germanairlinesva/fleet/aircraftmanufacturers') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
-<?php endif ?>
--- a/controllers/aircrafttype/_list_toolbar.htm
+++ b/controllers/aircrafttype/_list_toolbar.htm
@ -0,0 +1,21 @@
+<div data-control="toolbar">
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype/create') ?>" class="btn btn-primary oc-icon-plus"
+    ><?= e(trans('backend::lang.form.create')) ?></a
+  >
+  <button
+    class="btn btn-default oc-icon-trash-o"
+    disabled="disabled"
+    onclick="$(this).data('request-data', {
+            checked: $('.control-list').listWidget('getChecked')
+        })"
+    data-request="onDelete"
+    data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
+    data-trigger-action="enable"
+    data-trigger=".control-list input[type=checkbox]"
+    data-trigger-condition="checked"
+    data-request-success="$(this).prop('disabled', true)"
+    data-stripe-load-indicator
+  >
+    <?= e(trans('backend::lang.list.delete_selected')) ?>
+  </button>
+</div>
--- a/controllers/aircrafttype/config_form.yaml
+++ b/controllers/aircrafttype/config_form.yaml
@ -0,0 +1,10 @@
+name: Aircraft Type
+form: $/germanairlinesva/fleet/models/aircrafttype/fields.yaml
+modelClass: GermanAirlinesVa\Fleet\Models\AircraftType
+defaultRedirect: germanairlinesva/fleet/aircrafttype
+create:
+  redirect: 'germanairlinesva/fleet/aircrafttype/update/:id'
+  redirectClose: germanairlinesva/fleet/aircrafttype
+update:
+  redirect: germanairlinesva/fleet/aircrafttype
+  redirectClose: germanairlinesva/fleet/aircrafttype
--- a/controllers/aircrafttypes/config_list.yaml
+++ b/controllers/aircrafttypes/config_list.yaml
@ -1,12 +1,12 @@
 list: $/germanairlinesva/fleet/models/aircrafttype/columns.yaml
 modelClass: GermanAirlinesVa\Fleet\Models\AircraftType
-title: AircraftTypes
+title: Aircraft Types
 noRecordsMessage: 'backend::lang.list.no_records'
 showSetup: true
 showCheckboxes: true
 recordsPerPage: 20
 toolbar:
-    buttons: list_toolbar
-    search:
-        prompt: 'backend::lang.list.search_prompt'
-recordUrl: 'germanairlinesva/fleet/aircrafttypes/update/:id'
+  buttons: list_toolbar
+  search:
+    prompt: 'backend::lang.list.search_prompt'
+recordUrl: 'germanairlinesva/fleet/aircrafttype/update/:id'
--- a/controllers/aircrafttype/create.htm
+++ b/controllers/aircrafttype/create.htm
@ -0,0 +1,54 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>">Aircraft Types</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<?= Form::open(['class' =>
+'layout']) ?>
+
+<div class="layout-row"><?= $this->formRender() ?></div>
+
+<div class="form-buttons">
+  <div class="loading-indicator-container">
+    <button
+      type="submit"
+      data-request="onSave"
+      data-hotkey="ctrl+s, cmd+s"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-primary"
+    >
+      <?= e(trans('backend::lang.form.create')) ?>
+    </button>
+    <button
+      type="button"
+      data-request="onSave"
+      data-request-data="close:1"
+      data-hotkey="ctrl+enter, cmd+enter"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-default"
+    >
+      <?= e(trans('backend::lang.form.create_and_close')) ?>
+    </button>
+    <span class="btn-text">
+      <?= e(trans('backend::lang.form.or')) ?>
+      <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>"
+        ><?= e(trans('backend::lang.form.cancel')) ?></a
+      >
+    </span>
+  </div>
+</div>
+
+<?= Form::close() ?>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>" class="btn btn-default"
+    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
+  >
+</p>
+<?php endif ?>
--- a/controllers/aircrafttype/index.htm
+++ b/controllers/aircrafttype/index.htm
@ -0,0 +1 @@
+<?= $this->listRender() ?>
--- a/controllers/aircrafttype/preview.htm
+++ b/controllers/aircrafttype/preview.htm
@ -0,0 +1,20 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>">Aircraft Types</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<div class="form-preview"><?= $this->formRenderPreview() ?></div>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e($this->fatalError) ?></p>
+<?php endif ?>
+
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>" class="btn btn-default oc-icon-chevron-left">
+    <?= e(trans('backend::lang.form.return_to_list')) ?>
+  </a>
+</p>
--- a/controllers/aircrafttype/update.htm
+++ b/controllers/aircrafttype/update.htm
@ -0,0 +1,62 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>">Aircraft Types</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<?= Form::open(['class' =>
+'layout']) ?>
+
+<div class="layout-row"><?= $this->formRender() ?></div>
+
+<div class="form-buttons">
+  <div class="loading-indicator-container">
+    <button
+      type="submit"
+      data-request="onSave"
+      data-request-data="redirect:0"
+      data-hotkey="ctrl+s, cmd+s"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-primary"
+    >
+      <?= e(trans('backend::lang.form.save')) ?>
+    </button>
+    <button
+      type="button"
+      data-request="onSave"
+      data-request-data="close:1"
+      data-hotkey="ctrl+enter, cmd+enter"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-default"
+    >
+      <?= e(trans('backend::lang.form.save_and_close')) ?>
+    </button>
+    <button
+      type="button"
+      class="oc-icon-trash-o btn-icon danger pull-right"
+      data-request="onDelete"
+      data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
+      data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>"
+    ></button>
+
+    <span class="btn-text">
+      <?= e(trans('backend::lang.form.or')) ?>
+      <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>"
+        ><?= e(trans('backend::lang.form.cancel')) ?></a
+      >
+    </span>
+  </div>
+</div>
+<?= Form::close() ?>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>" class="btn btn-default"
+    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
+  >
+</p>
+<?php endif ?>
--- a/controllers/aircrafttypegroup/_list_toolbar.htm
+++ b/controllers/aircrafttypegroup/_list_toolbar.htm
@ -0,0 +1,21 @@
+<div data-control="toolbar">
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup/create') ?>" class="btn btn-primary oc-icon-plus"
+    ><?= e(trans('backend::lang.form.create')) ?></a
+  >
+  <button
+    class="btn btn-default oc-icon-trash-o"
+    disabled="disabled"
+    onclick="$(this).data('request-data', {
+            checked: $('.control-list').listWidget('getChecked')
+        })"
+    data-request="onDelete"
+    data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
+    data-trigger-action="enable"
+    data-trigger=".control-list input[type=checkbox]"
+    data-trigger-condition="checked"
+    data-request-success="$(this).prop('disabled', true)"
+    data-stripe-load-indicator
+  >
+    <?= e(trans('backend::lang.list.delete_selected')) ?>
+  </button>
+</div>
--- a/controllers/aircrafttypegroup/config_form.yaml
+++ b/controllers/aircrafttypegroup/config_form.yaml
@ -0,0 +1,10 @@
+name: Aircraft Type Group
+form: $/germanairlinesva/fleet/models/aircrafttypegroup/fields.yaml
+modelClass: GermanAirlinesVa\Fleet\Models\AircraftTypeGroup
+defaultRedirect: germanairlinesva/fleet/aircrafttypegroup
+create:
+  redirect: 'germanairlinesva/fleet/aircrafttypegroup/update/:id'
+  redirectClose: germanairlinesva/fleet/aircrafttypegroup
+update:
+  redirect: germanairlinesva/fleet/aircrafttypegroup
+  redirectClose: germanairlinesva/fleet/aircrafttypegroup
--- a/controllers/aircrafttypegroup/config_list.yaml
+++ b/controllers/aircrafttypegroup/config_list.yaml
@ -0,0 +1,12 @@
+list: $/germanairlinesva/fleet/models/aircrafttypegroup/columns.yaml
+modelClass: GermanAirlinesVa\Fleet\Models\AircraftTypeGroup
+title: Aircraft Type Groups
+noRecordsMessage: 'backend::lang.list.no_records'
+showSetup: true
+showCheckboxes: true
+recordsPerPage: 20
+toolbar:
+  buttons: list_toolbar
+  search:
+    prompt: 'backend::lang.list.search_prompt'
+recordUrl: 'germanairlinesva/fleet/aircrafttypegroup/update/:id'
--- a/controllers/aircrafttypegroup/create.htm
+++ b/controllers/aircrafttypegroup/create.htm
@ -0,0 +1,54 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup') ?>">Aircraft Type Groups</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<?= Form::open(['class' =>
+'layout']) ?>
+
+<div class="layout-row"><?= $this->formRender() ?></div>
+
+<div class="form-buttons">
+  <div class="loading-indicator-container">
+    <button
+      type="submit"
+      data-request="onSave"
+      data-hotkey="ctrl+s, cmd+s"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-primary"
+    >
+      <?= e(trans('backend::lang.form.create')) ?>
+    </button>
+    <button
+      type="button"
+      data-request="onSave"
+      data-request-data="close:1"
+      data-hotkey="ctrl+enter, cmd+enter"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-default"
+    >
+      <?= e(trans('backend::lang.form.create_and_close')) ?>
+    </button>
+    <span class="btn-text">
+      <?= e(trans('backend::lang.form.or')) ?>
+      <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup') ?>"
+        ><?= e(trans('backend::lang.form.cancel')) ?></a
+      >
+    </span>
+  </div>
+</div>
+
+<?= Form::close() ?>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup') ?>" class="btn btn-default"
+    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
+  >
+</p>
+<?php endif ?>
--- a/controllers/aircrafttypegroup/index.htm
+++ b/controllers/aircrafttypegroup/index.htm
@ -0,0 +1 @@
+<?= $this->listRender() ?>
--- a/controllers/aircrafttypegroup/preview.htm
+++ b/controllers/aircrafttypegroup/preview.htm
@ -0,0 +1,23 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup') ?>">Aircraft Type Groups</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<div class="form-preview"><?= $this->formRenderPreview() ?></div>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e($this->fatalError) ?></p>
+<?php endif ?>
+
+<p>
+  <a
+    href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup') ?>"
+    class="btn btn-default oc-icon-chevron-left"
+  >
+    <?= e(trans('backend::lang.form.return_to_list')) ?>
+  </a>
+</p>
--- a/controllers/aircrafttypegroup/update.htm
+++ b/controllers/aircrafttypegroup/update.htm
@ -0,0 +1,62 @@
+<?php Block::put('breadcrumb') ?>
+<ul>
+  <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup') ?>">Aircraft Type Groups</a></li>
+  <li><?= e($this->pageTitle) ?></li>
+</ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+<?= Form::open(['class' =>
+'layout']) ?>
+
+<div class="layout-row"><?= $this->formRender() ?></div>
+
+<div class="form-buttons">
+  <div class="loading-indicator-container">
+    <button
+      type="submit"
+      data-request="onSave"
+      data-request-data="redirect:0"
+      data-hotkey="ctrl+s, cmd+s"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-primary"
+    >
+      <?= e(trans('backend::lang.form.save')) ?>
+    </button>
+    <button
+      type="button"
+      data-request="onSave"
+      data-request-data="close:1"
+      data-hotkey="ctrl+enter, cmd+enter"
+      data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+      class="btn btn-default"
+    >
+      <?= e(trans('backend::lang.form.save_and_close')) ?>
+    </button>
+    <button
+      type="button"
+      class="oc-icon-trash-o btn-icon danger pull-right"
+      data-request="onDelete"
+      data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
+      data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>"
+    ></button>
+
+    <span class="btn-text">
+      <?= e(trans('backend::lang.form.or')) ?>
+      <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup') ?>"
+        ><?= e(trans('backend::lang.form.cancel')) ?></a
+      >
+    </span>
+  </div>
+</div>
+<?= Form::close() ?>
+
+<?php else: ?>
+<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+<p>
+  <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypegroup') ?>" class="btn btn-default"
+    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
+  >
+</p>
+<?php endif ?>
--- a/controllers/aircrafttypes/_list_toolbar.htm
+++ b/controllers/aircrafttypes/_list_toolbar.htm
@ -1,18 +0,0 @@
-<div data-control="toolbar">
-        <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?></a>
-            <button
-        class="btn btn-default oc-icon-trash-o"
-        disabled="disabled"
-        onclick="$(this).data('request-data', {
-            checked: $('.control-list').listWidget('getChecked')
-        })"
-        data-request="onDelete"
-        data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
-        data-trigger-action="enable"
-        data-trigger=".control-list input[type=checkbox]"
-        data-trigger-condition="checked"
-        data-request-success="$(this).prop('disabled', true)"
-        data-stripe-load-indicator>
-        <?= e(trans('backend::lang.list.delete_selected')) ?>
-    </button>
-</div>
--- a/controllers/aircrafttypes/config_form.yaml
+++ b/controllers/aircrafttypes/config_form.yaml
@ -1,10 +0,0 @@
-name: AircraftTypes
-form: $/germanairlinesva/fleet/models/aircrafttype/fields.yaml
-modelClass: GermanAirlinesVa\Fleet\Models\AircraftType
-defaultRedirect: germanairlinesva/fleet/aircrafttypes
-create:
-    redirect: 'germanairlinesva/fleet/aircrafttypes/update/:id'
-    redirectClose: germanairlinesva/fleet/aircrafttypes
-update:
-    redirect: germanairlinesva/fleet/aircrafttypes
-    redirectClose: germanairlinesva/fleet/aircrafttypes
--- a/controllers/aircrafttypes/create.htm
+++ b/controllers/aircrafttypes/create.htm
@ -1,46 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>">AircraftTypes</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')) ?>
-                </button>
-                <button 
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')) ?>
-                </button>
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
-<?php endif ?>
--- a/controllers/aircrafttypes/preview.htm
+++ b/controllers/aircrafttypes/preview.htm
@ -1,22 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>">AircraftTypes</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <div class="form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-
-<?php else: ?>
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-<?php endif ?>
-
-<p>
-    <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>" class="btn btn-default oc-icon-chevron-left">
-        <?= e(trans('backend::lang.form.return_to_list')) ?>
-    </a>
-</p>
--- a/controllers/aircrafttypes/update.htm
+++ b/controllers/aircrafttypes/update.htm
@ -1,54 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>">AircraftTypes</a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class' => 'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.save')) ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.save_and_close')) ?>
-                </button>
-                <button
-                    type="button"
-                    class="oc-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
-                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>">
-                </button>
-
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
-                </span>
-            </div>
-        </div>
-    <?= Form::close() ?>
-
-<?php else: ?>
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
-<?php endif ?>
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@ -1,18 +1,57 @@
 <?php return [
-    'plugin' => [
-        'name' => 'Fleet',
-        'description' => '',
+  'plugin' => [
+    'name' => 'Fleet',
+    'description' => '',
+  ],
+  'aircraft_manufacturers' => [
+    'name' => 'Manufacturer Name',
+    'link' => 'Link to Homepage',
+    'history' => 'History of Manufacturer',
+  ],
+  'aircrafts' => [
+    'type' => 'Aircraft Type',
+    'registration' => 'Aircraft Registration',
+    'name' => 'Aircraft Name',
+    'home_base' => 'Aircraft Home Base',
+  ],
+  'aircraft_type_groups' => [
+    'comment' => 'Comment Identifying Aircraft Type Group',
+  ],
+  'aircraft_types' => [
+    'tabs' => [
+      'operational' => 'Operational',
+      'informational' => 'Informational',
+      'weights' => 'Weights',
    ],
-    'aircraft' => [
-        'manufacturers' => [
-            'name' => 'Name',
-            'link' => 'Link',
-            'history' => 'History',
-        ],
-    ],
-    'menu' => [
-        'main' => 'GA Fleet',
-        'manufacturers' => 'Aircraft Manufacturers',
-        'types' => 'Aircraft Types',
-    ],
-];
+    'aircraft_manufacturer' => 'Aircraft Manufacturer',
+    'typerating_id' => 'Typerating',
+    'only_charter' => 'True if Type is Charter Exclusive',
+    'type' => 'Aircraft Type Specifier',
+    'simbrief_type' => 'Aircraft Type Specifier for SimBrief',
+    'aircraft_type_groups' => 'Aircraft Type Group',
+    'dom' => 'Dry Operating Mass (kg)',
+    'mpld' => 'Max Payload (kg)',
+    'mzfm' => 'Max Zero Fuel Mass (kg)',
+    'fuel_capacity' => 'Fuel Capacity (kg)',
+    'mtom' => 'Maximum Takeoff Mass (kg)',
+    'mlam' => 'Maximum Landing Mass (kg)',
+    'description' => 'Aircraft Type Description',
+    'wingspan' => 'Aircraft Wingspan (m)',
+    'length' => 'Aircraft Length (m)',
+    'cruise_speed' => 'Aircraft Cruise Speed (kph)',
+    'range' => 'Aircraft Maximum Range (km)',
+    'engines' => 'Engines Installed',
+    'max_fl' => 'Maximum Altitude (ft)',
+    'capacity_flight_crew' => 'Strenght of Flight Crew',
+    'capacity_cabin_crew' => 'Strength of Cabin Crew',
+    'capacity_passengers' => 'Maximum Amount of Passengers',
+    'capacity_cargo' => 'Maximum amount of Cargo (kg)',
+  ],
+  'menu' => [
+    'main' => 'GA Fleet',
+    'manufacturers' => 'Aircraft Manufacturers',
+    'types' => 'Aircraft Types',
+    'aircrafts' => 'Aircrafts',
+    'groups' => 'Aircraft Type Groups',
+  ],
+];
--- a/models/Aircraft.php
+++ b/models/Aircraft.php
@ -0,0 +1,37 @@
+<?php namespace GermanAirlinesVa\Fleet\Models;
+
+use Model;
+
+/**
+ * Model
+ */
+class Aircraft extends Model
+{
+  use \October\Rain\Database\Traits\Validation;
+
+  /*
+   * Disable timestamps by default.
+   * Remove this line if timestamps are defined in the database table.
+   */
+  public $timestamps = false;
+
+  /**
+   * @var string The database table used by the model.
+   */
+  public $table = 'aircrafts';
+  protected $connection = 'germanairlinesva_fleet';
+
+  /**
+   * @var array Validation rules
+   */
+  public $rules = [
+    'aircraft_type' => 'required',
+    'registration' => 'required',
+    'name' => 'required',
+    'home_airport_id' => 'required',
+  ];
+
+  public $belongsTo = [
+    'aircraft_type' => 'GermanAirlinesVa\Fleet\Models\AircraftType',
+  ];
+}
--- a/models/AircraftManufacturer.php
+++ b/models/AircraftManufacturer.php
@ -18,12 +18,19 @@ class AircraftManufacturer extends Model
  /**
   * @var string The database table used by the model.
   */
-  // public $table = 'germanairlinesva_fleet_aircraft_manufacturers';
  public $table = 'aircraft_manufacturers';
  protected $connection = 'germanairlinesva_fleet';

  /**
   * @var array Validation rules
   */
-  public $rules = [];
+  public $rules = [
+    'name' => 'required',
+    'link' => 'required',
+    'history' => 'required',
+  ];
+
+  public $hasMany = [
+    'aircraft_types' => 'GermanAirlinesVa\Fleet\Models\AircraftType',
+  ];
 }
--- a/models/AircraftType.php
+++ b/models/AircraftType.php
@ -18,16 +18,47 @@ class AircraftType extends Model
  /**
   * @var string The database table used by the model.
   */
-  // public $table = 'germanairlinesva_fleet_aircraft_types';
  public $table = 'aircraft_types';
  protected $connection = 'germanairlinesva_fleet';

  /**
   * @var array Validation rules
   */
-  public $rules = [];
+  public $rules = [
+    'aircraft_manufacturer' => 'required',
+    'typerating_id' => 'required',
+    'only_charter' => 'required',
+    'type' => 'required',
+    'simbrief_type' => 'required',
+    'aircraft_type_groups' => 'required',
+    'dom' => 'required',
+    'mpld' => 'required',
+    'mzfm' => 'required',
+    'fuel_capacity' => 'required',
+    'mtom' => 'required',
+    'mlam' => 'required',
+    'description' => 'required',
+    'wingspan' => 'required',
+    'length' => 'required',
+    'cruise_speed' => 'required',
+    'range' => 'required',
+    'engines' => 'required',
+    'max_fl' => 'required',
+    'capacity_flight_crew' => 'required',
+    'capacity_cabin_crew' => 'required',
+    'capacity_passengers' => 'required',
+    'capacity_cargo' => 'required',
+  ];

  public $belongsTo = [
    'aircraft_manufacturer' => 'GermanAirlinesVa\Fleet\Models\AircraftManufacturer',
  ];
+
+  public $belongsToMany = [
+    'aircraft_type_groups' => 'GermanAirlinesVa\Fleet\Models\AircraftTypeGroup',
+  ];
+
+  public $hasMany = [
+    'aircrafts' => 'GermanAirlinesVa\Fleet\Models\Aircraft',
+  ];
 }
--- a/models/AircraftTypeGroup.php
+++ b/models/AircraftTypeGroup.php
@ -0,0 +1,34 @@
+<?php namespace GermanAirlinesVa\Fleet\Models;
+
+use Model;
+
+/**
+ * Model
+ */
+class AircraftTypeGroup extends Model
+{
+  use \October\Rain\Database\Traits\Validation;
+
+  /*
+   * Disable timestamps by default.
+   * Remove this line if timestamps are defined in the database table.
+   */
+  public $timestamps = false;
+
+  /**
+   * @var string The database table used by the model.
+   */
+  public $table = 'aircraft_type_groups';
+  protected $connection = 'germanairlinesva_fleet';
+
+  /**
+   * @var array Validation rules
+   */
+  public $rules = [
+    'comment' => 'required',
+  ];
+
+  public $belongsToMany = [
+    'aircraft_types' => 'GermanAirlinesVa\Fleet\Models\AircraftType',
+  ];
+}
--- a/models/aircraft/columns.yaml
+++ b/models/aircraft/columns.yaml
@ -0,0 +1,49 @@
+columns:
+  id:
+    label: id
+    type: text
+  aircraft_type_id:
+    label: aircraft_type_id
+    type: text
+  home_airport_id:
+    label: home_airport_id
+    type: text
+  airport_id:
+    label: airport_id
+    type: text
+  name:
+    label: name
+    type: text
+  registration:
+    label: registration
+    type: text
+  in_use:
+    label: in_use
+    type: text
+  total_miles:
+    label: total_miles
+    type: text
+  total_fuel:
+    label: total_fuel
+    type: text
+  total_flight_time:
+    label: total_flight_time
+    type: text
+  total_expenses:
+    label: total_expenses
+    type: text
+  current_check:
+    label: current_check
+    type: text
+  last_a_check:
+    label: last_a_check
+    type: text
+  last_b_check:
+    label: last_b_check
+    type: text
+  last_c_check:
+    label: last_c_check
+    type: text
+  last_d_check:
+    label: last_d_check
+    type: text
--- a/models/aircraft/fields.yaml
+++ b/models/aircraft/fields.yaml
@ -0,0 +1,23 @@
+fields:
+  aircraft_type:
+    label: 'germanairlinesva.fleet::lang.aircrafts.type'
+    nameFrom: type
+    descriptionFrom: description
+    span: auto
+    required: 1
+    type: relation
+  registration:
+    label: 'germanairlinesva.fleet::lang.aircrafts.registration'
+    span: auto
+    required: 1
+    type: text
+  name:
+    label: 'germanairlinesva.fleet::lang.aircrafts.name'
+    span: auto
+    required: 1
+    type: text
+  home_airport_id:
+    label: 'germanairlinesva.fleet::lang.aircrafts.home_base'
+    span: auto
+    required: 1
+    type: number
--- a/models/aircraftmanufacturer/columns.yaml
+++ b/models/aircraftmanufacturer/columns.yaml
@ -1,18 +1,18 @@
 columns:
-    id:
-        label: id
-        type: text
-    name:
-        label: name
-        type: text
-        searchable: true
-        sortable: true
-    history:
-        label: history
-        type: text
-        searchable: false
-    link:
-        label: link
-        type: text
-        searchable: false
-        sortable: false
+  id:
+    label: id
+    type: text
+  name:
+    label: name
+    type: text
+    searchable: true
+    sortable: true
+  history:
+    label: history
+    type: text
+    searchable: false
+  link:
+    label: link
+    type: text
+    searchable: false
+    sortable: false
--- a/models/aircraftmanufacturer/fields.yaml
+++ b/models/aircraftmanufacturer/fields.yaml
@ -1,17 +1,17 @@
 fields:
-    name:
-        label: 'germanairlinesva.fleet::lang.aircraft.manufacturers.name'
-        span: auto
-        required: 1
-        type: text
-    link:
-        label: 'germanairlinesva.fleet::lang.aircraft.manufacturers.link'
-        span: auto
-        required: 1
-        type: text
-    history:
-        label: 'germanairlinesva.fleet::lang.aircraft.manufacturers.history'
-        size: large
-        span: auto
-        required: 1
-        type: richeditor
+  name:
+    label: 'germanairlinesva.fleet::lang.aircraft_manufacturers.name'
+    span: auto
+    required: 1
+    type: text
+  link:
+    label: 'germanairlinesva.fleet::lang.aircraft_manufacturers.link'
+    span: auto
+    required: 1
+    type: text
+  history:
+    label: 'germanairlinesva.fleet::lang.aircraft_manufacturers.history'
+    size: large
+    span: auto
+    required: 1
+    type: richeditor
--- a/models/aircrafttype/columns.yaml
+++ b/models/aircrafttype/columns.yaml
@ -1,70 +1,70 @@
 columns:
-    id:
-        label: id
-        type: text
-    aircraft_manufacturers_id:
-        label: aircraft_manufacturers_id
-        type: number
-    typerating_id:
-        label: typerating_id
-        type: number
-    only_charter:
-        label: only_charter
-        type: text
-    type:
-        label: type
-        type: text
-    description:
-        label: description
-        type: text
-    simbrief_type:
-        label: simbrief_type
-        type: text
-    wingspan:
-        label: wingspan
-        type: text
-    length:
-        label: length
-        type: text
-    cruise_speed:
-        label: cruise_speed
-        type: text
-    range:
-        label: range
-        type: text
-    engines:
-        label: engines
-        type: text
-    dom:
-        label: dom
-        type: number
-    mpld:
-        label: mpld
-        type: number
-    mzfm:
-        label: mzfm
-        type: number
-    fuel_capacity:
-        label: fuel_capacity
-        type: number
-    mtom:
-        label: mtom
-        type: number
-    mlam:
-        label: mlam
-        type: number
-    max_fl:
-        label: max_fl
-        type: number
-    capacity_flight_crew:
-        label: capacity_flight_crew
-        type: number
-    capacity_cabin_crew:
-        label: capacity_cabin_crew
-        type: number
-    capacity_passengers:
-        label: capacity_passengers
-        type: number
-    capacity_cargo:
-        label: capacity_cargo
-        type: number
+  id:
+    label: id
+    type: text
+  aircraft_manufacturers_id:
+    label: aircraft_manufacturers_id
+    type: number
+  typerating_id:
+    label: typerating_id
+    type: number
+  only_charter:
+    label: only_charter
+    type: text
+  type:
+    label: type
+    type: text
+  description:
+    label: description
+    type: text
+  simbrief_type:
+    label: simbrief_type
+    type: text
+  wingspan:
+    label: wingspan
+    type: text
+  length:
+    label: length
+    type: text
+  cruise_speed:
+    label: cruise_speed
+    type: text
+  range:
+    label: range
+    type: text
+  engines:
+    label: engines
+    type: text
+  dom:
+    label: dom
+    type: number
+  mpld:
+    label: mpld
+    type: number
+  mzfm:
+    label: mzfm
+    type: number
+  fuel_capacity:
+    label: fuel_capacity
+    type: number
+  mtom:
+    label: mtom
+    type: number
+  mlam:
+    label: mlam
+    type: number
+  max_fl:
+    label: max_fl
+    type: number
+  capacity_flight_crew:
+    label: capacity_flight_crew
+    type: number
+  capacity_cabin_crew:
+    label: capacity_cabin_crew
+    type: number
+  capacity_passengers:
+    label: capacity_passengers
+    type: number
+  capacity_cargo:
+    label: capacity_cargo
+    type: number
--- a/models/aircrafttype/fields.yaml
+++ b/models/aircrafttype/fields.yaml
@ -1,141 +1,145 @@
 tabs:
-    fields:
-        aircraft_manufacturer:
-            label: Manufacturer
-            nameFrom: name
-            descriptionFrom: description
-            span: auto
-            required: 1
-            type: relation
-            tab: Operational
-        typerating_id:
-            label: Typerating
-            span: auto
-            required: 1
-            type: number
-            tab: Operational
-        only_charter:
-            label: 'Charter Only'
-            options:
-                'No': 'no'
-                'Yes': 'yes'
-            showSearch: true
-            span: auto
-            required: 1
-            type: dropdown
-            tab: Operational
-        type:
-            label: Type
-            span: auto
-            required: 1
-            type: text
-            tab: Operational
-        simbrief_type:
-            label: 'SimBrief Type'
-            span: auto
-            required: 1
-            type: text
-            tab: Operational
-        dom:
-            label: DOM
-            span: auto
-            required: 1
-            type: number
-            tab: Weights
-        mpld:
-            label: 'Max Payload'
-            span: auto
-            required: 1
-            type: number
-            tab: Weights
-        mzfm:
-            label: 'Max ZFM'
-            span: auto
-            required: 1
-            type: number
-            tab: Weights
-        fuel_capacity:
-            label: 'Fuel Capacity'
-            span: auto
-            required: 1
-            type: number
-            tab: Weights
-        mtom:
-            label: 'Max TOM'
-            span: auto
-            required: 1
-            type: number
-            tab: Weights
-        mlam:
-            label: 'Max LAM'
-            span: auto
-            required: 1
-            type: number
-            tab: Weights
-        description:
-            label: Description
-            size: large
-            span: auto
-            required: 1
-            type: richeditor
-            tab: Informational
-        wingspan:
-            label: Wingspan
-            span: auto
-            required: 1
-            type: text
-            tab: Informational
-        length:
-            label: Length
-            span: auto
-            required: 1
-            type: text
-            tab: Informational
-        cruise_speed:
-            label: 'Cruise Speed'
-            span: auto
-            required: 1
-            type: text
-            tab: Informational
-        range:
-            label: Range
-            span: auto
-            required: 1
-            type: text
-            tab: Informational
-        engines:
-            label: Engines
-            span: auto
-            required: 1
-            type: text
-            tab: Informational
-        max_fl:
-            label: 'Max FL'
-            span: auto
-            required: 1
-            type: number
-            tab: Informational
-        capacity_flight_crew:
-            label: 'Flight Crew'
-            span: auto
-            required: 1
-            type: number
-            tab: Informational
-        capacity_cabin_crew:
-            label: 'Cabin Crew'
-            span: auto
-            required: 1
-            type: number
-            tab: Informational
-        capacity_passengers:
-            label: Passengers
-            span: auto
-            required: 1
-            type: number
-            tab: Informational
-        capacity_cargo:
-            label: Cargo
-            span: auto
-            required: 1
-            type: number
-            tab: Informational
+  fields:
+    aircraft_manufacturer:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.aircraft_manufacturer'
+      nameFrom: name
+      descriptionFrom: description
+      span: auto
+      required: 1
+      type: relation
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
+    typerating_id:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.typerating_id'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
+    only_charter:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.only_charter'
+      span: auto
+      required: 1
+      type: switch
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
+    type:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.type'
+      span: auto
+      required: 1
+      type: text
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
+    simbrief_type:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.simbrief_type'
+      span: auto
+      required: 1
+      type: text
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
+    aircraft_type_groups:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.aircraft_type_groups'
+      nameFrom: comment
+      descriptionFrom: description
+      span: auto
+      required: 1
+      type: relation
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
+    dom:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.dom'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
+    mpld:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.mpld'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
+    mzfm:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.mzfm'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
+    fuel_capacity:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.fuel_capacity'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
+    mtom:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.mtom'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
+    mlam:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.mlam'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
+    description:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.description'
+      size: large
+      span: auto
+      required: 1
+      type: richeditor
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    wingspan:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.wingspan'
+      span: auto
+      required: 1
+      type: text
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    length:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.length'
+      span: auto
+      required: 1
+      type: text
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    cruise_speed:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.cruise_speed'
+      span: auto
+      required: 1
+      type: text
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    range:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.range'
+      span: auto
+      required: 1
+      type: text
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    engines:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.engines'
+      span: auto
+      required: 1
+      type: text
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    max_fl:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.max_fl'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    capacity_flight_crew:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.capacity_flight_crew'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    capacity_cabin_crew:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.capacity_cabin_crew'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    capacity_passengers:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.capacity_passengers'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
+    capacity_cargo:
+      label: 'germanairlinesva.fleet::lang.aircraft_types.capacity_cargo'
+      span: auto
+      required: 1
+      type: number
+      tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
--- a/models/aircrafttypegroup/columns.yaml
+++ b/models/aircrafttypegroup/columns.yaml
@ -0,0 +1,7 @@
+columns:
+  id:
+    label: id
+    type: number
+  comment:
+    label: comment
+    type: text
--- a/models/aircrafttypegroup/fields.yaml
+++ b/models/aircrafttypegroup/fields.yaml
@ -0,0 +1,5 @@
+fields:
+  comment:
+    label: 'germanairlinesva.fleet::lang.aircraft_type_groups.comment'
+    span: auto
+    type: text
--- a/package.json
+++ b/package.json
@ -10,6 +10,6 @@
    "prettier": "^2.3.0"
  },
  "scripts": {
-    "format": "prettier --write './**/*.{php,html}'"
+    "format": "prettier --write './**/*.{php,html,htm,yaml}'"
  }
 }
--- a/plugin.yaml
+++ b/plugin.yaml
@ -1,20 +1,28 @@
 plugin:
-    name: 'germanairlinesva.fleet::lang.plugin.name'
-    description: 'germanairlinesva.fleet::lang.plugin.description'
-    author: 'German Airlines VA'
-    icon: oc-icon-plane
-    homepage: ''
+  name: 'germanairlinesva.fleet::lang.plugin.name'
+  description: 'germanairlinesva.fleet::lang.plugin.description'
+  author: 'German Airlines VA'
+  icon: oc-icon-plane
+  homepage: ''
 navigation:
-    main-menu-item:
-        label: 'germanairlinesva.fleet::lang.menu.main'
-        url: /
+  main-menu-item:
+    label: 'germanairlinesva.fleet::lang.menu.main'
+    url: /
+    icon: icon-plane
+    sideMenu:
+      side-menu-item:
+        label: 'germanairlinesva.fleet::lang.menu.groups'
+        url: germanairlinesva/fleet/aircrafttypegroup
+        icon: icon-group
+      side-menu-item2:
+        label: 'germanairlinesva.fleet::lang.menu.manufacturers'
+        url: germanairlinesva/fleet/aircraftmanufacturer
+        icon: icon-wrench
+      side-menu-item3:
+        label: 'germanairlinesva.fleet::lang.menu.types'
+        url: germanairlinesva/fleet/aircrafttype
+        icon: icon-paper-plane
+      side-menu-item4:
+        label: 'germanairlinesva.fleet::lang.menu.aircrafts'
+        url: germanairlinesva/fleet/aircraft
        icon: icon-plane
-        sideMenu:
-            side-menu-item:
-                label: 'germanairlinesva.fleet::lang.menu.manufacturers'
-                url: /germanairlinesva/fleet/aircraftmanufacturers
-                icon: icon-wrench
-            side-menu-item2:
-                label: 'germanairlinesva.fleet::lang.menu.types'
-                url: germanairlinesva/fleet/aircrafttypes
-                icon: icon-paper-plane
--- a/updates/builder_table_create_aircraft_manufacturers.php
+++ b/updates/builder_table_create_aircraft_manufacturers.php
@ -9,7 +9,6 @@ class BuilderTableCreateGermanAirlinesVaAircraftManufacturers extends Migration
  public function up()
  {
    Schema::connection('germanairlinesva_fleet')->create('aircraft_manufacturers', function ($table) {
-      //Schema::create('germanairlinesva_fleet_aircraft_manufacturers', function ($table) {
      $table->engine = 'InnoDB';
      $table->bigIncrements('id')->unsigned();
      $table->string('name');
@ -21,6 +20,5 @@ class BuilderTableCreateGermanAirlinesVaAircraftManufacturers extends Migration
  public function down()
  {
    Schema::connection('germanairlinesva_fleet')->dropIfExists('aircraft_manufacturers');
-    //Schema::dropIfExists('germanairlinesva_fleet_aircraft_manufacturers');
  }
 }
--- a/updates/builder_table_create_aircraft_type_aircraft_type_group.php
+++ b/updates/builder_table_create_aircraft_type_aircraft_type_group.php
@ -0,0 +1,31 @@
+<?php namespace GermanAirlinesVa\Fleet\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableCreateGermanAirlinesVaFleetAircraftTypesAircraftTypeGroups extends Migration
+{
+  public function up()
+  {
+    Schema::connection('germanairlinesva_fleet')->create('aircraft_type_aircraft_type_group', function ($table) {
+      $table->engine = 'InnoDB';
+      $table->bigInteger('aircraft_type_id')->unsigned();
+      $table
+        ->foreign('aircraft_type_id')
+        ->references('id')
+        ->on('aircraft_types');
+      $table->bigInteger('aircraft_type_group_id')->unsigned();
+      $table
+        ->foreign('aircraft_type_group_id')
+        ->references('id')
+        ->on('aircraft_type_groups');
+    });
+  }
+
+  public function down()
+  {
+    Schema::connection('germanairlinesva_fleet')->disableForeignKeyConstraints();
+    Schema::connection('germanairlinesva_fleet')->dropIfExists('aircraft_type_aircraft_type_group');
+    Schema::connection('germanairlinesva_fleet')->enableForeignKeyConstraints();
+  }
+}
--- a/updates/builder_table_create_aircraft_type_groups.php
+++ b/updates/builder_table_create_aircraft_type_groups.php
@ -0,0 +1,23 @@
+<?php namespace GermanAirlinesVa\Fleet\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableCreateGermanAirlinesVaFleetAircraftTypeGroups extends Migration
+{
+  public function up()
+  {
+    Schema::connection('germanairlinesva_fleet')->create('aircraft_type_groups', function ($table) {
+      $table->engine = 'InnoDB';
+      $table->bigIncrements('id')->unsigned();
+      $table->string('comment');
+    });
+  }
+
+  public function down()
+  {
+    Schema::connection('germanairlinesva_fleet')->disableForeignKeyConstraints();
+    Schema::connection('germanairlinesva_fleet')->dropIfExists('aircraft_type_groups');
+    Schema::connection('germanairlinesva_fleet')->enableForeignKeyConstraints();
+  }
+}
--- a/updates/builder_table_create_aircraft_types.php
+++ b/updates/builder_table_create_aircraft_types.php
@ -9,7 +9,6 @@ class BuilderTableCreateGermanAirlinesVaAircraftTypes extends Migration
  public function up()
  {
    Schema::connection('germanairlinesva_fleet')->create('aircraft_types', function ($table) {
-      //Schema::create('germanairlinesva_fleet_aircraft_types', function ($table) {
      $table->engine = 'InnoDB';
      $table->bigIncrements('id')->unsigned();
      $table->bigInteger('aircraft_manufacturer_id')->unsigned();
@ -19,10 +18,10 @@ class BuilderTableCreateGermanAirlinesVaAircraftTypes extends Migration
        ->on('aircraft_manufacturers');
      $table->bigInteger('typerating_id')->unsigned();
      //$table
-      //  ->foreign('typerating_manufacturer_id')
+      //  ->foreign('typerating_id')
      //  ->references('id')
      //  ->on('typeratings');
-      $table->enum('only_charter', ['yes', 'no']);
+      $table->boolean('only_charter');
      $table->string('type');
      $table->text('description');
      $table->string('simbrief_type');
@ -47,7 +46,8 @@ class BuilderTableCreateGermanAirlinesVaAircraftTypes extends Migration

  public function down()
  {
+    Schema::connection('germanairlinesva_fleet')->disableForeignKeyConstraints();
    Schema::connection('germanairlinesva_fleet')->dropIfExists('aircraft_types');
-    //Schema::dropIfExists('germanairlinesva_fleet_aircraft_types');
+    Schema::connection('germanairlinesva_fleet')->enableForeignKeyConstraints();
  }
 }
--- a/updates/builder_table_create_aircrafts.php
+++ b/updates/builder_table_create_aircrafts.php
@ -0,0 +1,64 @@
+<?php namespace GermanAirlinesVa\Fleet\Updates;
+use DB;
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableCreateGermanAirlinesVaFleetAircrafts extends Migration
+{
+  public function up()
+  {
+    Schema::connection('germanairlinesva_fleet')->create('aircrafts', function ($table) {
+      $table->engine = 'InnoDB';
+      $table->bigIncrements('id')->unsigned();
+      $table->bigInteger('aircraft_type_id')->unsigned();
+      $table
+        ->foreign('aircraft_type_id')
+        ->references('id')
+        ->on('aircraft_types');
+      $table->bigInteger('home_airport_id')->unsigned();
+      //$table
+      //  ->foreign('home_airport_id')
+      //  ->references('id')
+      //  ->on('airports');
+      $table
+        ->bigInteger('airport_id')
+        ->unsigned()
+        ->nullable();
+      //$table
+      //  ->foreign('airport_id')
+      //  ->references('id')
+      //  ->on('airports');
+      $table->string('name');
+      $table->string('registration');
+      $table->boolean('in_use')->default(true);
+      $table
+        ->double('total_miles')
+        ->unsigned()
+        ->default(0);
+      $table
+        ->double('total_fuel')
+        ->unsigned()
+        ->default(0);
+      $table
+        ->double('total_flight_time')
+        ->unsigned()
+        ->default(0);
+      $table
+        ->double('total_expenses')
+        ->unsigned()
+        ->default(0);
+      $table->enum('current_check', ['a', 'b', 'c', 'd'])->nullable();
+      $table->datetime('last_a_check')->default(DB::raw('NOW()'));
+      $table->datetime('last_b_check')->default(DB::raw('NOW()'));
+      $table->datetime('last_c_check')->default(DB::raw('NOW()'));
+      $table->datetime('last_d_check')->default(DB::raw('NOW()'));
+    });
+  }
+
+  public function down()
+  {
+    Schema::connection('germanairlinesva_fleet')->disableForeignKeyConstraints();
+    Schema::connection('germanairlinesva_fleet')->dropIfExists('aircrafts');
+    Schema::connection('germanairlinesva_fleet')->enableForeignKeyConstraints();
+  }
+}
--- a/updates/version.yaml
+++ b/updates/version.yaml
@ -5,3 +5,9 @@
  - builder_table_create_aircraft_manufacturers.php
  - 'Created table aircraft_types'
  - builder_table_create_aircraft_types.php
+  - 'Created table aircrafts'
+  - builder_table_create_aircrafts.php
+  - 'Created table aircraft_type_groups'
+  - builder_table_create_aircraft_type_groups.php
+  - 'Created table aircraft_type_aircraft_type_group'
+  - builder_table_create_aircraft_type_aircraft_type_group.php
Author	SHA1	Message	Date
Gogs	a665efb204	Types refactor and localization	2021-06-03 22:15:32 +02:00
Gogs	126e966792	Menu	2021-06-03 20:46:54 +02:00
Gogs	dc1a64b32d	TypeGroups Localization and refactor	2021-06-03 20:44:31 +02:00
Gogs	3e90d8cbe1	Aircraft Controller refactor and localization	2021-06-03 20:25:24 +02:00
Gogs	d6dbb3f1e7	Format Manufacturer Controller refactor	2021-06-03 19:57:37 +02:00
Gogs	27410bf5c2	Type Groups	2021-06-03 18:34:22 +02:00
Gogs	9fdfe9dfb1	AC Form	2021-06-03 17:00:35 +02:00