ewandor/vision
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Xbird/WorkOnIssues' into 'main'

Browse Source 
Fix somes issues

Closes #7

See merge request gamexperience/vision!18
This commit is contained in:
Xbird
2022-04-04 16:28:42 +00:00
parent 50178b6a2a 27211ef052
commit 32adcdaad4
15 changed files with 99 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
migrations/Version20220404160148.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20220404160148 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
//UPDATE `vision`.`document` SET `need_group_administration`='0' WHERE `id`=5;
$this->addSql('UPDATE document SET `need_group_administration`="0" WHERE `dtype`="template"');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
}
}

2
package.json
View File

@@ -1,3 +1,3 @@
{
"version": "0.1.0"
"version": "0.1.1"
}

7
src/Controller/AdminController.php
View File

@@ -98,9 +98,12 @@ class AdminController extends AbstractController
}
#[Route('/user/view/{id}', name: 'user_view')]
public function userView(PaginatorInterface $paginator, User $User): Response
public function userView(PaginatorInterface $paginator, User $User, Request $request): Response
{
$pagination = $paginator->paginate($User->getDocuments());
$pagination = $paginator->paginate(
$User->getDocuments(),
$request->query->getInt('page', 1)
);
return $this->render('admin/user_view.html.twig', [
'controller_name' => 'AdminController',
'user' => $User,

3
src/Controller/DirectoryController.php
View File

@@ -54,7 +54,8 @@ class DirectoryController extends AbstractController
}
$pagination = $paginator->paginate(
$req->getResult()
$req->getResult(),
$request->query->getInt('page', 1)
);
return $this->render('directory/list.html.twig', [

6
src/Controller/FolderController.php
View File

@@ -50,7 +50,8 @@ class FolderController extends AbstractController
}
$pagination = $paginator->paginate(
$req->getResult()
$req->getResult(),
$request->query->getInt('page', 1)
);
@@ -141,7 +142,8 @@ class FolderController extends AbstractController
}
$pagination = $paginator->paginate(
$req->getResult()
$req->getResult(),
$request->query->getInt('page', 1)
);
return $this->render('folder/document.html.twig', [

5
src/Controller/MeController.php
View File

@@ -55,7 +55,10 @@ class MeController extends AbstractController
return $this->render('me/index.html.twig', [
'controller_name' => 'MeController',
'form' => $form->createView(),
'pagination' => $paginator->paginate($user->getDocuments())
'pagination' => $paginator->paginate(
$user->getDocuments(),
$request->query->getInt('page', 1)
)
]);
}

22
src/Controller/UserController.php
View File

@@ -52,13 +52,22 @@ class UserController extends AbstractController
}
#[Route('/view/{id}/sanctions', name: 'view_sanctions')]
public function viewSanctions(PaginatorInterface $paginator, User $User): Response
public function viewSanctions(PaginatorInterface $paginator, User $User, Request $request): Response
{
$group = $this->getUser()->getMainGroup();
/**
* @var User $user
*/
$user = $this->getUser();
$group = $user->getMainGroup();
if (!$this->IsGranted('sanction', $group)) {
throw new AccessDeniedHttpException("granted_not_allowed_to_view_sanctions");
}
$pagination = $paginator->paginate($User->getSanctions());
$pagination = $paginator->paginate(
$User->getSanctions(),
$request->query->getInt('page', 1)
);
return $this->render('user/sanctions.html.twig', [
'controller_name' => 'UserController',
'user' => $User,
@@ -67,9 +76,12 @@ class UserController extends AbstractController
}
#[Route('/view/{id}/documents', name: 'view_documents')]
public function viewDocuments(PaginatorInterface $paginator, User $User): Response
public function viewDocuments(PaginatorInterface $paginator, User $User, Request $request): Response
{
$pagination = $paginator->paginate($User->getDocuments());
$pagination = $paginator->paginate(
$User->getDocuments(),
$request->query->getInt('page', 1)
);
return $this->render('user/documents.html.twig', [
'controller_name' => 'UserController',
'user' => $User,

1
src/Entity/Template.php
View File

@@ -15,7 +15,6 @@ class Template extends Document
public function __construct(User $user)
{
parent::__construct($user);
$this->setNeedGroupAdministration(true);
}
/**

2
src/Form/TestType.php
View File

@@ -26,8 +26,6 @@ class TestType extends AbstractType
*/
$User = $this->TokenStorage->getToken()->getUser();
dd($User);
$builder
->add('title', null, [
'label' => 'form_label_title',

3
src/PermissionsList.php
View File

@@ -111,9 +111,6 @@ class PermissionsList
}
}
//dd($buildedPermissions);
return $buildedPermissions;
}

3
src/Repository/Tools/DocumentRepositoriesExtension.php
View File

@@ -61,6 +61,8 @@ class DocumentRepositoriesExtension extends ServiceEntityRepository
if (!$User->hasPermission('group_ignore_subgroups')) {
$this->qb->andWhere('d.allowedSubGroups is empty');
foreach ($User->getSubGroups() as $key => $subG) {
@@ -76,6 +78,7 @@ class DocumentRepositoriesExtension extends ServiceEntityRepository
if (!$User->hasPermission('general_medical_view')) {
$this->qb->andWhere('d.needMedicalAccess = 0');
}
if (!$User->hasPermission('group_administrate')) {
$this->qb->andWhere('d.needGroupAdministration = 0');
}

22
src/Twig/VersionExtension.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
namespace App\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;
use Twig\TwigFunction;
class VersionExtension extends AbstractExtension
{
public function getFunctions(): array
{
return [
new TwigFunction('vision_version', [$this, 'visionVersion']),
];
}
public function visionVersion()
{
return json_decode(file_get_contents('../package.json'))->version;
}
}

2
templates/_cells/directoryCard.html.twig
View File

@@ -20,7 +20,7 @@
</div>
{% if directory.leftImageSize != 0 %}{% set leftImage = path_directories_uploads ~ '/' ~ directory.leftImageName %}{% else %}{% set leftImage = 'img/nophoto.jpg' %}{% endif %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_photo'|trans }}" href="{{ asset(leftImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(leftImage) }}" alt="{{ directory.fullname}}"></a>
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(leftImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(leftImage) }}" alt="{{ directory.fullname}}"></a>
</div>
{% if directory.idCardImageSize != 0 %}

4
templates/base.html.twig
View File

@@ -176,6 +176,10 @@
<a href="{{ path('admin_logs') }}" class="pc-link"><span class="pc-micon"><i class="material-icons-two-tone">list</i></span><span class="pc-mtext">{% trans %}title_logs{% endtrans %}</span></a>
</li>
{% endif %}
<li class="pc-item pc-caption">
<label><hr></label>
<span>Vision: {{ vision_version() }}</span>
</li>
</ul>
</div>

4
templates/document/types/Jail.html.twig
View File

@@ -4,8 +4,8 @@
</ul>
<ul>
<li>{% trans %}title_ask_for_lawyer{% endtrans %} : {{ document.lawyer ? 'yes' : 'no' }}</li>
<li>{% trans %}title_ask_for_medic{% endtrans %} : {{ document.medic ? 'yes' : 'no' }}</li>
<li>{% trans %}title_ask_for_lawyer{% endtrans %} : {{ document.lawyer ? 'value_yes'|trans : 'value_no'|trans }}</li>
<li>{% trans %}title_ask_for_medic{% endtrans %} : {{ document.medic ? 'value_yes'|trans : 'value_no'|trans }}</li>
</ul>
<hr>
<div>