jaro/slovnik30
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Jaroslav Drzik
2022-01-27 22:20:25 +01:00
parent cddc8b970e
commit 500baf2878
10 changed files with 681 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/model/Database/Entity/User.php
View File

@@ -8,12 +8,21 @@ use App\Model\Database\Entity\Attributes\TUpdatedAt;
use App\Model\Exception\Logic\InvalidArgumentException; use App\Model\Exception\Logic\InvalidArgumentException;
use App\Model\Security\Identity; use App\Model\Security\Identity;
use App\Model\Utils\DateTime; use App\Model\Utils\DateTime;
use App\Model\Utils\Strings;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
/** /**
* @ORM\Entity(repositoryClass="App\Model\Database\Repository\UserRepository") * @ORM\Entity(repositoryClass="App\Model\Database\Repository\UserRepository")
* @ORM\Table(name="`user`") * @ORM\Table(name="`user`")
* @ORM\HasLifecycleCallbacks * @ORM\HasLifecycleCallbacks
*
* @property int $id
* @property String $name
* @property String $surname
* @property String $email
* @property String $password
* @property String $role
* @property int $state
*/ */
class User extends AbstractEntity class User extends AbstractEntity
{ {

318
app/modules/Front/Home/HomePresenter.php
View File

@@ -22,79 +22,79 @@ final class HomePresenter extends BaseFrontPresenter
{ {
/** @inject @var \App\Model\Database\EntityManager */ /** @inject @var EntityManager */
public $em; public EntityManager $em;
/** @inject */ /** @inject */
public VisualPaginatorFactory $visualPaginatorFactory; public VisualPaginatorFactory $visualPaginatorFactory;
/** @inject */ /** @inject */
public TermFacade $termFacade; public TermFacade $termFacade;
private $translations; private $translations;
private $dictionaries; private $dictionaries;
private $drsSelect; private $drsSelect;
private $slugs; private $slugs;
public $translation; public $translation;
/** @persistent */ /** @persistent */
public $term; public $term;
/** @persistent */
public $slug;
protected function startup() /** @persistent */
{ public $slug;
$trs = $this->em->getRepository(Translation::class)->findBy([],['id' => 'ASC','direction'=>'ASC']);
$drs = $this->em->getRepository(Dictionary::class)->findPairs('id','name');
$select = [];
foreach ($trs as $t) {
$lang1 = $t->getLangName1();
$lang2 = $t->getLangName2();
$lang = mb_substr($lang1,0,-1); protected function startup()
$lang .= "o-".$lang2; {
$slug = Strings::webalize($lang); $trs = $this->em->getRepository(Translation::class)->findBy([], ['id' => 'ASC', 'direction' => 'ASC']);
$select[$drs[$t->getDictionary()->getId()]][$t->getId()] = $lang; $drs = $this->em->getRepository(Dictionary::class)->findPairs('id', 'name');
$translations[$t->getId()]["slug"] = $slug; $select = [];
$translations[$t->getId()]["lang"] = $lang; foreach ($trs as $t) {
$translations[$t->getId()]["t"] = $t; $lang1 = $t->getLangName1();
$slugs[$slug] = $t; $lang2 = $t->getLangName2();
$lang = mb_substr($lang1, 0, -1);
$lang .= "o-" . $lang2;
$slug = Strings::webalize($lang);
$select[$drs[$t->getDictionary()->getId()]][$t->getId()] = $lang;
$translations[$t->getId()]["slug"] = $slug;
$translations[$t->getId()]["lang"] = $lang;
$translations[$t->getId()]["t"] = $t;
$slugs[$slug] = $t;
}
$this->translations = $translations;
$this->dictionaries = $drs;
$this->drsSelect = $select;
$this->slugs = $slugs;
parent::startup();
} }
$this->translations = $translations;
$this->dictionaries = $drs;
$this->drsSelect = $select;
$this->slugs = $slugs;
parent::startup(); protected function doSearch($query, $translation, $term, $clen = null, $paginate = true)
} {
protected function doSearch($query,$translation,$term,$clen = null,$paginate = true)
{
$t = $this->em->getTranslationRepository()->find($translation); $t = $this->em->getTranslationRepository()->find($translation);
if ($term) $this->term = $term; if ($term) $this->term = $term;
if ($translation) $this->translation = $translation; if ($translation) $this->translation = $translation;
$this->slug = $this->translations[$translation]["slug"]; $this->slug = $this->translations[$translation]["slug"];
$this->termFacade->setDirection(1); $this->termFacade->setDirection(1);
if ($paginate) { if ($paginate) {
$this["paginator"]->setItemCount(500); $this["paginator"]->setItemCount(500);
$offset = $this["paginator"]->getOffset(); $offset = $this["paginator"]->getOffset();
$itemsPerPage = $this['paginator']->getItemsPerPage(); $itemsPerPage = $this['paginator']->getItemsPerPage();
} }
$q = $this->termFacade->findByString($term,$t->dictionary,$clen); $q = $this->termFacade->findByString($term, $t->dictionary, $clen);
$q->setMaxResults(500)->setFirstResult($offset)->getMaxResults($itemsPerPage); $q->setMaxResults(500)->setFirstResult($offset)->getMaxResults($itemsPerPage);
$this->template->translation = $t; $this->template->translation = $t;
return $q->getResult(); return $q->getResult();
} }
/** /**
* @return AlesWita\Components\VisualPaginator * @return AlesWita\Components\VisualPaginator
*/ */
protected function createComponentPaginator(): VisualPaginator protected function createComponentPaginator(): VisualPaginator
{ {
$paginator = $this->visualPaginatorFactory->create(); $paginator = $this->visualPaginatorFactory->create();
@@ -107,89 +107,92 @@ final class HomePresenter extends BaseFrontPresenter
return $paginator; return $paginator;
} }
protected function createComponentSearchForm() protected function createComponentSearchForm()
{ {
$form = new UI\Form; $form = new UI\Form;
$form->addText('string', 'Výraz') $form->addText('string', 'Výraz')
->setRequired('Zadajte výray'); ->setRequired('Zadajte výray');
$form->addSelect('translation', 'Preklad', $this->drsSelect) $form->addSelect('translation', 'Preklad', $this->drsSelect)
->setDefaultValue(1) ->setDefaultValue(1)
->setRequired('Vyberte slovnik'); ->setRequired('Vyberte slovnik');
$form->addText('clen','Clen',5); $form->addText('clen', 'Clen', 5);
$form->addSubmit('search', 'Vyhaľadaj'); $form->addSubmit('search', 'Vyhaľadaj');
return $form; $form->onSuccess[] = array($this, 'searchFormSucceeded');
} return $form;
}
public function searchFormSucceeded(UI\Form $form,$values) public function searchFormSucceeded(UI\Form $form, $values)
{ {
$translation = $values->translation; $translation = $values->translation;
$clen = $values->clen; $clen = $values->clen;
$term = $values->string; $term = $values->string;
$result = $this->doSearch('TermsQuery',$translation,$term,$clen); $result = $this->doSearch('TermsQuery', $translation, $term, $clen);
$this->term = $term;
dump($result);
$this->template->result = $result; $this->template->result = $result;
} }
public function searchFormSucceededIpa(UI\Form $form,$values) public function searchFormSucceededIpa(UI\Form $form, $values)
{ {
$translation = $values->translation; $translation = $values->translation;
$term = $values->string; $term = $values->string;
$clen = $values->clen; $clen = $values->clen;
$result = $this->doSearch('TermsFullQuery',$translation,$term,$clen); $result = $this->doSearch('TermsFullQuery', $translation, $term, $clen);
$this->template->result = $result; $this->template->result = $result;
} }
public function searchFormSucceededInteractive(UI\Form $form,$values) public function searchFormSucceededInteractive(UI\Form $form, $values)
{ {
$term = $values->string; $term = $values->string;
$translation = $values->translation; $translation = $values->translation;
$result = $this->doSearch('TermsFullQuery',$translation,$term,null); $result = $this->doSearch('TermsFullQuery', $translation, $term, null);
$this->template->result = $result; $this->template->result = $result;
} }
public function actionPlay($id = null) public function actionPlay($id = null)
{ {
$pron = $this->em->getPronunciationRepository()->find(['id'=>$id]); $pron = $this->em->getPronunciationRepository()->find(['id' => $id]);
$basepath = $this->getHttpRequest()->url->basePath . "/media"; $basepath = $this->getHttpRequest()->url->basePath . "/media";
$oggResp = new OggResponse($id,$pron->filename); $oggResp = new OggResponse($id, $pron->filename);
return $this->sendResponse($oggResp); return $this->sendResponse($oggResp);
}
} public function beforeRender()
{
$dicttypes = $this->em->getDictTypeRepository()->findAssoc([], 'id');
$this->template->dicttypes = $dicttypes;
$this->template->dictionaries = $this->dictionaries;
$this->template->translations = $this->translations;
// $this->template->paginator = $this->paginator;
}
public function beforeRender() public function actionDefault()
{ {
$dicttypes = $this->em->getDictTypeRepository()->findAssoc([],'id');
$this->template->dicttypes = $dicttypes;
$this->template->dictionaries = $this->dictionaries;
$this->template->translations = $this->translations;
// $this->template->paginator = $this->paginator;
}
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;
} else {
//dumpe($this);
$this->term = $this['searchForm']['string']->getValue();
} }
*/
$this['searchForm']->onSuccess[] = array($this, 'searchFormSucceeded'); $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceeded');
} }
public function actionSelect($slug,$term = null) public function actionSelect($slug, $term = null)
{ {
$this['searchForm']->onSuccess[] = array($this, 'searchFormSucceededIpa'); $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceededIpa');
if ($this->getRequest()->isMethod('GET')) { if ($this->getRequest()->isMethod('GET')) {
if (isset($this->slugs[$slug])) { if (isset($this->slugs[$slug])) {
$t = $this->slugs[$slug]; $t = $this->slugs[$slug];
$this['searchForm']['translation']->setValue($t->id); $this['searchForm']['translation']->setValue($t->id);
$translation = $t; $translation = $t;
} }
} else { } else {
@@ -197,90 +200,85 @@ final class HomePresenter extends BaseFrontPresenter
dump($id); dump($id);
if (isset($this->translations[$id])) { if (isset($this->translations[$id])) {
$t = $this->translations[$id]; $t = $this->translations[$id];
$this->redirect('Front:Home: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);
$result = $this->repoTerms->fetch($query); $result = $this->repoTerms->fetch($query);
$this->template->result = $result; $this->template->result = $result;
$this->template->translation = $translation; $this->template->translation = $translation;
} }
$this->setView('ipa'); $this->setView('ipa');
} }
public function handleGetInfo($id) public function handleGetInfo($id)
{ {
$term = $this->repoTerms->find($id); $term = $this->repoTerms->find($id);
$termFlags = $this->repoTermFlags->findAssoc([],'id'); $termFlags = $this->repoTermFlags->findAssoc([], 'id');
$dictionary = $term->dictionary; $dictionary = $term->dictionary;
$query = new TermsFullQuery($dictionary,$term->string1,1,false); $query = new TermsFullQuery($dictionary, $term->string1, 1, false);
$result = $this->repoTerms->fetch($query); $result = $this->repoTerms->fetch($query);
$this->template->result = $result; $this->template->result = $result;
$this->template->termFlags = $termFlags; $this->template->termFlags = $termFlags;
$this->setView('info'); $this->setView('info');
}
public function renderDefault()
{
}
public function actionIpa()
{
if ($this->getRequest()->isMethod('GET')) {
if ($this->term) {
$this['searchForm']['string']->setValue($this->term);
$result = $this->doSearch('TermsFullQuery',$this->slugs[$this->slug]->id,$this->term);
if ($result) $this->template->result = $result;
}
} }
$this['searchForm']->onSuccess[] = array($this, 'searchFormSucceededIpa'); public function renderDefault()
} {
public function actionInteractive()
{
if ($this->getRequest()->isMethod('GET')) {
if ($this->term) {
$this['searchForm']['string']->setValue($this->term);
$result = $this->doSearch('TermsFullQuery',$this->slugs[$this->slug]->id,$this->term);
if ($result) $this->template->result = $result;
}
} }
$this['searchForm']->onSuccess[] = array($this, 'searchFormSucceededInteractive'); public function actionIpa()
} {
if ($this->getRequest()->isMethod('GET')) {
if ($this->term) {
$this['searchForm']['string']->setValue($this->term);
$result = $this->doSearch('TermsFullQuery', $this->slugs[$this->slug]->id, $this->term);
if ($result) $this->template->result = $result;
}
}
public function renderAutocomplete($whichData, $typedText = '',$translation = 1) $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceededIpa');
{ }
$translation = $this->repoTranslations->find($translation);
$query = new TermsQuickQuery($translation->dictionary,$typedText,$translation->direction); public function actionInteractive()
$result = $this->repoTerms->fetch($query); {
if ($this->getRequest()->isMethod('GET')) {
if ($this->term) {
$this['searchForm']['string']->setValue($this->term);
$result = $this->doSearch('TermsFullQuery', $this->slugs[$this->slug]->id, $this->term);
if ($result) $this->template->result = $result;
}
}
$map = []; $this['searchForm']->onSuccess[] = array($this, 'searchFormSucceededInteractive');
foreach ($result as $str) { }
$map[] = $str["string1"];
}
return $this->sendResponse(new JsonResponse($map)); public function renderAutocomplete($whichData, $typedText = '', $translation = 1)
} {
$translation = $this->repoTranslations->find($translation);
public function renderIpa() $query = new TermsQuickQuery($translation->dictionary, $typedText, $translation->direction);
{ $result = $this->repoTerms->fetch($query);
} $map = [];
foreach ($result as $str) {
$map[] = $str["string1"];
}
public function renderMerge() return $this->sendResponse(new JsonResponse($map));
{ }
} public function renderIpa()
{
}
public function renderMerge()
{
}
} }

0
app/modules/Front/Home/SearchPresenter.php Normal file
View File