aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--database/migrations/2020_01_03_190703_remove_mediopassive_voice.php32
-rw-r--r--resources/views/trainer.blade.php2
2 files changed, 33 insertions, 1 deletions
diff --git a/database/migrations/2020_01_03_190703_remove_mediopassive_voice.php b/database/migrations/2020_01_03_190703_remove_mediopassive_voice.php
new file mode 100644
index 0000000..beddf3e
--- /dev/null
+++ b/database/migrations/2020_01_03_190703_remove_mediopassive_voice.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+use HebrewParseTrainer\Form;
+
+class RemoveMediopassiveVoice extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Form::where('voice', 'MP')->update(['voice' => 'M']);
+
+ DB::statement("ALTER TABLE forms CHANGE COLUMN voice voice ENUM('A', 'M', 'P') NOT NULL");
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ DB::statement("ALTER TABLE forms CHANGE COLUMN voice voice ENUM('A', 'M', 'P', 'MP') NOT NULL");
+ }
+}
diff --git a/resources/views/trainer.blade.php b/resources/views/trainer.blade.php
index ef1e43a..15afb08 100644
--- a/resources/views/trainer.blade.php
+++ b/resources/views/trainer.blade.php
@@ -54,7 +54,7 @@ use HebrewParseTrainer\Tense;
<p>
<strong>Tempora</strong> (tijden): gebruik de afkortingen pr(aesens), imp(er)f(ectum), aor(istus), fut(urum), p(er)f(ectum) en p(lus)q(uam)p(er)f(ectum).<br/>
<strong>Modi</strong> (wijzen): ind(icativus), conj(unctivus), opt(ativus), imp!(erativus), p(ar)t(i)c(ipium), inf(initivus).<br/>
- <strong>Genera</strong>: Act(ivum), Med(ium), Pass(ivum), Med(io)-Pass(ivum) (als Medium en Passivum samenvallen).<br/>
+ <strong>Genera</strong>: Act(ivum), Med(ium), Pass(ivum).<br/>
<strong>Persoon</strong> (indien van toepassing): 1, 2 of 3.<br/>
<strong>Geslacht</strong> (indien van toepassing): M(asculinum), F(emininum), N(eutrum).<br/>
<strong>Naamval</strong> (indien van toepassing): nom(inativus), gen(itivus), dat(ivus), acc(usativus).<br/>