New icon and logo layout in config

[airbundle] / Repository / SessionRepository.php

diff --git a/Repository/SessionRepository.php b/Repository/SessionRepository.php
index cf79a189e9c6117bf8376a9178eabf986760b298..dd89a9895f43df861d2163787612285760f76c88 100644 (file)
--- a/Repository/SessionRepository.php
+++ b/Repository/SessionRepository.php
@@ -183,7 +183,6 @@ SELECT
        l.address AS l_address,
        l.zipcode AS l_zipcode,
        l.city AS l_city,
-       l.short AS l_short,
        l.title AS l_title,
        l.latitude AS l_latitude,
        l.longitude AS l_longitude,
@@ -196,6 +195,7 @@ SELECT
        p.description AS p_description,
        p.class AS p_class,
        p.short AS p_short,
+       p.hat AS p_hat,
        p.rate AS p_rate,
        p.contact AS p_contact,
        p.donate AS p_donate,
@@ -232,7 +232,6 @@ SQL;
                        ->addScalarResult('l_city', 'l_city', 'string')
                        ->addScalarResult('l_latitude', 'l_latitude', 'float')
                        ->addScalarResult('l_longitude', 'l_longitude', 'float')
-                       ->addScalarResult('l_short', 'l_short', 'string')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')
@@ -245,6 +244,7 @@ SQL;
                        ->addScalarResult('p_description', 'p_description', 'string')
                        ->addScalarResult('p_class', 'p_class', 'string')
                        ->addScalarResult('p_short', 'p_short', 'string')
+                       ->addScalarResult('p_hat', 'p_hat', 'integer')
                        ->addScalarResult('p_rate', 'p_rate', 'integer')
                        ->addScalarResult('p_contact', 'p_contact', 'string')
                        ->addScalarResult('p_donate', 'p_donate', 'string')
@@ -317,7 +317,6 @@ SELECT
        s.created,
        s.updated,
        s.location_id AS l_id,
-       l.short AS l_short,
        l.title AS l_title,
        l.address AS l_address,
        l.zipcode AS l_zipcode,
@@ -389,7 +388,6 @@ SQL;
                        ->addScalarResult('created', 'created', 'datetime')
                        ->addScalarResult('updated', 'updated', 'datetime')
                        ->addScalarResult('l_id', 'l_id', 'integer')
-                       ->addScalarResult('l_short', 'l_short', 'string')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('l_address', 'l_address', 'string')
                        ->addScalarResult('l_zipcode', 'l_zipcode', 'string')
@@ -503,7 +501,6 @@ SELECT
        ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS start,
        ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS stop,
        s.location_id AS l_id,
-       l.short AS l_short,
        l.title AS l_title,
        s.slot_id AS t_id,
        t.title AS t_title,
@@ -550,7 +547,6 @@ SQL;
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')
                        ->addScalarResult('l_id', 'l_id', 'integer')
-                       ->addScalarResult('l_short', 'l_short', 'string')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('a_id', 'a_id', 'integer')
                        ->addScalarResult('a_canceled', 'a_canceled', 'datetime')
@@ -729,7 +725,7 @@ SQL;
                                                'id' => $session['id'],
                                                'start' => $session['start'],
                                                'stop' => $session['stop'],
-                                               'location' => $translator->trans($session['l_short']),
+                                               'location' => $translator->trans($session['l_title']),
                                                'pseudonym' => $pseudonym,
                                                'class' => $class,
                                                'slot' => self::GLYPHS[$session['t_title']],
@@ -808,7 +804,6 @@ SELECT
        ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS start,
        ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS stop,
        s.location_id AS l_id,
-       l.short AS l_short,
        l.title AS l_title,
        s.slot_id AS t_id,
        t.title AS t_title,
@@ -854,7 +849,6 @@ SQL;
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')
                        ->addScalarResult('l_id', 'l_id', 'integer')
-                       ->addScalarResult('l_short', 'l_short', 'string')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('a_id', 'a_id', 'integer')
                        ->addScalarResult('au_id', 'au_id', 'integer')
@@ -1029,7 +1023,7 @@ SQL;
                                                'id' => $session['id'],
                                                'start' => $session['start'],
                                                'stop' => $session['stop'],
-                                               'location' => $translator->trans($session['l_short']),
+                                               'location' => $translator->trans($session['l_title']),
                                                'pseudonym' => $pseudonym,
                                                'class' => $class,
                                                'slot' => self::GLYPHS[$session['t_title']],