From f93e48046654ecd00831ca941b3ea30119f6cdb2 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 19 Jul 2015 13:46:34 +0200
Subject: [PATCH] Better notifications.

---
 .../Controllers/TransactionController.php     | 31 +++++++-------
 resources/twig/partials/flashes.twig          | 40 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index de9996bf41..5458193e5d 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -272,19 +272,15 @@ class TransactionController extends Controller
         // save attachments:
         $att->saveAttachmentsForModel($journal);
 
-        if ($att->getErrors()->count() > 0) {
-            // todo moet beter
-            Session::flash('error', '<ul>' . join('', $att->getErrors()->get('attachments', '<li>:message</li>')) . '</ul>');
+        // flash errors
+        if (count($att->getErrors()->get('attachments')) > 0) {
+            Session::flash('error', $att->getErrors()->get('attachments'));
         }
-        if ($att->getMessages()->count() > 0) {
-            // todo moet beter
-            Session::flash('info', '<ul>' . join('', $att->getMessages()->get('attachments', '<li>:message</li>')) . '</ul>');
+        // flash messages
+        if (count($att->getMessages()->get('attachments')) > 0) {
+            Session::flash('info', $att->getMessages()->get('attachments'));
         }
 
-
-        // do something with the messages?
-
-
         // rescan journal, UpdateJournalConnection
         event(new JournalSaved($journal));
 
@@ -325,13 +321,20 @@ class TransactionController extends Controller
         // save attachments:
         $att->saveAttachmentsForModel($journal);
 
-        if ($att->getErrors()->count() > 0) {
-            // todo moet beter
-            Session::flash('error', '<ul>' . join('', $att->getErrors()->get('attachments', '<li>:message</li>')) . '</ul>');
+        // one error
+        if ($att->getErrors()->count() == 1) {
+            Session::flash('error', join('', $att->getErrors()->get('attachments')));
         }
+
+        if ($att->getErrors()->count() > 1) {
+            // todo moet beter
+            Session::flash('error', '<ul class="list-unstyled">' . join('', $att->getErrors()->get('attachments', '<li>:message</li>')) . '</ul>');
+        }
+
+
         if ($att->getMessages()->count() > 0) {
             // todo moet beter
-            Session::flash('info', '<ul>' . join('', $att->getMessages()->get('attachments', '<li>:message</li>')) . '</ul>');
+            Session::flash('info', '<ul class="list-unstyled">' . join('', $att->getMessages()->get('attachments', '<li>:message</li>')) . '</ul>');
         }
 
         event(new JournalSaved($journal));
diff --git a/resources/twig/partials/flashes.twig b/resources/twig/partials/flashes.twig
index d71dd9f381..5cfc0ae4ca 100644
--- a/resources/twig/partials/flashes.twig
+++ b/resources/twig/partials/flashes.twig
@@ -6,10 +6,29 @@
 {% endif %}
 
 {% if Session.has('info') %}
+
     <div class="alert alert-info alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
-        <strong>Info:</strong> {{ Session.get('info')|raw }}
+
+        {% if Session.get('info') is iterable and Session.get('info')|length > 1 %}
+            <strong>{{ Session.get('info')|length }} messages:</strong>
+            <ul class="list-unstyled">
+                {% for err in Session.get('info') %}
+                    <li>{{ err }}</li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+        {% if Session.get('info') is iterable and Session.get('info')|length == 1 %}
+            <strong>Message:</strong>
+            {{ Session.get('info')[0]|raw }}
+        {% endif %}
+
+        {% if Session.get('info') is not iterable %}
+            <strong>Message:</strong> {{ Session.get('info')|raw }}
+        {% endif %}
+
     </div>
+
 {% endif %}
 
 {% if Session.has('warning') %}
@@ -22,6 +41,23 @@
 {% if Session.has('error') %}
     <div class="alert alert-danger alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
-        <strong>Error!</strong> {{ Session.get('error')|raw }}
+
+        {% if Session.get('error') is iterable and Session.get('error')|length > 1 %}
+            <strong>{{ Session.get('error')|length }} errors:</strong>
+            <ul class="list-unstyled">
+                {% for err in Session.get('error') %}
+                    <li>{{ err }}</li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+        {% if Session.get('error') is iterable and Session.get('error')|length == 1 %}
+            <strong>Error!</strong>
+            {{ Session.get('error')[0]|raw }}
+        {% endif %}
+
+        {% if Session.get('error') is not iterable %}
+            <strong>Error!</strong> {{ Session.get('error')|raw }}
+        {% endif %}
+
     </div>
 {% endif %}