GermanAirlines/GermanAirlinesVA-Fleet
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Types refactor and localization

Browse Source
This commit is contained in:
Gogs 2021-06-03 22:15:32 +02:00
parent 126e966792
commit a665efb204
13 changed files with 123 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -27,7 +27,3 @@
## General ## General
- Remove design phase database connection in Schema and Model - Remove design phase database connection in Schema and Model
## AircraftTypes
- Form Localization

2
controllers/AircraftTypes.php → controllers/AircraftType.php
View File

@ -3,7 +3,7 @@
use Backend\Classes\Controller; use Backend\Classes\Controller;
use BackendMenu; use BackendMenu;
class AircraftTypes extends Controller class AircraftType extends Controller
{ {
public $implement = ['Backend\Behaviors\ListController', 'Backend\Behaviors\FormController']; public $implement = ['Backend\Behaviors\ListController', 'Backend\Behaviors\FormController'];

2
controllers/aircrafttypes/_list_toolbar.htm → controllers/aircrafttype/_list_toolbar.htm
View File

@ -1,5 +1,5 @@
<div data-control="toolbar"> <div data-control="toolbar">
<a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes/create') ?>" class="btn btn-primary oc-icon-plus" <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype/create') ?>" class="btn btn-primary oc-icon-plus"
><?= e(trans('backend::lang.form.create')) ?></a ><?= e(trans('backend::lang.form.create')) ?></a
> >
<button <button

10
controllers/aircrafttype/config_form.yaml Normal file
View File

@ -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

4
controllers/aircrafttypes/config_list.yaml → controllers/aircrafttype/config_list.yaml
View File

@ -1,6 +1,6 @@
list: $/germanairlinesva/fleet/models/aircrafttype/columns.yaml list: $/germanairlinesva/fleet/models/aircrafttype/columns.yaml
modelClass: GermanAirlinesVa\Fleet\Models\AircraftType modelClass: GermanAirlinesVa\Fleet\Models\AircraftType
title: AircraftTypes title: Aircraft Types
noRecordsMessage: 'backend::lang.list.no_records' noRecordsMessage: 'backend::lang.list.no_records'
showSetup: true showSetup: true
showCheckboxes: true showCheckboxes: true
@ -9,4 +9,4 @@ toolbar:
buttons: list_toolbar buttons: list_toolbar
search: search:
prompt: 'backend::lang.list.search_prompt' prompt: 'backend::lang.list.search_prompt'
recordUrl: 'germanairlinesva/fleet/aircrafttypes/update/:id' recordUrl: 'germanairlinesva/fleet/aircrafttype/update/:id'

6
controllers/aircrafttypes/create.htm → controllers/aircrafttype/create.htm
View File

@ -1,6 +1,6 @@
<?php Block::put('breadcrumb') ?> <?php Block::put('breadcrumb') ?>
<ul> <ul>
<li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>">AircraftTypes</a></li> <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>">Aircraft Types</a></li>
<li><?= e($this->pageTitle) ?></li> <li><?= e($this->pageTitle) ?></li>
</ul> </ul>
<?php Block::endPut() ?> <?php Block::endPut() ?>
@ -35,7 +35,7 @@
</button> </button>
<span class="btn-text"> <span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <?= e(trans('backend::lang.form.or')) ?>
<a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>" <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>"
><?= e(trans('backend::lang.form.cancel')) ?></a ><?= e(trans('backend::lang.form.cancel')) ?></a
> >
</span> </span>
@ -47,7 +47,7 @@
<?php else: ?> <?php else: ?>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p> <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p> <p>
<a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>" class="btn btn-default" <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>" class="btn btn-default"
><?= e(trans('backend::lang.form.return_to_list')) ?></a ><?= e(trans('backend::lang.form.return_to_list')) ?></a
> >
</p> </p>

0
controllers/aircrafttypes/index.htm → controllers/aircrafttype/index.htm
View File

4
controllers/aircrafttypes/preview.htm → controllers/aircrafttype/preview.htm
View File

@ -1,6 +1,6 @@
<?php Block::put('breadcrumb') ?> <?php Block::put('breadcrumb') ?>
<ul> <ul>
<li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>">AircraftTypes</a></li> <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>">Aircraft Types</a></li>
<li><?= e($this->pageTitle) ?></li> <li><?= e($this->pageTitle) ?></li>
</ul> </ul>
<?php Block::endPut() ?> <?php Block::endPut() ?>
@ -14,7 +14,7 @@
<?php endif ?> <?php endif ?>
<p> <p>
<a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>" class="btn btn-default oc-icon-chevron-left"> <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>" class="btn btn-default oc-icon-chevron-left">
<?= e(trans('backend::lang.form.return_to_list')) ?> <?= e(trans('backend::lang.form.return_to_list')) ?>
</a> </a>
</p> </p>

6
controllers/aircrafttypes/update.htm → controllers/aircrafttype/update.htm
View File

@ -1,6 +1,6 @@
<?php Block::put('breadcrumb') ?> <?php Block::put('breadcrumb') ?>
<ul> <ul>
<li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>">AircraftTypes</a></li> <li><a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>">Aircraft Types</a></li>
<li><?= e($this->pageTitle) ?></li> <li><?= e($this->pageTitle) ?></li>
</ul> </ul>
<?php Block::endPut() ?> <?php Block::endPut() ?>
@ -44,7 +44,7 @@
<span class="btn-text"> <span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <?= e(trans('backend::lang.form.or')) ?>
<a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>" <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>"
><?= e(trans('backend::lang.form.cancel')) ?></a ><?= e(trans('backend::lang.form.cancel')) ?></a
> >
</span> </span>
@ -55,7 +55,7 @@
<?php else: ?> <?php else: ?>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p> <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p> <p>
<a href="<?= Backend::url('germanairlinesva/fleet/aircrafttypes') ?>" class="btn btn-default" <a href="<?= Backend::url('germanairlinesva/fleet/aircrafttype') ?>" class="btn btn-default"
><?= e(trans('backend::lang.form.return_to_list')) ?></a ><?= e(trans('backend::lang.form.return_to_list')) ?></a
> >
</p> </p>

10
controllers/aircrafttypes/config_form.yaml
View File

@ -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

30
lang/en/lang.php
View File

@ -17,6 +17,36 @@
'aircraft_type_groups' => [ 'aircraft_type_groups' => [
'comment' => 'Comment Identifying Aircraft Type Group', 'comment' => 'Comment Identifying Aircraft Type Group',
], ],
'aircraft_types' => [
'tabs' => [
'operational' => 'Operational',
'informational' => 'Informational',
'weights' => 'Weights',
],
'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' => [ 'menu' => [
'main' => 'GA Fleet', 'main' => 'GA Fleet',
'manufacturers' => 'Aircraft Manufacturers', 'manufacturers' => 'Aircraft Manufacturers',

26
models/AircraftType.php
View File

@ -24,7 +24,31 @@ class AircraftType extends Model
/** /**
* @var array Validation rules * @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 = [ public $belongsTo = [
'aircraft_manufacturer' => 'GermanAirlinesVa\Fleet\Models\AircraftManufacturer', 'aircraft_manufacturer' => 'GermanAirlinesVa\Fleet\Models\AircraftManufacturer',

92
models/aircrafttype/fields.yaml
View File

@ -1,145 +1,145 @@
tabs: tabs:
fields: fields:
aircraft_manufacturer: aircraft_manufacturer:
label: Manufacturer label: 'germanairlinesva.fleet::lang.aircraft_types.aircraft_manufacturer'
nameFrom: name nameFrom: name
descriptionFrom: description descriptionFrom: description
span: auto span: auto
required: 1 required: 1
type: relation type: relation
tab: Operational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
typerating_id: typerating_id:
label: Typerating label: 'germanairlinesva.fleet::lang.aircraft_types.typerating_id'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Operational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
only_charter: only_charter:
label: 'Charter Only' label: 'germanairlinesva.fleet::lang.aircraft_types.only_charter'
span: auto span: auto
required: 1 required: 1
type: switch type: switch
tab: Operational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
type: type:
label: Type label: 'germanairlinesva.fleet::lang.aircraft_types.type'
span: auto span: auto
required: 1 required: 1
type: text type: text
tab: Operational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
simbrief_type: simbrief_type:
label: 'SimBrief Type' label: 'germanairlinesva.fleet::lang.aircraft_types.simbrief_type'
span: auto span: auto
required: 1 required: 1
type: text type: text
tab: Operational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
aircraft_type_groups: aircraft_type_groups:
label: 'Aircraft Type Groups' label: 'germanairlinesva.fleet::lang.aircraft_types.aircraft_type_groups'
nameFrom: comment nameFrom: comment
descriptionFrom: description descriptionFrom: description
span: auto span: auto
required: 1 required: 1
type: relation type: relation
tab: Operational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.operational'
dom: dom:
label: DOM label: 'germanairlinesva.fleet::lang.aircraft_types.dom'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Weights tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
mpld: mpld:
label: 'Max Payload' label: 'germanairlinesva.fleet::lang.aircraft_types.mpld'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Weights tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
mzfm: mzfm:
label: 'Max ZFM' label: 'germanairlinesva.fleet::lang.aircraft_types.mzfm'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Weights tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
fuel_capacity: fuel_capacity:
label: 'Fuel Capacity' label: 'germanairlinesva.fleet::lang.aircraft_types.fuel_capacity'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Weights tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
mtom: mtom:
label: 'Max TOM' label: 'germanairlinesva.fleet::lang.aircraft_types.mtom'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Weights tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
mlam: mlam:
label: 'Max LAM' label: 'germanairlinesva.fleet::lang.aircraft_types.mlam'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Weights tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.weights'
description: description:
label: Description label: 'germanairlinesva.fleet::lang.aircraft_types.description'
size: large size: large
span: auto span: auto
required: 1 required: 1
type: richeditor type: richeditor
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
wingspan: wingspan:
label: Wingspan label: 'germanairlinesva.fleet::lang.aircraft_types.wingspan'
span: auto span: auto
required: 1 required: 1
type: text type: text
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
length: length:
label: Length label: 'germanairlinesva.fleet::lang.aircraft_types.length'
span: auto span: auto
required: 1 required: 1
type: text type: text
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
cruise_speed: cruise_speed:
label: 'Cruise Speed' label: 'germanairlinesva.fleet::lang.aircraft_types.cruise_speed'
span: auto span: auto
required: 1 required: 1
type: text type: text
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
range: range:
label: Range label: 'germanairlinesva.fleet::lang.aircraft_types.range'
span: auto span: auto
required: 1 required: 1
type: text type: text
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
engines: engines:
label: Engines label: 'germanairlinesva.fleet::lang.aircraft_types.engines'
span: auto span: auto
required: 1 required: 1
type: text type: text
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
max_fl: max_fl:
label: 'Max FL' label: 'germanairlinesva.fleet::lang.aircraft_types.max_fl'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
capacity_flight_crew: capacity_flight_crew:
label: 'Flight Crew' label: 'germanairlinesva.fleet::lang.aircraft_types.capacity_flight_crew'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
capacity_cabin_crew: capacity_cabin_crew:
label: 'Cabin Crew' label: 'germanairlinesva.fleet::lang.aircraft_types.capacity_cabin_crew'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
capacity_passengers: capacity_passengers:
label: Passengers label: 'germanairlinesva.fleet::lang.aircraft_types.capacity_passengers'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'
capacity_cargo: capacity_cargo:
label: Cargo label: 'germanairlinesva.fleet::lang.aircraft_types.capacity_cargo'
span: auto span: auto
required: 1 required: 1
type: number type: number
tab: Informational tab: 'germanairlinesva.fleet::lang.aircraft_types.tabs.informational'