Create adjustments

README.md

@@ -4,10 +4,12 @@
 
 - HasMany AircraftTypes (External DB)
 - HasMany ExamTyperatingQuestion
+- HasMany ExamTyperating
 
 ## MemberRank
 
 - HasMany ExamMemberRankQuestion
+- HasMany ExamMemberRank
 
 ## ExamMemberRankQuestion
 
@@ -34,13 +36,13 @@
 ## ExamMemberRank
 
 - BelongsTo MemberRank
-- **TODO** BelongsTo Member (External DB)
+- BelongsTo Member (External DB, creation in Social Plugin)
 - BelongsToMany ExamMemberRankQuestion
 - BelongsToMany ExamMemberRankAnswers
 
 ## ExamTyperating
 
 - BelongsTo Typerating
-- **TODO** BelongsTo Member (External DB)
+- BelongsTo Member (External DB, creation in Social Plugin)
 - BelongsToMany ExamTyperatingQuestion
 - BelongsToMany ExamTyperatingAnswers

controllers/ExamMemberRank.php

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

controllers/ExamMemberRankAnswer.php

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

controllers/ExamMemberRankQuestion.php

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

controllers/ExamTyperating.php

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

controllers/ExamTyperatingAnswer.php

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

controllers/ExamTyperatingQuestion.php

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

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();

models/ExamMemberRank.php

@@ -33,6 +33,7 @@ class ExamMemberRank extends Model
 
   public $belongsTo = [
     'member_rank' => 'GermanAirlinesVa\Schooling\Models\MemberRank',
+    'member' => 'GermanAirlinesVa\Social\Models\Member',
   ];
 
   public $belongsToMany = [
@@ -63,4 +64,55 @@ class ExamMemberRank extends Model
       $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/ExamTyperating.php

@@ -27,12 +27,11 @@ 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 = [
@@ -63,4 +62,55 @@ class ExamTyperating extends Model
       $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/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

@@ -31,7 +31,7 @@ class BuilderTableCreateExamExamAnswerExamQuestion extends Migration
   public function down()
   {
     Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints();
-    Schema::dropIfExists('germanairlinesva_schooling_exam_exam_answer_exam_question');
+    Schema::connection('germanairlinesva_schooling')->dropIfExists('exam_exam_answer_exam_question');
-    Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints();
+    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();
   }
 }