controllers/ExamMemberRankQuestion.php

@@ -1,17 +0,0 @@
-<?php namespace GermanAirlinesVa\Schooling\Controllers;
-
-use Backend\Classes\Controller;
-use BackendMenu;
-
-class ExamMemberRankQuestion 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();
-  }
-}

controllers/exammemberrankquestion/_list_toolbar.htm

@@ -1,23 +0,0 @@
-<div data-control="toolbar">
-  <a
-    href="<?= Backend::url('germanairlinesva/schooling/exammemberrankquestion/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>

controllers/exammemberrankquestion/config_form.yaml

@@ -1,10 +0,0 @@
-name: Exam Member Rank Question
-form: $/germanairlinesva/schooling/models/exammemberrankquestion/fields.yaml
-modelClass: GermanAirlinesVa\Schooling\Models\ExamMemberRankQuestion
-defaultRedirect: germanairlinesva/schooling/exammemberrankquestion
-create:
-  redirect: 'germanairlinesva/schooling/exammemberrankquestion/update/:id'
-  redirectClose: germanairlinesva/schooling/exammemberrankquestion
-update:
-  redirect: germanairlinesva/schooling/exammemberrankquestion
-  redirectClose: germanairlinesva/schooling/exammemberrankquestion

controllers/exammemberrankquestion/config_list.yaml

@@ -1,12 +0,0 @@
-list: $/germanairlinesva/schooling/models/exammemberrankquestion/columns.yaml
-modelClass: GermanAirlinesVa\Schooling\Models\ExamMemberRankQuestion
-title: Exam Member Rank Questions
-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/schooling/exammemberrankquestion/update/:id'

controllers/exammemberrankquestion/create.htm

@@ -1,56 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-<ul>
-  <li>
-    <a href="<?= Backend::url('germanairlinesva/schooling/exammemberrankquestion') ?>">Exam Member Rank Questions</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/schooling/exammemberrankquestion') ?>"
-        ><?= 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/schooling/exammemberrankquestion') ?>" class="btn btn-default"
-    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
-  >
-</p>
-<?php endif ?>

controllers/exammemberrankquestion/index.htm

@@ -1 +0,0 @@
-<?= $this->listRender() ?>

controllers/exammemberrankquestion/preview.htm

@@ -1,25 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-<ul>
-  <li>
-    <a href="<?= Backend::url('germanairlinesva/schooling/exammemberrankquestion') ?>">Exam Member Rank Questions</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/schooling/exammemberrankquestion') ?>"
-    class="btn btn-default oc-icon-chevron-left"
-  >
-    <?= e(trans('backend::lang.form.return_to_list')) ?>
-  </a>
-</p>

controllers/exammemberrankquestion/update.htm

@@ -1,64 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-<ul>
-  <li>
-    <a href="<?= Backend::url('germanairlinesva/schooling/exammemberrankquestion') ?>">Exam Member Rank Questions</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/schooling/exammemberrankquestion') ?>"
-        ><?= 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/schooling/exammemberrankquestion') ?>" class="btn btn-default"
-    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
-  >
-</p>
-<?php endif ?>

controllers/memberrank/_list_toolbar.htm

@@ -1,7 +1,5 @@
 <div data-control="toolbar">
-  <a href="<?= Backend::url('germanairlinesva/schooling/memberrank/create') ?>" class="btn btn-primary oc-icon-plus"
+        <a href="<?= Backend::url('germanairlinesva/schooling/memberrank/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?></a>
-    ><?= e(trans('backend::lang.form.create')) ?></a
-  >
             <button
         class="btn btn-default oc-icon-trash-o"
         disabled="disabled"
@@ -14,8 +12,7 @@
         data-trigger=".control-list input[type=checkbox]"
         data-trigger-condition="checked"
         data-request-success="$(this).prop('disabled', true)"
-    data-stripe-load-indicator
+        data-stripe-load-indicator>
-  >
         <?= e(trans('backend::lang.list.delete_selected')) ?>
     </button>
 </div>

controllers/memberrank/create.htm

@@ -7,10 +7,11 @@
 
 <?php if (!$this->fatalError): ?>
 
-<?= Form::open(['class' =>
+    <?= Form::open(['class' => 'layout']) ?>
-'layout']) ?>
 
-<div class="layout-row"><?= $this->formRender() ?></div>
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
 
         <div class="form-buttons">
             <div class="loading-indicator-container">
@@ -19,8 +20,7 @@
                     data-request="onSave"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-      class="btn btn-primary"
+                    class="btn btn-primary">
-    >
                     <?= e(trans('backend::lang.form.create')) ?>
                 </button>
                 <button 
@@ -29,15 +29,11 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-      class="btn btn-default"
+                    class="btn btn-default">
-    >
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>
                 <span class="btn-text">
-      <?= e(trans('backend::lang.form.or')) ?>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('germanairlinesva/schooling/memberrank') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
-      <a href="<?= Backend::url('germanairlinesva/schooling/memberrank') ?>"
-        ><?= e(trans('backend::lang.form.cancel')) ?></a
-      >
                 </span>
             </div>
         </div>
@@ -46,9 +42,5 @@
 
 <?php else: ?>
     <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-<p>
+    <p><a href="<?= Backend::url('germanairlinesva/schooling/memberrank') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
-  <a href="<?= Backend::url('germanairlinesva/schooling/memberrank') ?>" class="btn btn-default"
-    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
-  >
-</p>
 <?php endif ?>

controllers/memberrank/preview.htm

@@ -7,7 +7,9 @@
 
 <?php if (!$this->fatalError): ?>
 
-<div class="form-preview"><?= $this->formRenderPreview() ?></div>
+    <div class="form-preview">
+        <?= $this->formRenderPreview() ?>
+    </div>
 
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>

controllers/memberrank/update.htm

@@ -7,10 +7,11 @@
 
 <?php if (!$this->fatalError): ?>
 
-<?= Form::open(['class' =>
+    <?= Form::open(['class' => 'layout']) ?>
-'layout']) ?>
 
-<div class="layout-row"><?= $this->formRender() ?></div>
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
 
         <div class="form-buttons">
             <div class="loading-indicator-container">
@@ -20,8 +21,7 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-      class="btn btn-primary"
+                    class="btn btn-primary">
-    >
                     <?= e(trans('backend::lang.form.save')) ?>
                 </button>
                 <button
@@ -30,8 +30,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-      class="btn btn-default"
+                    class="btn btn-default">
-    >
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
                 <button
@@ -39,14 +38,11 @@
                     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')) ?>"
+                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>">
-    ></button>
+                </button>
 
                 <span class="btn-text">
-      <?= e(trans('backend::lang.form.or')) ?>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('germanairlinesva/schooling/memberrank') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
-      <a href="<?= Backend::url('germanairlinesva/schooling/memberrank') ?>"
-        ><?= e(trans('backend::lang.form.cancel')) ?></a
-      >
                 </span>
             </div>
         </div>
@@ -54,9 +50,5 @@
 
 <?php else: ?>
     <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-<p>
+    <p><a href="<?= Backend::url('germanairlinesva/schooling/memberrank') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
-  <a href="<?= Backend::url('germanairlinesva/schooling/memberrank') ?>" class="btn btn-default"
-    ><?= e(trans('backend::lang.form.return_to_list')) ?></a
-  >
-</p>
 <?php endif ?>

lang/en/lang.php

@@ -24,12 +24,4 @@
     'badge' => 'Badge',
     'region' => 'REGEX to Filter Allowed Regions of Flight',
   ],
-  'exam_question' => [
-    'rank' => 'Member Rank',
-    'typerating' => 'Typerating',
-    'in_use' => 'True if Question is Currently in use',
-    'mandatory' => 'True if Querstion is Mandatory',
-    'text' => 'Question text',
-    'picture' => 'Question Picture',
-  ],
 ];

models/ExamMemberRankQuestion.php

@@ -1,37 +0,0 @@
-<?php namespace GermanAirlinesVa\Schooling\Models;
-
-use Model;
-
-/**
- * Model
- */
-class ExamMemberRankQuestion 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 = 'exam_questions';
-  protected $connection = 'germanairlinesva_schooling';
-
-  /**
-   * @var array Validation rules
-   */
-  public $rules = [
-    'member_rank' => 'required',
-    'in_use' => 'required',
-    'mandatory' => 'required',
-    'text' => 'required',
-  ];
-
-  public $belongsTo = [
-    'member_rank' => 'GermanAirlinesVa\Schooling\Models\MemberRank',
-  ];
-}

models/Typerating.php

@@ -27,6 +27,6 @@ class Typerating extends Model
   public $rules = ['name' => 'required', 'price' => 'required'];
 
   public $hasMany = [
-    'aircraft_types' => 'GermanAirlinesVa\Fleet\Models\AircraftType',
+    'aircraft_types' => 'GermanAirlinesVa\Fleet',
   ];
 }

models/exammemberrankquestion/columns.yaml

@@ -1,19 +0,0 @@
-columns:
-  id:
-    label: id
-    type: text
-  member_rank_id:
-    label: member_rank_id
-    type: text
-  in_use:
-    label: in_use
-    type: text
-  mandatory:
-    label: mandatory
-    type: text
-  text:
-    label: text
-    type: text
-  picture:
-    label: picture
-    type: text

models/exammemberrankquestion/fields.yaml

@@ -1,29 +0,0 @@
-fields:
-  member_rank:
-    label: 'germanairlinesva.schooling::lang.exam_question.rank'
-    nameFrom: name
-    descriptionFrom: description
-    span: auto
-    required: 1
-    type: relation
-  in_use:
-    label: 'germanairlinesva.schooling::lang.exam_question.in_use'
-    span: auto
-    required: 1
-    type: switch
-  mandatory:
-    label: 'germanairlinesva.schooling::lang.exam_question.mandatory'
-    span: auto
-    required: 1
-    type: switch
-  text:
-    label: 'germanairlinesva.schooling::lang.exam_question.text'
-    size: large
-    span: auto
-    required: 1
-    type: richeditor
-  picture:
-    label: 'germanairlinesva.schooling::lang.exam_question.picture'
-    mode: file
-    span: auto
-    type: mediafinder

updates/builder_table_create_exam_questions.php

@@ -1,42 +0,0 @@
-<?php namespace GermanAirlinesVa\Schooling\Updates;
-
-use Schema;
-use October\Rain\Database\Updates\Migration;
-
-class BuilderTableCreateExamQuestions extends Migration
-{
-  public function up()
-  {
-    Schema::connection('germanairlinesva_schooling')->create('exam_questions', function ($table) {
-      $table->engine = 'InnoDB';
-      $table->bigIncrements('id')->unsigned();
-      $table
-        ->bigInteger('member_rank_id')
-        ->unsigned()
-        ->nullable();
-      $table
-        ->foreign('member_rank_id')
-        ->references('id')
-        ->on('member_ranks');
-      $table
-        ->bigInteger('typerating_id')
-        ->unsigned()
-        ->nullable();
-      $table
-        ->foreign('typerating_id')
-        ->references('id')
-        ->on('typeratings');
-      $table->boolean('in_use');
-      $table->boolean('mandatory');
-      $table->text('text');
-      $table->string('picture');
-    });
-  }
-
-  public function down()
-  {
-    Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints();
-    Schema::connection('germanairlinesva_schooling')->dropIfExists('exam_questions');
-    Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints();
-  }
-}

updates/version.yaml

@@ -7,5 +7,3 @@
   - builder_table_create_typeratings.php
   - 'Created table member_ranks'
   - builder_table_create_member_ranks.php
-  - 'Created table exam_questions'
-  - builder_table_create_exam_questions.php