From ad6e4b2943b42ebb9d4b73979dc11d0ac3bdb028 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sat, 14 Aug 2021 18:30:00 +0200 Subject: [PATCH] Member FK --- README.md | 4 ++-- models/ExamMemberRank.php | 1 + models/ExamTyperating.php | 1 + models/exammemberrank/columns.yaml | 8 +++++--- models/examtyperating/columns.yaml | 8 +++++--- updates/builder_table_create_exam_answers.php | 2 ++ ...uilder_table_create_exam_exam_answer_exam_question.php | 4 ++-- updates/builder_table_create_exams.php | 2 ++ 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 7d2bcd4..ef44031 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,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 diff --git a/models/ExamMemberRank.php b/models/ExamMemberRank.php index a104c0c..4131000 100644 --- a/models/ExamMemberRank.php +++ b/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 = [ diff --git a/models/ExamTyperating.php b/models/ExamTyperating.php index 78ef19c..a94d463 100644 --- a/models/ExamTyperating.php +++ b/models/ExamTyperating.php @@ -33,6 +33,7 @@ class ExamTyperating extends Model public $belongsTo = [ 'typerating' => 'GermanAirlinesVa\Schooling\Models\Typerating', + 'member' => 'GermanAirlinesVa\Social\Models\Member', ]; public $belongsToMany = [ diff --git a/models/exammemberrank/columns.yaml b/models/exammemberrank/columns.yaml index a43f2f9..66f4f6a 100644 --- a/models/exammemberrank/columns.yaml +++ b/models/exammemberrank/columns.yaml @@ -2,9 +2,11 @@ columns: id: label: id type: number - member_id: - label: member_id - type: number + member: + label: member + type: text + relation: member + valueFrom: name member_rank: label: member_rank type: text diff --git a/models/examtyperating/columns.yaml b/models/examtyperating/columns.yaml index aa525fb..eaca274 100644 --- a/models/examtyperating/columns.yaml +++ b/models/examtyperating/columns.yaml @@ -2,9 +2,11 @@ columns: id: label: id type: number - member_id: - label: member_id - type: number + member: + label: member + type: text + relation: member + valueFrom: name typerating: label: typerating type: text diff --git a/updates/builder_table_create_exam_answers.php b/updates/builder_table_create_exam_answers.php index bb0fd9a..37f9d93 100644 --- a/updates/builder_table_create_exam_answers.php +++ b/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(); } } diff --git a/updates/builder_table_create_exam_exam_answer_exam_question.php b/updates/builder_table_create_exam_exam_answer_exam_question.php index 0b17980..ee59927 100644 --- a/updates/builder_table_create_exam_exam_answer_exam_question.php +++ b/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')->disableForeignKeyConstraints(); + Schema::connection('germanairlinesva_schooling')->dropIfExists('exam_exam_answer_exam_question'); + Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints(); } } diff --git a/updates/builder_table_create_exams.php b/updates/builder_table_create_exams.php index 3a29f89..00d6d30 100644 --- a/updates/builder_table_create_exams.php +++ b/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(); } }