Create adjustments

README.md

@@ -4,37 +4,45 @@
 
 - HasMany AircraftTypes (External DB)
 - HasMany ExamTyperatingQuestion
+- HasMany ExamTyperating
 
 ## MemberRank
 
 - HasMany ExamMemberRankQuestion
+- HasMany ExamMemberRank
 
 ## ExamMemberRankQuestion
 
 - BelongsTo MemberRank
 - HasMany ExamMemberRankAnswer
+- BelongsToMany ExamMemberRank
 
 ## ExamTyperatingQuestion
 
 - BelongsTo Typerating
 - HasMany ExamTyperatingAnswer
+- BelongsToMany ExamTyperating
 
 ## ExamMemberRankAnswer
 
 - BelongsTo ExamMemberRankQuestion
+- BelongsToMany ExamMemberRank
 
 ## ExamTyperatingAnswer
 
 - BelongsTo ExamTyperatingQuestion
+- BelongsToMany ExamTyperating
 
 ## ExamMemberRank
 
 - BelongsTo MemberRank
-- **TODO** BelongsTo Member (External DB)
+- BelongsTo Member (External DB, creation in Social Plugin)
-- **TODO** HasMany ExamMemberRankQuestion
+- BelongsToMany ExamMemberRankQuestion
+- BelongsToMany ExamMemberRankAnswers
 
 ## ExamTyperating
 
 - BelongsTo Typerating
-- **TODO** BelongsTo Member (External DB)
+- BelongsTo Member (External DB, creation in Social Plugin)
-- **TODO** HasMany ExamTyperatingQuestion
+- BelongsToMany ExamTyperatingQuestion
+- BelongsToMany ExamTyperatingAnswers

controllers/ExamMemberRank.php

@@ -8,13 +8,10 @@ class ExamMemberRank extends Controller
 
   public $listConfig = 'config_list.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.schooling.master'];
+
   public function __construct()
   {
     parent::__construct();
   }
-
-  public function listExtendQuery($query)
-  {
-    $query->where('member_rank_id', '<>', null);
-  }
 }

controllers/ExamMemberRankAnswer.php

@@ -9,14 +9,10 @@ class ExamMemberRankAnswer extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.schooling.master'];
+
   public function __construct()
   {
     parent::__construct();
   }
-
-  public function listExtendQuery($query)
-  {
-    $query->leftJoin('exam_questions', 'exam_questions.id', 'exam_answers.exam_question_id');
-    $query->where('exam_questions.member_rank_id', '<>', null);
-  }
 }

controllers/ExamMemberRankQuestion.php

@@ -9,13 +9,10 @@ class ExamMemberRankQuestion extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.schooling.master'];
+
   public function __construct()
   {
     parent::__construct();
   }
-
-  public function listExtendQuery($query)
-  {
-    $query->where('member_rank_id', '<>', null);
-  }
 }

controllers/ExamTyperating.php

@@ -8,13 +8,10 @@ class ExamTyperating extends Controller
 
   public $listConfig = 'config_list.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.schooling.master'];
+
   public function __construct()
   {
     parent::__construct();
   }
-
-  public function listExtendQuery($query)
-  {
-    $query->where('typerating_id', '<>', null);
-  }
 }

controllers/ExamTyperatingAnswer.php

@@ -9,14 +9,10 @@ class ExamTyperatingAnswer extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.schooling.master'];
+
   public function __construct()
   {
     parent::__construct();
   }
-
-  public function listExtendQuery($query)
-  {
-    $query->leftJoin('exam_questions', 'exam_questions.id', 'exam_answers.exam_question_id');
-    $query->where('exam_questions.typerating_id', '<>', null);
-  }
 }

controllers/ExamTyperatingQuestion.php

@@ -9,13 +9,10 @@ class ExamTyperatingQuestion extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.schooling.master'];
+
   public function __construct()
   {
     parent::__construct();
   }
-
-  public function listExtendQuery($query)
-  {
-    $query->where('typerating_id', '<>', null);
-  }
 }

controllers/MemberRank.php

@@ -9,6 +9,8 @@ class MemberRank extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.schooling.master'];
+
   public function __construct()
   {
     parent::__construct();

controllers/Typerating.php

@@ -9,6 +9,8 @@ class Typerating extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.schooling.master'];
+
   public function __construct()
   {
     parent::__construct();

controllers/examtyperatinganswer/config_form.yaml

@@ -1,6 +1,6 @@
 name: Exam Typerating Answer
 form: $/germanairlinesva/schooling/models/examtyperatinganswer/fields.yaml
-modelClass: GermanAirlinesVa\Schooling\Models\ExamMemberRankAnswer
+modelClass: GermanAirlinesVa\Schooling\Models\ExamTyperatingAnswer
 defaultRedirect: germanairlinesva/schooling/examtyperatinganswer
 create:
   redirect: 'germanairlinesva/schooling/examtyperatinganswer/update/:id'

controllers/examtyperatinganswer/config_list.yaml

@@ -1,5 +1,5 @@
 list: $/germanairlinesva/schooling/models/examtyperatinganswer/columns.yaml
-modelClass: GermanAirlinesVa\Schooling\Models\ExamMemberRankAnswer
+modelClass: GermanAirlinesVa\Schooling\Models\ExamTyperatingAnswer
 title: Exam Typerating Answers
 noRecordsMessage: 'backend::lang.list.no_records'
 showSetup: true

models/ExamMemberRank.php

@@ -33,5 +33,86 @@ class ExamMemberRank extends Model
 
   public $belongsTo = [
     'member_rank' => 'GermanAirlinesVa\Schooling\Models\MemberRank',
+    'member' => 'GermanAirlinesVa\Social\Models\Member',
   ];
+
+  public $belongsToMany = [
+    'exam_questions' => [
+      'GermanAirlinesVa\Schooling\Models\ExamMemberRankQuestion',
+      'table' => 'exam_exam_answer_exam_question',
+      'key' => 'exam_id',
+      'otherKey' => 'exam_question_id',
+    ],
+    'exam_answers' => [
+      'GermanAirlinesVa\Schooling\Models\ExamMemberRankAnswer',
+      'table' => 'exam_exam_answer_exam_question',
+      'key' => 'exam_id',
+      'otherKey' => 'exam_answer_id',
+    ],
+  ];
+
+  /**
+   * The "booting" method of the model.
+   *
+   * @return void
+   */
+  protected static function boot()
+  {
+    parent::boot();
+
+    static::addGlobalScope('exam_member_rank_member_rank_id', function ($builder) {
+      $builder->where('member_rank_id', '<>', null);
+    });
+  }
+
+  public static function createNew($member_id, $member_rank_id)
+  {
+    $exam = new ExamMemberRank();
+    $exam->member_id = $member_id;
+    $exam->member_rank_id = $member_rank_id;
+
+    $entry = [];
+    $questions = ExamMemberRankQuestion::where('member_rank_id', $member_rank_id)
+      ->get()
+      ->random(10);
+    foreach ($questions as $question) {
+      array_push($entry, ['exam_question_id' => $question->id]);
+    }
+
+    $exam->exam_questions = $entry;
+    $exam->save();
+    return $exam;
+  }
+
+  public function grade()
+  {
+    $this->load([
+      'exam_questions' => function ($query) {
+        $query->groupBy('id');
+      },
+    ]);
+    $returnVal = [];
+    $returnGrade = 0;
+    foreach ($this->exam_questions as $question) {
+      $answers = $question->exam_answers;
+      $returnAnswers = [];
+      $returnAnswerGrade = true;
+      foreach ($answers as $answer) {
+        $given = $this->exam_answers->contains($answer->id);
+        array_push($returnAnswers, [
+          'answer' => $answer,
+          'status' => $given,
+          'grade' => $given == $answer->is_correct,
+        ]);
+        $returnAnswerGrade = $returnAnswerGrade && $given == $answer->is_correct;
+      }
+      array_push($returnVal, [
+        'question' => $question,
+        'answers' => $returnAnswers,
+        'grade' => $returnAnswerGrade,
+      ]);
+      $returnGrade = $returnAnswerGrade ? $returnGrade + 1 : $returnGrade;
+    }
+    return ['exam' => $returnVal, 'grade' => $returnGrade];
+  }
 }

models/ExamMemberRankAnswer.php

@@ -33,4 +33,29 @@ class ExamMemberRankAnswer extends Model
   public $belongsTo = [
     'exam_question' => ['GermanAirlinesVa\Schooling\Models\ExamMemberRankQuestion', 'key' => 'exam_question_id'],
   ];
+
+  public $belongsToMany = [
+    'exam_member_ranks' => [
+      'GermanAirlinesVa\Schooling\Models\ExamMemberRank',
+      'table' => 'exam_exam_answer_exam_question',
+      'key' => 'exam_answer_id',
+      'otherKey' => 'exam_id',
+    ],
+  ];
+
+  /**
+   * The "booting" method of the model.
+   *
+   * @return void
+   */
+  protected static function boot()
+  {
+    parent::boot();
+
+    static::addGlobalScope('exam_member_rank_answer_member_rank_id', function ($builder) {
+      $builder->whereHas('exam_question', function ($query) {
+        $query->where('member_rank_id', '<>', null);
+      });
+    });
+  }
 }

models/ExamMemberRankQuestion.php

@@ -32,10 +32,33 @@ class ExamMemberRankQuestion extends Model
   ];
 
   public $hasMany = [
-    'exam_answers' => 'GermanAirlinesVa\Schooling\Models\ExamMemberRankAnswer',
+    'exam_answers' => ['GermanAirlinesVa\Schooling\Models\ExamMemberRankAnswer', 'key' => 'exam_question_id'],
   ];
 
   public $belongsTo = [
     'member_rank' => 'GermanAirlinesVa\Schooling\Models\MemberRank',
   ];
+
+  public $belongsToMany = [
+    'exam_member_ranks' => [
+      'GermanAirlinesVa\Schooling\Models\ExamMemberRank',
+      'table' => 'exam_exam_answer_exam_question',
+      'key' => 'exam_question_id',
+      'otherKey' => 'exam_id',
+    ],
+  ];
+
+  /**
+   * The "booting" method of the model.
+   *
+   * @return void
+   */
+  protected static function boot()
+  {
+    parent::boot();
+
+    static::addGlobalScope('exam_member_rank_question_member_rank_id', function ($builder) {
+      $builder->where('member_rank_id', '<>', null);
+    });
+  }
 }

models/ExamTyperating.php

@@ -27,11 +27,90 @@ class ExamTyperating extends Model
   public $rules = [
     'member_id' => 'required',
     'typerating_id' => 'required',
-    'start' => 'required',
-    'status' => 'required',
   ];
 
   public $belongsTo = [
     'typerating' => 'GermanAirlinesVa\Schooling\Models\Typerating',
+    'member' => 'GermanAirlinesVa\Social\Models\Member',
   ];
+
+  public $belongsToMany = [
+    'exam_questions' => [
+      'GermanAirlinesVa\Schooling\Models\ExamTyperatingQuestion',
+      'table' => 'exam_exam_answer_exam_question',
+      'key' => 'exam_id',
+      'otherKey' => 'exam_question_id',
+    ],
+    'exam_answers' => [
+      'GermanAirlinesVa\Schooling\Models\ExamTyperatingAnswer',
+      'table' => 'exam_exam_answer_exam_question',
+      'key' => 'exam_id',
+      'otherKey' => 'exam_answer_id',
+    ],
+  ];
+
+  /**
+   * The "booting" method of the model.
+   *
+   * @return void
+   */
+  protected static function boot()
+  {
+    parent::boot();
+
+    static::addGlobalScope('exam_typerating_typerating_id', function ($builder) {
+      $builder->where('typerating_id', '<>', null);
+    });
+  }
+
+  public static function createNew($member_id, $typerating_id)
+  {
+    $exam = new ExamTyperating();
+    $exam->member_id = $member_id;
+    $exam->typerating_id = $typerating_id;
+
+    $entry = [];
+    $questions = ExamTyperatingQuestion::where('typerating_id', $typerating_id)
+      ->get()
+      ->random(10);
+    foreach ($questions as $question) {
+      array_push($entry, ['exam_question_id' => $question->id]);
+    }
+
+    $exam->exam_questions = $entry;
+    $exam->save();
+    return $exam;
+  }
+
+  public function grade()
+  {
+    $this->load([
+      'exam_questions' => function ($query) {
+        $query->groupBy('id');
+      },
+    ]);
+    $returnVal = [];
+    $returnGrade = 0;
+    foreach ($this->exam_questions as $question) {
+      $answers = $question->exam_answers;
+      $returnAnswers = [];
+      $returnAnswerGrade = true;
+      foreach ($answers as $answer) {
+        $given = $this->exam_answers->contains($answer->id);
+        array_push($returnAnswers, [
+          'answer' => $answer,
+          'status' => $given,
+          'grade' => $given == $answer->is_correct,
+        ]);
+        $returnAnswerGrade = $returnAnswerGrade && $given == $answer->is_correct;
+      }
+      array_push($returnVal, [
+        'question' => $question,
+        'answers' => $returnAnswers,
+        'grade' => $returnAnswerGrade,
+      ]);
+      $returnGrade = $returnAnswerGrade ? $returnGrade + 1 : $returnGrade;
+    }
+    return ['exam' => $returnVal, 'grade' => $returnGrade];
+  }
 }

models/ExamTyperatingAnswer.php

@@ -1,6 +1,7 @@
 <?php namespace GermanAirlinesVa\Schooling\Models;
 
 use Model;
+use Illuminate\Database\Eloquent\Builder;
 
 /**
  * Model
@@ -33,4 +34,29 @@ class ExamTyperatingAnswer extends Model
   public $belongsTo = [
     'exam_question' => ['GermanAirlinesVa\Schooling\Models\ExamTyperatingQuestion', 'key' => 'exam_question_id'],
   ];
+
+  public $belongsToMany = [
+    'exam_typeratings' => [
+      'GermanAirlinesVa\Schooling\Models\ExamTyperating',
+      'table' => 'exam_exam_answer_exam_question',
+      'key' => 'exam_answer_id',
+      'otherKey' => 'exam_id',
+    ],
+  ];
+
+  /**
+   * The "booting" method of the model.
+   *
+   * @return void
+   */
+  protected static function boot()
+  {
+    parent::boot();
+
+    static::addGlobalScope('exam_typerating_answer_typerating_id', function (Builder $builder) {
+      $builder->whereHas('exam_question', function ($query) {
+        $query->where('typerating_id', '<>', null);
+      });
+    });
+  }
 }

models/ExamTyperatingQuestion.php

@@ -32,10 +32,33 @@ class ExamTyperatingQuestion extends Model
   ];
 
   public $hasMany = [
-    'exam_answers' => 'GermanAirlinesVa\Schooling\Models\ExamTyperatingAnswer',
+    'exam_answers' => ['GermanAirlinesVa\Schooling\Models\ExamTyperatingAnswer', 'key' => 'exam_question_id'],
   ];
 
   public $belongsTo = [
     'typerating' => 'GermanAirlinesVa\Schooling\Models\Typerating',
   ];
+
+  public $belongsToMany = [
+    'exam_typeratings' => [
+      'GermanAirlinesVa\Schooling\Models\ExamTyperating',
+      'table' => 'exam_exam_answer_exam_question',
+      'key' => 'exam_question_id',
+      'otherKey' => 'exam_id',
+    ],
+  ];
+
+  /**
+   * The "booting" method of the model.
+   *
+   * @return void
+   */
+  protected static function boot()
+  {
+    parent::boot();
+
+    static::addGlobalScope('exam_typerating_question_typerating_id', function ($builder) {
+      $builder->where('typerating_id', '<>', null);
+    });
+  }
 }

models/MemberRank.php

@@ -35,5 +35,6 @@ class MemberRank extends Model
 
   public $hasMany = [
     'exam_questions' => 'GermanAirlinesVa\Schooling\Models\ExamMemberRankQuestion',
+    'exams' => 'GermanAirlinesVa\Schooling\Models\ExamMemberRank',
   ];
 }

models/Typerating.php

@@ -29,5 +29,6 @@ class Typerating extends Model
   public $hasMany = [
     'aircraft_types' => 'GermanAirlinesVa\Fleet\Models\AircraftType',
     'exam_questions' => 'GermanAirlinesVa\Schooling\Models\ExamTyperatingQuestion',
+    'exams' => 'GermanAirlinesVa\Schooling\Models\ExamTyperating',
   ];
 }

models/exammemberrank/columns.yaml

@@ -2,9 +2,11 @@ columns:
   id:
     label: id
     type: number
-  member_id:
+  member:
-    label: member_id
+    label: member
-    type: number
+    type: text
+    relation: member
+    valueFrom: name
   member_rank:
     label: member_rank
     type: text

models/examtyperating/columns.yaml

@@ -2,9 +2,11 @@ columns:
   id:
     label: id
     type: number
-  member_id:
+  member:
-    label: member_id
+    label: member
-    type: number
+    type: text
+    relation: member
+    valueFrom: name
   typerating:
     label: typerating
     type: text

plugin.yaml

@@ -10,7 +10,7 @@ navigation:
     url: /
     icon: icon-university
     permissions:
-      - schooling
+      - germanairlinesva.schooling.master
     sideMenu:
       side-menu-item:
         label: 'germanairlinesva.schooling::lang.menu.typeratings'
@@ -45,6 +45,6 @@ navigation:
         url: germanairlinesva/schooling/examtyperating
         icon: icon-file-text
 permissions:
-  schooling:
+  germanairlinesva.schooling.master:
     tab: 'germanairlinesva.schooling::lang.permissions.tab'
     label: 'germanairlinesva.schooling::lang.permissions.label'

updates/builder_table_create_deferred_bindings.php

@@ -1,4 +1,4 @@
-<?php namespace GermanAirlinesVa\Fleet\Updates;
+<?php namespace GermanAirlinesVa\Schooling\Updates;
 
 use Schema;
 use October\Rain\Database\Updates\Migration;

updates/builder_table_create_exam_answers.php

@@ -22,6 +22,8 @@ class BuilderTableCreateExamAnswers extends Migration
 
   public function down()
   {
+    Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints();
     Schema::connection('germanairlinesva_schooling')->dropIfExists('exam_answers');
+    Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints();
   }
 }

updates/builder_table_create_exam_exam_answer_exam_question.php

@@ -0,0 +1,37 @@
+<?php namespace GermanAirlinesVa\Schooling\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableCreateExamExamAnswerExamQuestion extends Migration
+{
+  public function up()
+  {
+    Schema::connection('germanairlinesva_schooling')->create('exam_exam_answer_exam_question', function ($table) {
+      $table->engine = 'InnoDB';
+      $table->bigIncrements('id')->unsigned();
+      $table->bigInteger('exam_id')->unsigned();
+      $table
+        ->foreign('exam_id')
+        ->references('id')
+        ->on('exams');
+      $table->bigInteger('exam_answer_id')->unsigned();
+      $table
+        ->foreign('exam_answer_id')
+        ->references('id')
+        ->on('exam_answers');
+      $table->bigInteger('exam_question_id')->unsigned();
+      $table
+        ->foreign('exam_question_id')
+        ->references('id')
+        ->on('exam_questions');
+    });
+  }
+
+  public function down()
+  {
+    Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints();
+    Schema::connection('germanairlinesva_schooling')->dropIfExists('exam_exam_answer_exam_question');
+    Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints();
+  }
+}

updates/builder_table_create_exams.php

@@ -35,6 +35,8 @@ class BuilderTableCreateExams extends Migration
 
   public function down()
   {
+    Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints();
     Schema::connection('germanairlinesva_schooling')->dropIfExists('exams');
+    Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints();
   }
 }

updates/version.yaml

@@ -13,3 +13,5 @@
   - builder_table_create_exam_answers.php
   - 'Created table exams'
   - builder_table_create_exams.php
+  - 'Created table exam_exam_answer_exam_question'
+  - builder_table_create_exam_exam_answer_exam_question.php

yarn.lock

@@ -41,9 +41,9 @@ p-defer@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
   integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
-"php-parser@git+https://github.com/glayzzle/php-parser.git#e61e26102144f267ecf5e09020865a9baa6ca2f1":
+"php-parser@https://github.com/glayzzle/php-parser#e61e26102144f267ecf5e09020865a9baa6ca2f1":
   version "3.0.2"
-  resolved "git+https://github.com/glayzzle/php-parser.git#e61e26102144f267ecf5e09020865a9baa6ca2f1"
+  resolved "https://github.com/glayzzle/php-parser#e61e26102144f267ecf5e09020865a9baa6ca2f1"
 
 prettier@^2.3.2:
   version "2.3.2"