aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamil Staps2016-09-06 00:28:21 +0200
committerCamil Staps2016-09-06 00:28:21 +0200
commitb9c709fc55e07ca085b0397844aa13d5d53f6964 (patch)
tree40bfb217476e3ce99f36acc4e2f2433b9a675c1a
parentDifferent root kinds instead of only strong/weak (diff)
Root kinds on trainer page
-rw-r--r--app/Root.php10
-rw-r--r--resources/views/trainer.blade.php14
2 files changed, 17 insertions, 7 deletions
diff --git a/app/Root.php b/app/Root.php
index 6c0f033..2e21c4e 100644
--- a/app/Root.php
+++ b/app/Root.php
@@ -22,8 +22,12 @@ use Illuminate\Database\Eloquent\Model;
class Root extends Model {
- protected $table = 'roots';
- public $timestamps = false;
- protected $fillable = ['root', 'root_kind_id'];
+ protected $table = 'roots';
+ public $timestamps = false;
+ protected $fillable = ['root', 'root_kind_id'];
+
+ public function kind() {
+ return $this->belongsTo('HebrewParseTrainer\RootKind', 'root_kind_id');
+ }
}
diff --git a/resources/views/trainer.blade.php b/resources/views/trainer.blade.php
index 9bfb5a8..861b28f 100644
--- a/resources/views/trainer.blade.php
+++ b/resources/views/trainer.blade.php
@@ -1,10 +1,16 @@
+<?php
+use HebrewParseTrainer\Root;
+use HebrewParseTrainer\Stem;
+use HebrewParseTrainer\Tense;
+?>
+
@extends('layouts.with_sidebar')
@section('sidebar')
<form id="hebrewparsetrainer-settings">
<div class="form-group">
<h3>Stems</h3>
- @foreach (\HebrewParseTrainer\Stem::all() as $stem)
+ @foreach (Stem::all() as $stem)
<div class="checkbox">
<label><input class="reload-verb" type="checkbox" name="stem" value="{{{ $stem->name }}}" checked="checked"/> {{{ $stem->name }}}</label>
</div>
@@ -13,7 +19,7 @@
<div class="form-group">
<h3>Tenses</h3>
- @foreach (\HebrewParseTrainer\Tense::all() as $tense)
+ @foreach (Tense::all() as $tense)
<div class="checkbox">
<label><input class="reload-verb" type="checkbox" name="tense" value="{{{ $tense->name }}}" checked="checked"/> {{{ $tense->name }}}</label>
</div>
@@ -22,9 +28,9 @@
<div class="form-group">
<h3>Roots</h3>
- @foreach (\HebrewParseTrainer\Root::all() as $root)
+ @foreach (Root::orderBy('root_kind_id')->get() as $root)
<div class="checkbox">
- <label class="hebrew"><input class="reload-verb" type="checkbox" name="root" value="{{{ $root->root }}}" checked="checked"/> {{{ $root->root }}}</label>
+ <label class="hebrew"><input class="reload-verb" type="checkbox" name="root" value="{{{ $root->root }}}" checked="checked"/> {{{ $root->root }}} ({{{ $root->kind->name }}})</label>
</div>
@endforeach
</div>