From 45e2171ab1c820be52326c827ae30539f0721d8f Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Tue, 6 Sep 2016 19:56:01 +0200 Subject: Only show roots with active verbs on trainer page --- app/Root.php | 4 ++++ public/js/hebrewparsetrainer.js | 4 ++-- resources/views/trainer.blade.php | 8 +++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Root.php b/app/Root.php index 2e21c4e..4e5e9df 100644 --- a/app/Root.php +++ b/app/Root.php @@ -30,4 +30,8 @@ class Root extends Model { return $this->belongsTo('HebrewParseTrainer\RootKind', 'root_kind_id'); } + public function verbs() { + return $this->hasMany('HebrewParseTrainer\Verb', 'root', 'root'); + } + } diff --git a/public/js/hebrewparsetrainer.js b/public/js/hebrewparsetrainer.js index 292419d..e5666be 100644 --- a/public/js/hebrewparsetrainer.js +++ b/public/js/hebrewparsetrainer.js @@ -152,7 +152,7 @@ $(document).ready(function(){ var stems = $('input[name="stem"]:checked').map(function(){return this.value;}); var tenses = $('input[name="tense"]:checked').map(function(){return this.value;}); - var roots = $('input[name="root"]:checked').map(function(){return this.value;}); + var roots = $('select[name="root"]').val(); $.ajax('verb/random/', { data: { @@ -333,7 +333,7 @@ $(document).ready(function(){ reloadVerb(); } - $('#hebrewparsetrainer-settings input.reload-verb').change(function(){ + $('#hebrewparsetrainer-settings .reload-verb').change(function(){ reloadVerb(); }); diff --git a/resources/views/trainer.blade.php b/resources/views/trainer.blade.php index 4c788f0..c4452f6 100644 --- a/resources/views/trainer.blade.php +++ b/resources/views/trainer.blade.php @@ -28,11 +28,13 @@ use HebrewParseTrainer\Tense;

Roots

+ {{{ $root->root }}} ({{{ $root->kind->name }}}) -
+ @if ($root->verbs()->where('active', 1)->count() > 0) + + @endif @endforeach +
-- cgit v1.2.3