diff --git a/app/model/Database/Entity/Pronunciation.php b/app/model/Database/Entity/Pronunciation.php index ff7cc88..8676bca 100644 --- a/app/model/Database/Entity/Pronunciation.php +++ b/app/model/Database/Entity/Pronunciation.php @@ -48,6 +48,38 @@ class Pronunciation extends AbstractEntity * @ORM\Column(type="string", nullable=true) */ protected $filename; + + /** + * Get the value of filename + */ + public function getFilename() + { + return $this->filename; + } + + /** + * Get the value of terms + */ + public function getTerms() + { + return $this->terms; + } + + /** + * Get the value of ipa + */ + public function getIpa() + { + return $this->ipa; + } + + /** + * Get the value of type + */ + public function getType() + { + return $this->type; + } } ?> diff --git a/app/model/Database/Entity/Term.php b/app/model/Database/Entity/Term.php index 7222a35..de39a8b 100644 --- a/app/model/Database/Entity/Term.php +++ b/app/model/Database/Entity/Term.php @@ -2,41 +2,44 @@ namespace App\Model\Database\Entity; -use Doctrine\ORM\Mapping as ORM; use App\Model\Database\Entity\Attributes\TId; +use Doctrine\Common\Collections\Collection; +use Doctrine\Common\Proxy\Proxy; +use Doctrine\ORM\Mapping as ORM; /** * @ORM\Entity(repositoryClass="App\Model\Database\Repository\TermRepository") * @ORM\HasLifecycleCallbacks * @ORM\Table(indexes={@ORM\Index(columns={"string1"}, flags={"fulltext"}),@ORM\Index(columns={"string2"}, flags={"fulltext"})}) * - * @property int $id + * @property int $id * @property String $string1 * @property String $string2 * @property Dictionary $dictionary + * @property mixed $pronunciations * @property Suffix $suffix1 * @property Suffix $suffix2 * @property DictType $type * @property int $order2 * @property String $member */ -class Term extends AbstractEntity +class Term extends AbstractEntity { use Tid; - public function __construct(Dictionary $dictionary,$string) + public function __construct(Dictionary $dictionary, $string) { - $this->dictionary = $dictionary; - $this->string1 = $string; + $this->dictionary = $dictionary; + $this->string1 = $string; } /** * @ORM\ManyToOne(targetEntity="\App\Model\Database\Entity\Dictionary", inversedBy="terms",cascade={"persist", "remove" }) */ protected $dictionary; - - /** + + /** * @ORM\Column(type="string") */ protected $string1; @@ -46,7 +49,6 @@ class Term extends AbstractEntity */ protected $string2; - /** * @ORM\ManyToOne(targetEntity="Suffix") */ @@ -57,7 +59,6 @@ class Term extends AbstractEntity */ protected $suffix2; - /** * @ORM\ManyToOne(targetEntity="DictType") */ @@ -66,8 +67,9 @@ class Term extends AbstractEntity /** * @ORM\ManyToMany(targetEntity="Pronunciation", inversedBy="terms") * @ORM\JoinTable(name="terms_pronunciations") + * @var Collection&iterable */ - protected $pronunciations; + protected Collection $pronunciations; /** * @ORM\Column(type="string",nullable=true) @@ -76,13 +78,13 @@ class Term extends AbstractEntity public function setMember($member) { - $this->member = $member; - return $this; + $this->member = $member; + return $this; } public function getMember() { - return $this->member; + return $this->member; } /** @@ -97,32 +99,29 @@ class Term extends AbstractEntity public function getFlags() { - return $this->flags; + return $this->flags; } public function setFlags($flags) { - $this->flags = $flags; - return $this; + $this->flags = $flags; + return $this; } public function getOrder2() { - return $this->order2; + return $this->order2; } public function setOrder2($order2) { - $this->order2 = $order2; - return $this; + $this->order2 = $order2; + return $this; } - - - /** * Get the value of string1 - */ + */ public function getString1() { return $this->string1; @@ -132,7 +131,7 @@ class Term extends AbstractEntity * Set the value of string1 * * @return self - */ + */ public function setString1($string1) { $this->string1 = $string1; @@ -142,7 +141,7 @@ class Term extends AbstractEntity /** * Get the value of string2 - */ + */ public function getString2() { return $this->string2; @@ -152,7 +151,7 @@ class Term extends AbstractEntity * Set the value of string2 * * @return self - */ + */ public function setString2($string2) { $this->string2 = $string2; @@ -162,7 +161,7 @@ class Term extends AbstractEntity /** * Get the value of suffix1 - */ + */ public function getSuffix1() { return $this->suffix1; @@ -172,7 +171,7 @@ class Term extends AbstractEntity * Set the value of suffix1 * * @return self - */ + */ public function setSuffix1($suffix1) { $this->suffix1 = $suffix1; @@ -182,7 +181,7 @@ class Term extends AbstractEntity /** * Get the value of suffix2 - */ + */ public function getSuffix2() { return $this->suffix2; @@ -192,7 +191,7 @@ class Term extends AbstractEntity * Set the value of suffix2 * * @return self - */ + */ public function setSuffix2($suffix2) { $this->suffix2 = $suffix2; @@ -202,7 +201,7 @@ class Term extends AbstractEntity /** * Get the value of type - */ + */ public function getType() { return $this->type; @@ -212,13 +211,21 @@ class Term extends AbstractEntity * Set the value of type * * @return self - */ + */ public function setType($type) { $this->type = $type; return $this; } -} -?> + /** + * Get the value of pronunciations + * + * @return Collection&iterable + */ + public function getPronunciations() + { + return $this->pronunciations; + } +} diff --git a/app/modules/Front/Home/HomePresenter.php b/app/modules/Front/Home/HomePresenter.php index f3dd25a..1c5c4ed 100644 --- a/app/modules/Front/Home/HomePresenter.php +++ b/app/modules/Front/Home/HomePresenter.php @@ -125,7 +125,7 @@ final class HomePresenter extends BaseFrontPresenter $translation = $values->translation; $clen = $values->clen; $term = $values->string; - + $result = $this->doSearch('TermsQuery',$translation,$term,$clen); $this->template->result = $result; } @@ -171,56 +171,60 @@ final class HomePresenter extends BaseFrontPresenter public function actionDefault() { - if ($this->getRequest()->isMethod('GET') && $this->term) { - $this['searchForm']['string']->setValue($this->term); - $t = $this->slugs[$this->slug]; - $result = $this->doSearch('TermsQuery',$t->id,$this->term); - if ($result) $this->template->result = $result; - } - - $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceeded'); + /* + if ($this->getRequest()->isMethod('GET') && $this->term) { + $this['searchForm']['string']->setValue($this->term); + $t = $this->slugs[$this->slug]; + $result = $this->doSearch('TermsQuery',$t->id,$this->term); + if ($result) $this->template->result = $result; + } +*/ + $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceeded'); } public function actionSelect($slug,$term = null) { - $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceededIpa'); - if ($this->getRequest()->isMethod('GET')) { - if (isset($this->slugs[$slug])) { - $t = $this->slugs[$slug]; - $this['searchForm']['translation']->setValue($t->id); - $translation = $t; - } - } else { - $id = $this['searchForm']['translation']->value; - if (isset($this->translations[$id])) { - $t = $this->translations[$id]; - $this->redirect('Homepage:select',$t["slug"],$this['searchForm']['string']->value); + $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceededIpa'); + if ($this->getRequest()->isMethod('GET')) { + if (isset($this->slugs[$slug])) { + $t = $this->slugs[$slug]; + $this['searchForm']['translation']->setValue($t->id); + $translation = $t; + } + } else { + + $id = $this['searchForm']['translation']->value; + dump($id); + if (isset($this->translations[$id])) { + $t = $this->translations[$id]; + $this->redirect('Front:Home:select',$t["slug"],$this['searchForm']['string']->value); + } + } - } - if ($term) { - $query = new TermsFullQuery($translation->dictionary,$term,$translation->direction); - $result = $this->repoTerms->fetch($query); + if ($term) { + $query = new TermsFullQuery($translation->dictionary,$term,$translation->direction); + $result = $this->repoTerms->fetch($query); - $this->template->result = $result; - $this->template->translation = $translation; - } - $this->setView('ipa'); + $this->template->result = $result; + $this->template->translation = $translation; + } + $this->setView('ipa'); } public function handleGetInfo($id) { - $term = $this->repoTerms->find($id); - $termFlags = $this->repoTermFlags->findAssoc([],'id'); + $term = $this->repoTerms->find($id); + $termFlags = $this->repoTermFlags->findAssoc([],'id'); - $dictionary = $term->dictionary; + $dictionary = $term->dictionary; - $query = new TermsFullQuery($dictionary,$term->string1,1,false); - $result = $this->repoTerms->fetch($query); + $query = new TermsFullQuery($dictionary,$term->string1,1,false); + $result = $this->repoTerms->fetch($query); - $this->template->result = $result; - $this->template->termFlags = $termFlags; + $this->template->result = $result; + $this->template->termFlags = $termFlags; - $this->setView('info'); + $this->setView('info'); } public function renderDefault() diff --git a/app/modules/Front/Home/templates/default.latte b/app/modules/Front/Home/templates/default.latte index 0635779..362cc59 100644 --- a/app/modules/Front/Home/templates/default.latte +++ b/app/modules/Front/Home/templates/default.latte @@ -31,7 +31,7 @@ $( document ).ready(function() { {/block} {block content}
-

Zadaj vyhladavany vyraz.

+

Zadaj vyhladavany vyraz.

{form searchForm} diff --git a/app/modules/Front/Home/templates/interactive.latte b/app/modules/Front/Home/templates/interactive.latte index 8b0cbc8..52abc6d 100644 --- a/app/modules/Front/Home/templates/interactive.latte +++ b/app/modules/Front/Home/templates/interactive.latte @@ -1,5 +1,4 @@ {block title}Slovnik{/block} -{layout ../@layout.latte} {block head}