Merge branch 'master' into stable

CHANGELOG.md

@@ -17,4 +17,8 @@ Version 1.5.3
 =============
 
 - fix error when interval is hour only
+- layout of page "list exports"
+- create function "SIMILARITY" (see [posgtgresql documentation](https://www.postgresql.org/docs/9.6/static/pgtrgm.html)) 
+- create function "OVERLAPSI", which will detect period of date overlapping, replacing NULL date by infinity or -infinity (see [postgresql page for date time function and operators](https://www.postgresql.org/docs/9.6/static/functions-datetime.html))
+- add repository for Center class
 

Controller/UserController.php

@@ -210,7 +210,7 @@ class UserController extends Controller
         try {
             $user->removeGroupCenter($groupCenter);
         } catch (\RuntimeException $ex) {
-            $this->addFlash('error', $this->get('translator')->trans($ex-getMessage()));
+            $this->addFlash('error', $this->get('translator')->trans($ex->getMessage()));
 
             return $this->redirect($this->generateUrl('admin_user_edit', array('id' => $uid)));
         }

DependencyInjection/ChillMainExtension.php

@@ -30,6 +30,8 @@ use Chill\MainBundle\Doctrine\DQL\GetJsonFieldByKey;
 use Chill\MainBundle\Doctrine\DQL\Unaccent;
 use Chill\MainBundle\Doctrine\DQL\JsonAggregate;
 use Chill\MainBundle\Doctrine\DQL\JsonbExistsInArray;
+use Chill\MainBundle\Doctrine\DQL\Similarity;
+use Chill\MainBundle\Doctrine\DQL\OverlapsI;
 
 /**
  * This class load config for chillMainExtension.
@@ -159,7 +161,9 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                     'AGGREGATE' => JsonAggregate::class
                  ),
                  'numeric_functions' => [
-                    'JSONB_EXISTS_IN_ARRAY' => JsonbExistsInArray::class
+                    'JSONB_EXISTS_IN_ARRAY' => JsonbExistsInArray::class,
+                    'SIMILARITY' => Similarity::class,
+                    'OVERLAPSI' => OverlapsI::class
                 ]
               )
            )

Doctrine/DQL/OverlapsI.php

@@ -0,0 +1,110 @@
+<?php
+/*
+ * Chill is a software for social workers
+ * Copyright (C) 2018 Champs-Libres Coopérative <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Chill\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+
+/**
+ * DQL function for OVERLAPS function in postgresql
+ * 
+ * If a value is null in period start, it will be replaced by -infinity. 
+ * If a value is null in period end, it will be replaced by infinity
+ * 
+ */
+class OverlapsI extends FunctionNode
+{
+    private $firstPeriodStart;
+    
+    private $firstPeriodEnd;
+    
+    private $secondPeriodStart;
+    
+    private $secondPeriodEnd;
+    
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    {
+        return '('
+            .$this->makeCase($sqlWalker, $this->firstPeriodStart, 'start').', '
+            .$this->makeCase($sqlWalker, $this->firstPeriodEnd, 'end').
+            ') OVERLAPS ('
+            .$this->makeCase($sqlWalker, $this->secondPeriodStart, 'start').', '
+            .$this->makeCase($sqlWalker, $this->secondPeriodEnd, 'end').')'
+            ;
+    }
+    
+    protected function makeCase($sqlWalker, $part, $position)
+    {
+        //return $part->dispatch($sqlWalker);
+        
+        switch ($position) {
+            case 'start' :
+                $p = '-infinity';
+                break;
+            case 'end':
+                $p = 'infinity';
+                break;
+        }
+        
+        if ($part instanceof \Doctrine\ORM\Query\AST\PathExpression) {
+            return 'CASE WHEN '
+                .'  '.$part->dispatch($sqlWalker).' IS NOT NULL '
+                . 'THEN '.
+                $part->dispatch($sqlWalker)
+                . ' ELSE '.
+                "'".$p."'::date "
+                . 'END';
+        } else {
+            return 'CASE WHEN '
+                .'  '.$part->dispatch($sqlWalker).'::date IS NOT NULL '
+                . 'THEN '.
+                $part->dispatch($sqlWalker)
+                . '::date ELSE '.
+                "'".$p."'::date "
+                . 'END';
+        }
+    }
+
+    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        
+        $this->firstPeriodStart = $parser->StringPrimary();
+        
+        $parser->match(Lexer::T_COMMA);
+        
+        $this->firstPeriodEnd = $parser->StringPrimary();
+        
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        
+        $parser->match(Lexer::T_COMMA);
+        
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        
+        $this->secondPeriodStart = $parser->StringPrimary();
+        
+        $parser->match(Lexer::T_COMMA);
+        
+        $this->secondPeriodEnd = $parser->StringPrimary();
+        
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

Doctrine/DQL/Similarity.php

@@ -0,0 +1,54 @@
+<?php
+/*
+ * Chill is a software for social workers
+ * Copyright (C) 2018 Champs-Libres Coopérative <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Chill\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+
+/**
+ * 
+ *
+ * 
+ */
+class Similarity extends FunctionNode
+{
+    private $firstPart;
+    
+    private $secondPart;
+    
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    {
+        return 'SIMILARITY('.$this->firstPart->dispatch($sqlWalker). 
+            ', ' . $this->secondPart->dispatch($sqlWalker) .")";
+    }
+
+    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        
+        $this->firstPart = $parser->StringPrimary();
+        
+        $parser->match(Lexer::T_COMMA);
+        
+        $this->secondPart = $parser->StringPrimary();
+        
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

Repository/CenterRepository.php

@@ -0,0 +1,27 @@
+<?php
+/*
+ * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Chill\MainBundle\Repository;
+
+/**
+ * 
+ *
+ */
+class CenterRepository extends \Doctrine\ORM\EntityRepository
+{
+    
+}

Resources/config/doctrine/Center.orm.yml

@@ -1,6 +1,7 @@
 Chill\MainBundle\Entity\Center:
     type: entity
     table: centers
+    repositoryClass: Chill\MainBundle\Repository\CenterRepository
     id:
         id:
             type: integer

Resources/config/services/repositories.yml

@@ -24,4 +24,12 @@ services:
             - "Chill\\MainBundle\\Entity\\PostalCode"
             
     Chill\MainBundle\Repository\PostalCodeRepository: '@chill.main.postalcode_repository'
+    
+    chill.main.center_repository:
+        class: Doctrine\ORM\EntityRepository
+        factory: ["@doctrine.orm.entity_manager", getRepository]
+        arguments:
+            - "Chill\\MainBundle\\Entity\\Center"
+            
+    Chill\MainBundle\Repository\CenterRepository: '@chill.main.center_repository'
     

Resources/public/modules/export-list/export-list.scss

@@ -0,0 +1,21 @@
+.container-export {
+    margin-left: 1rem;
+    margin-right: 1rem;
+    
+    .export-list {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: space-between;
+
+        .export-list__element {
+            min-width: 18rem;
+            max-width: 20rem;
+            padding: 1rem;
+            margin: 1rem;
+            flex-grow: 1;
+            
+            border: 1px solid var(--chill-gray);
+        }
+    }
+}

Resources/views/Export/layout.html.twig

@@ -16,25 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "ChillMainBundle::layout.html.twig" %}
 
 {% block title %}{{ 'Exports list'|trans }}{% endblock %}
 
-{% block vertical_menu_content %}
-    {{ chill_menu('export', {
-        'layout': 'ChillMainBundle::Menu/export.html.twig',
-    }) }}
-{% endblock %}
 
-{% block layout_wvm_content %}
-    {% block export_content %}
-        <h1>{{ 'Exports list'|trans }}</h1>
-        
+{% block content %}
+<div class="container-export">
+    <h1>{{ 'Exports list'|trans }}</h1>
+
+    <div class="export-list">
         {% for export_alias,export in exports %}
-        <div class="export">
+        <div class="export-list__element">
             <h2>{{ export.title|trans }}</h2>
             <p>{{ export.description|trans }}</p> 
-            
+
             <p>
                 <a class="sc-button bt-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
                     {{ 'Create an export'|trans }}
@@ -42,5 +38,6 @@
             </p>
         </div>
         {% endfor %}
-    {% endblock %}
-{% endblock  %}
+    </div>
+</div>
+{% endblock %}

Resources/views/UI/notification_user_counter.html.twig

@@ -1 +1 @@
-{% if nb > 0 %}<span class="notification-counter">{{ nb }}{% endif %}
+{% if nb > 0 %}<span class="notification-counter">{{ nb }}</span>{% endif %}

chill.webpack.config.js

@@ -28,6 +28,7 @@ require('./Resources/public/modules/download-report/index.js');
 //require('./Resources/public/css/select2/select2.css');
 require('select2/dist/css/select2.css');
 require('./Resources/public/modules/select_interactive_loading/index.js');
+require('./Resources/public/modules/export-list/export-list.scss');
 
 // img
 require('./Resources/public/img/favicon.ico');