Tepmlates fixes

This commit is contained in:
2022-01-26 21:30:25 +01:00
parent b4380aeb95
commit cddc8b970e
6 changed files with 123 additions and 82 deletions

View File

@@ -48,6 +48,38 @@ class Pronunciation extends AbstractEntity
* @ORM\Column(type="string", nullable=true) * @ORM\Column(type="string", nullable=true)
*/ */
protected $filename; 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;
}
} }
?> ?>

View File

@@ -2,8 +2,10 @@
namespace App\Model\Database\Entity; namespace App\Model\Database\Entity;
use Doctrine\ORM\Mapping as ORM;
use App\Model\Database\Entity\Attributes\TId; 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\Entity(repositoryClass="App\Model\Database\Repository\TermRepository")
@@ -14,6 +16,7 @@ use App\Model\Database\Entity\Attributes\TId;
* @property String $string1 * @property String $string1
* @property String $string2 * @property String $string2
* @property Dictionary $dictionary * @property Dictionary $dictionary
* @property mixed $pronunciations
* @property Suffix $suffix1 * @property Suffix $suffix1
* @property Suffix $suffix2 * @property Suffix $suffix2
* @property DictType $type * @property DictType $type
@@ -25,7 +28,7 @@ class Term extends AbstractEntity
use Tid; use Tid;
public function __construct(Dictionary $dictionary,$string) public function __construct(Dictionary $dictionary, $string)
{ {
$this->dictionary = $dictionary; $this->dictionary = $dictionary;
$this->string1 = $string; $this->string1 = $string;
@@ -46,7 +49,6 @@ class Term extends AbstractEntity
*/ */
protected $string2; protected $string2;
/** /**
* @ORM\ManyToOne(targetEntity="Suffix") * @ORM\ManyToOne(targetEntity="Suffix")
*/ */
@@ -57,7 +59,6 @@ class Term extends AbstractEntity
*/ */
protected $suffix2; protected $suffix2;
/** /**
* @ORM\ManyToOne(targetEntity="DictType") * @ORM\ManyToOne(targetEntity="DictType")
*/ */
@@ -66,8 +67,9 @@ class Term extends AbstractEntity
/** /**
* @ORM\ManyToMany(targetEntity="Pronunciation", inversedBy="terms") * @ORM\ManyToMany(targetEntity="Pronunciation", inversedBy="terms")
* @ORM\JoinTable(name="terms_pronunciations") * @ORM\JoinTable(name="terms_pronunciations")
* @var Collection&iterable<Pronunciation>
*/ */
protected $pronunciations; protected Collection $pronunciations;
/** /**
* @ORM\Column(type="string",nullable=true) * @ORM\Column(type="string",nullable=true)
@@ -117,9 +119,6 @@ class Term extends AbstractEntity
return $this; return $this;
} }
/** /**
* Get the value of string1 * Get the value of string1
*/ */
@@ -219,6 +218,14 @@ class Term extends AbstractEntity
return $this; return $this;
} }
}
?> /**
* Get the value of pronunciations
*
* @return Collection&iterable<Pronunciation>
*/
public function getPronunciations()
{
return $this->pronunciations;
}
}

View File

@@ -171,13 +171,14 @@ final class HomePresenter extends BaseFrontPresenter
public function actionDefault() public function actionDefault()
{ {
/*
if ($this->getRequest()->isMethod('GET') && $this->term) { if ($this->getRequest()->isMethod('GET') && $this->term) {
$this['searchForm']['string']->setValue($this->term); $this['searchForm']['string']->setValue($this->term);
$t = $this->slugs[$this->slug]; $t = $this->slugs[$this->slug];
$result = $this->doSearch('TermsQuery',$t->id,$this->term); $result = $this->doSearch('TermsQuery',$t->id,$this->term);
if ($result) $this->template->result = $result; if ($result) $this->template->result = $result;
} }
*/
$this['searchForm']->onSuccess[] = array($this, 'searchFormSucceeded'); $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceeded');
} }
@@ -191,11 +192,14 @@ final class HomePresenter extends BaseFrontPresenter
$translation = $t; $translation = $t;
} }
} else { } else {
$id = $this['searchForm']['translation']->value; $id = $this['searchForm']['translation']->value;
dump($id);
if (isset($this->translations[$id])) { if (isset($this->translations[$id])) {
$t = $this->translations[$id]; $t = $this->translations[$id];
$this->redirect('Homepage:select',$t["slug"],$this['searchForm']['string']->value); $this->redirect('Front:Home:select',$t["slug"],$this['searchForm']['string']->value);
} }
} }
if ($term) { if ($term) {
$query = new TermsFullQuery($translation->dictionary,$term,$translation->direction); $query = new TermsFullQuery($translation->dictionary,$term,$translation->direction);

View File

@@ -31,7 +31,7 @@ $( document ).ready(function() {
{/block} {/block}
{block content} {block content}
<div id="content"> <div id="content">
<p>Zadaj vyhladavany vyraz.</p> <h2>Zadaj vyhladavany vyraz.</h2>
<div class="boxes"> <div class="boxes">
{form searchForm} {form searchForm}

View File

@@ -1,5 +1,4 @@
{block title}Slovnik{/block} {block title}Slovnik{/block}
{layout ../@layout.latte}
{block head} {block head}
<script> <script>
$( document ).ready(function() { $( document ).ready(function() {
@@ -7,7 +6,7 @@ $( document ).ready(function() {
event.preventDefault(); event.preventDefault();
id = $(this).attr("data-sound-id"); id = $(this).attr("data-sound-id");
var audioElement = document.createElement('audio'); var audioElement = document.createElement('audio');
audioElement.setAttribute('src', {link Homepage:play} + "/" + id); audioElement.setAttribute('src', {link Home:play} + "/" + id);
console.log("Play sound:" + id); console.log("Play sound:" + id);
audioElement.play(); audioElement.play();
}); });
@@ -17,7 +16,7 @@ $(function() {
$("input[name=" + select_name + "]").autocomplete({ $("input[name=" + select_name + "]").autocomplete({
source: function( request, response ) { source: function( request, response ) {
$.ajax({ $.ajax({
url: "{!$presenter->link('autocomplete')}", url: {!$presenter->link('autocomplete')},
data: { data: {
whichData: select_name, whichData: select_name,
typedText: request.term, typedText: request.term,
@@ -94,8 +93,8 @@ $(function() {
{$last == $term->string1 && trim($last2) != '' && trim($term->string2) != '' ? ', ' : ''}{$term->string2}{** {$last == $term->string1 && trim($last2) != '' && trim($term->string2) != '' ? ', ' : ''}{$term->string2}{**
Nutne kvoli newline Nutne kvoli newline
**} **}
{? $last = $term->string1} {var $last = $term->string1}
{? $last2 = $term->string2} {var $last2 = $term->string2}
{/foreach} {/foreach}
</table> </table>
{/ifset} {/ifset}

View File

@@ -1,5 +1,4 @@
{block title}Slovnik{/block} {block title}Slovnik{/block}
{layout ../@layout.latte}
{block head} {block head}
<script> <script>
$( document ).ready(function() { $( document ).ready(function() {
@@ -7,7 +6,7 @@ $( document ).ready(function() {
event.preventDefault(); event.preventDefault();
id = $(this).attr("data-sound-id"); id = $(this).attr("data-sound-id");
var audioElement = document.createElement('audio'); var audioElement = document.createElement('audio');
var link = {link Homepage:play 123456 }; var link = {link Home:play 123456 };
audioElement.setAttribute('src', link.replace('123456',id)); audioElement.setAttribute('src', link.replace('123456',id));
console.log("Play sound:" + id); console.log("Play sound:" + id);
audioElement.play(); audioElement.play();
@@ -56,8 +55,8 @@ $( document ).ready(function() {
{$last == $term->string1 && trim($last2) != '' && trim($term->string2) != '' ? ', ' : ''}{$term->string2}{** {$last == $term->string1 && trim($last2) != '' && trim($term->string2) != '' ? ', ' : ''}{$term->string2}{**
Nutne kvoli newline Nutne kvoli newline
**} **}
{? $last = $term->string1} {var $last = $term->string1}
{? $last2 = $term->string2} {var $last2 = $term->string2}
{/foreach} {/foreach}
</table> </table>
{/ifset} {/ifset}