@@ -61,6 +61,8 @@ $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['weinanlieferung']['wa_book

         'slot_time',

         'slot_standort',

         'booking_ncsent',

+        'booking_approved',

+        'booking_approved_on',

     ),

     'email_text'    => array

     (

@@ -80,6 +82,8 @@ $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['weinanlieferung']['wa_book

         'booking_sorten',

         'booking_ernteart',

         'booking_lage',

+        'booking_approved',

+        'booking_approved_on',

     ),

     'email_html'    => array

     (

@@ -99,6 +103,8 @@ $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['weinanlieferung']['wa_book

         'booking_sorten',

         'booking_ernteart',

         'booking_lage',

+        'booking_approved',

+        'booking_approved_on',

     )

 );

@@ -97,7 +97,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

     'palettes' => array

     (

         '__selector__' => array(),

-        'default' => 'pid,uid,behaelter,sorten,lage,ernteart,upload,approved'

+        'default' => 'pid,uid,behaelter,sorten,lage,ernteart,upload;{approval_legend},approved'

     ),

     // Subpalettes

@@ -22,7 +22,10 @@ $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['uid'][0] = 'Winzer';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['uid'][1] = 'Zuordnung des anliefernden Winzers.';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['upload'][0] = 'Datei';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['upload'][1] = 'Die hochgeladene Datei des Winzers.';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['approved'][0] = 'Freigabe';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['approved'][1] = 'Der Freigabe-Status der Buchung.';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['title_legend'] = 'Leseart';

+$GLOBALS['TL_LANG']['tl_vr_wa_reservation']['approval_legend'] = 'Freigabe-Einstellungen';

 $GLOBALS['TL_LANG']['tl_vr_wa_reservation']['back'] = 'Zurück';

@@ -47,6 +47,21 @@

         <a href="/contao?do=weinanlieferung&table=tl_vr_wa_reservation&act=create&rt={{ request_token }}&ref={{ ref }}" class="header_new" title="" accesskey="n" onclick="Backend.getScrollOffset()">Neu</a>

     </div>

     <div class="tl_listing_container">

+        <div class="u-flex u-items-center u-gap-2 px-1 text-sm">

+            <div><strong>Legende:</strong></div>

+            <div class="u-flex u-items-center u-gap-1">

+                <i class="status-icon status--approved status--small"></i>

+                angenommen

+            </div>

+            <div class="u-flex u-items-center u-gap-1">

+                <i class="status-icon status--pending status--small"></i>

+                Freigabe ausstehend

+            </div>

+            <div class="u-flex u-items-center u-gap-1">

+                <i class="status-icon status--canceled status--small"></i>

+                abgelehnt

+            </div>

+        </div>

         <div>

             {% block content %}

@@ -56,37 +71,47 @@

                             <h3 class="tl_folder_list px-1 text-lg text-primary mt-2">{{ day|date('d.m.Y') }}</h3>

                             {% for standort in standorte %}

                                 {% for time,bookings in standort.times %}

-                                    <h3 class="tl_folder_list px-1 row u-items-center">

-                                        <div class="col-2 pl-0">{{ time|date('H:i') }}</div>

-                                        <div class="col-3">

+                                    <h3 class="tl_folder_list row u-items-center">

+                                        <div class="col-2 offset-1">{{ time|date('H:i') }}</div>

+                                        <div class="col-2">

                                             <div class="t-label">Standort</div>

                                             {{ standort.standort }}

                                         </div>

-                                        <div class="col-3">

+                                        <div class="col-2">

                                             <div class="t-label">Verfügbare Behälterkapazität</div>

                                             {{ bookings.behaelterAvailable }}

                                         </div>

-                                        <div class="col">

+                                        <div class="col px-1">

                                             <div class="t-label">Verarbeitete Sorten</div>

                                             {{ bookings.sorten|join(', ') }}

                                         </div>

                                     </h3>

                                     <div class="bookings u-row-striped">

                                         {% for booking in bookings.items %}

-                                            <div class="row u-items-center">

-                                                <div class="col-1 time icon-uhr-outline">

+                                            {% if booking.approved == '1' %}

+                                                {% set status = 'approved' %}

+                                            {% elseif booking.approved == '0' %}

+                                                {% set status = 'canceled' %}

+                                            {% else %}

+                                                {% set status = 'pending' %}

+                                            {% endif %}

+                                            <div class="row u-items-flex-start my-1 status status--{{ status }}">

+                                                <div class="col-1">

+                                                    <i class="status-icon" title="{{ ('MSC.wa_approval_status.'~status)|trans([], 'contao_default') }}">{{ ('MSC.wa_approval_status.'~status)|trans([], 'contao_default') }}</i>

+                                                </div>

+                                                <div class="col-2 time icon-uhr-outline">

                                                     <div class="t-label">Uhrzeit</div>

                                                     {{ booking.slot.time|date('H:i') }}

                                                     <div class="t-label">Standort</div>

                                                     {{ booking.standort }}

                                                 </div>

-                                                <div class="col-3 behaelter icon-behaelter-outline">

+                                                <div class="col-2 behaelter icon-behaelter-outline">

                                                     <div class="t-label">Gebuchte Behälterkapazität</div>

                                                     {{ booking.behaelter }}

                                                     <div class="t-label">Ernteart</div>

                                                     {{ booking.ernteart|join(', ') }}

                                                 </div>

-                                                <div class="col-3 behaelter icon-behaelter-outline">

+                                                <div class="col-2 behaelter icon-behaelter-outline">

                                                     <div class="t-label">Anliefernde Sorten</div>

                                                     {{ booking.sorte|join(', ') }}

                                                     <div class="t-label">Lage</div>

@@ -106,7 +131,7 @@

                                                             </div>{% endif %}

                                                     {% endif %}

                                                 </div>

-                                                <div class="col-1 u-text-right action">

+                                                <div class="col px-1 u-text-right action">

                                                     <a

                                                         href="/contao?do=weinanlieferung&table=tl_vr_wa_reservation&act=edit&id={{ booking.id }}&rt={{ request_token }}&ref={{ ref }}"

                                                         {#                        onclick="Backend.openModalIframe({'title':'Quellelement ID {{ booking.id }} bearbeiten','url':this.href});return false" #}

@@ -6307,3 +6307,69 @@

 .u-border-opacity-100 {

   --border-opacity: 1;

 }

+

+

+/** Status icons */

+.status .status-icon {

+  visibility: hidden;

+  position: relative;

+  width: 24px;

+  height: 24px;

+}

+.status .status-icon:after {

+  width: 24px;

+  height: 24px;

+  visibility: visible;

+  position: absolute;

+  top: 50%;

+  left: 50%;

+  margin: -12px 0 0 -12px;

+  content: '';

+  background-position: 50% 50%;

+  background-repeat: no-repeat;

+}

+.status-icon {

+  visibility: hidden;

+  position: relative;

+  display: inline-block;

+  width: 24px;

+  height: 24px;

+}

+.status-icon:after {

+  width: 24px;

+  height: 24px;

+  visibility: visible;

+  position: absolute;

+  top: 50%;

+  left: 50%;

+  margin: -12px 0 0 -12px;

+  content: '';

+  background-position: 50% 50%;

+  background-repeat: no-repeat;

+}

+.status-icon.status--small, .status.status--small .status-icon, .status-icon.status--small:after, .status.status--small .status-icon:after {

+  width: 16px;

+  height: 16px;

+}

+.status-icon.status--small:after, .status.status--small .status-icon:after {

+  margin: -8px 0 0 -8px;

+}

+.status.status--approved:not(.status-icon):not(.status-no-rowcolor), .status-icon.status--approved:not(.status-icon):not(.status-no-rowcolor) {

+  background-color: #f3ffe2;

+}

+.status.status--approved:not(.status):after, .status-icon.status--approved:not(.status):after, .status.status--approved .status-icon:after, .status-icon.status--approved .status-icon:after {

+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='icon icon-tabler icon-tabler-thumb-up' width='100%25' height='100%25' viewBox='0 0 24 24' stroke-width='1.5' stroke='%2300b341' fill='none' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M7 11v8a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1v-7a1 1 0 0 1 1 -1h3a4 4 0 0 0 4 -4v-1a2 2 0 0 1 4 0v5h3a2 2 0 0 1 2 2l-1 5a2 3 0 0 1 -2 2h-7a3 3 0 0 1 -3 -3' /%3E%3C/svg%3E");

+}

+.status.status--pending:not(.status-icon):not(.status-no-rowcolor), .status-icon.status--pending:not(.status-icon):not(.status-no-rowcolor) {

+  background-color: #fff6e4;

+}

+.status.status--pending:not(.status):after, .status-icon.status--pending:not(.status):after, .status.status--pending .status-icon:after, .status-icon.status--pending .status-icon:after {

+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='icon icon-tabler icon-tabler-hourglass-high' width='100%25' height='100%25' viewBox='0 0 24 24' stroke-width='1.5' stroke='%23ff9300' fill='none' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M6.5 7h11' /%3E%3Cpath d='M6 20v-2a6 6 0 1 1 12 0v2a1 1 0 0 1 -1 1h-10a1 1 0 0 1 -1 -1z' /%3E%3Cpath d='M6 4v2a6 6 0 1 0 12 0v-2a1 1 0 0 0 -1 -1h-10a1 1 0 0 0 -1 1z' /%3E%3C/svg%3E");

+}

+.status.status--canceled:not(.status-icon):not(.status-no-rowcolor), .status-icon.status--canceled:not(.status-icon):not(.status-no-rowcolor) {

+  background-color: #ffe7e7;

+}

+.status.status--canceled:not(.status):after, .status-icon.status--canceled:not(.status):after, .status.status--canceled .status-icon:after, .status-icon.status--canceled .status-icon:after {

+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='icon icon-tabler icon-tabler-thumb-down' width='100%25' height='100%25' viewBox='0 0 24 24' stroke-width='1.5' stroke='%23ff2825' fill='none' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M7 13v-8a1 1 0 0 0 -1 -1h-2a1 1 0 0 0 -1 1v7a1 1 0 0 0 1 1h3a4 4 0 0 1 4 4v1a2 2 0 0 0 4 0v-5h3a2 2 0 0 0 2 -2l-1 -5a2 3 0 0 0 -2 -2h-7a3 3 0 0 0 -3 3' /%3E%3C/svg%3E");

+}

+

@@ -62,7 +62,7 @@ class SendBookingChangeNotificationJob

                 $time = Date::floorToMinute();

                 // Do we have updateable items

-                $Bookings = $this->db->executeQuery("SELECT r.id, r.pid, r.uid, r.behaelter, r.sorten, r.lage, r.ernteart, r.upload, r.nc_sent, s.date as 'slot_date', s.time as 'slot_time', s.behaelter as 'slot_behaelter', s.sorten as 'slot_sorten', s.ernteart as 'slot_ernteart', s.lage as 'slot_lage', s.anmerkungen as 'slot_anmerkungen' FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid WHERE s.pid = ? AND r.nc_sent < r.tstamp AND s.published='1'",[$Location->id]);

+                $Bookings = $this->db->executeQuery("SELECT r.id, r.pid, r.uid, r.behaelter, r.sorten, r.lage, r.ernteart, r.upload, r.nc_sent, s.date as 'slot_date', s.time as 'slot_time', s.behaelter as 'slot_behaelter', s.sorten as 'slot_sorten', s.ernteart as 'slot_ernteart', s.lage as 'slot_lage', s.anmerkungen as 'slot_anmerkungen', r.approved, r.approved_on FROM tl_vr_wa_reservation r INNER JOIN tl_vr_wa_slot s ON s.id = r.pid WHERE s.pid = ? AND r.nc_sent < r.tstamp AND s.published='1'",[$Location->id]);

                 // Load groups and notification models if we have news to share

                 if ($Bookings->rowCount() && ($Notification = Notification::findByPk($Location->nc_notification)) !== null)

@@ -139,6 +139,8 @@ class SendBookingChangeNotificationJob

                                 'booking_sorten'     => implode(', ',$arrSortenBooked),

                                 'booking_ernteart'   => implode(', ',$arrErnteartBooked),

                                 'booking_lage'       => implode(', ',$arrLageBooked),

+                                'booking_approved'   => $Booking['approved'],

+                                'booking_approved_on'=> $Booking['approved_on'],

                                 'admin_email'        => $admin_email,

                             ),

                                 $GLOBALS['TL_LANGUAGE']);

@@ -19,6 +19,7 @@ use Contao\StringUtil;

 use Doctrine\DBAL\Connection;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

 class WeinanlieferungReservationContainerListener

@@ -145,4 +146,25 @@ class WeinanlieferungReservationContainerListener

         return $arrData;

     }

+

+    /**

+     * @Callback(table="tl_vr_wa_reservation", target="fields.approved.save")

+     */

+    public function onApprovedSaveCallback($varValue, DataContainer $dc)

+    {

+        if (($Current = WeinanlieferungReservationModel::findByPk($dc->activeRecord->id)) !== null)

+        {

+            if ($Current->approved === '1' && $varValue !== '1')

+            {

+                $Current->approved_on = 0;

+                $Current->save();

+            } elseif ($Current->approved !== '1' && $varValue === '1')

+            {

+                $Current->approved_on = time();

+                $Current->save();

+            }

+        }

+

+        return $varValue;

+    }

 }

@@ -29,6 +29,12 @@ class WeinanlieferungReservationModel extends Model

         $Date = new Date();

         $time = $Date->dayBegin;

-        return static::findBy(array("pid IN (SELECT tl_vr_wa_slot.id FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid AND tl_vr_wa_slot.time >= ?)"), $time, $arrOptions);

+        $arrColumn = ["pid IN (SELECT tl_vr_wa_slot.id FROM tl_vr_wa_slot WHERE tl_vr_wa_slot.id=tl_vr_wa_reservation.pid AND tl_vr_wa_slot.time >= ?)"];

+

+        /*if (!isset($arrOptions['showCanceled']) || !$arrOptions['showCanceled']) {

+            $arrColumn[] = "approved != '0'";

+        }*/

+

+        return static::findBy($arrColumn, $time, $arrOptions);

     }

 }