From d9bc8ef689beebb7d0f5034514f561b9b312a185 Mon Sep 17 00:00:00 2001
From: Jailson Dias <jcd2@cin.ufpe.br>
Date: Tue, 9 May 2017 17:35:05 -0300
Subject: [PATCH] Resolvendo bug 1 e 2 em webpage

---
 webpage/forms.py                           |  2 +-
 webpage/templates/webpages/relatorios.html | 49 ++++++++++++++++++++++++++++++++++++++-----------
 webpage/views.py                           | 18 +++++++++++++-----
 3 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/webpage/forms.py b/webpage/forms.py
index d76721f..21b240c 100644
--- a/webpage/forms.py
+++ b/webpage/forms.py
@@ -102,7 +102,7 @@ class FormModalMessage(forms.Form):
     MAX_UPLOAD_SIZE = 5*1024*1024
 
     comment = forms.CharField(widget=forms.Textarea,label=_("Message"))
-    image = forms.FileField(widget=ResubmitFileWidget(attrs={'accept':'image/*'}))
+    image = forms.FileField(widget=ResubmitFileWidget(attrs={'accept':'image/*'}),required=False)
 
     def clean_comment(self):
         comment = self.cleaned_data.get('comment', '')
diff --git a/webpage/templates/webpages/relatorios.html b/webpage/templates/webpages/relatorios.html
index b70d0c5..2ccd0f1 100644
--- a/webpage/templates/webpages/relatorios.html
+++ b/webpage/templates/webpages/relatorios.html
@@ -84,6 +84,7 @@
                    }
                    searcher(col, tabela_atual,true);
                }
+                scroll("#title-table");
            }
           chart.setSelection([])
          }
@@ -153,16 +154,18 @@
 {% endblock %}
 
 {% block content %}
-    {% if messages %}
-        {% for message in messages %}
-            <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-                <p>{{ message }}</p>
-            </div>
-        {% endfor %}
-    {% endif %}
+    <div id="message-top">
+        {% if messages %}
+            {% for message in messages %}
+                <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                    <p>{{ message }}</p>
+                </div>
+            {% endfor %}
+        {% endif %}
+    </div>
     <div class="panel panel-info topic-panel">
         <div class="panel-heading">
             <div class="row">
@@ -392,17 +395,41 @@
                         $("body").removeClass("modal-open");
                         $( "#modal-message" ).empty();
                         $(".modal-backdrop.fade.in").remove();
+                        $("#message-top").empty();
+                        $("#message-top").append('\
+                            <div class="alert alert-success alert-dismissible" role="alert">\
+                                <button type="button" class="close" data-dismiss="alert" aria-label="Close">\
+                                    <span aria-hidden="true">&times;</span>\
+                                </button>\
+                                <p>' + data["message"] + '</p>\
+                            </div>\
+                        ');
+                         $("html, body").animate({ scrollTop: 0 }, "slow");
+                         $('#google-chart-checkbox')[0].reset();
                     } else {
                         $( "#modal-message" ).empty();
                         $(".modal-backdrop.fade.in").remove();
                         $( "#modal-message" ).append( data );
                         $("#send-message-modal").modal("show");
+                        $("html, body").animate({ scrollTop: 0 }, "slow");
                     }
                 },
                 error: function(data){
-                    console.log("erro");
+                    $("#message-top").empty();
+                    $("#message-top").append('\
+                        <div class="alert alert-danger alert-dismissible" role="alert">\
+                            <button type="button" class="close" data-dismiss="alert" aria-label="Close">\
+                                <span aria-hidden="true">&times;</span>\
+                            </button>\
+                            <p>' + data.responseText + '</p>\
+                        </div>\
+                    ');
+                    $("html, body").animate({ scrollTop: 0 }, "slow");
                 }
             });
         }
+        function scroll(to){
+            $("html, body").animate({ scrollTop: $(to).offset().top }, "slow");
+        }
     </script>
 {% endblock %}
diff --git a/webpage/views.py b/webpage/views.py
index c090ecd..4d849cf 100644
--- a/webpage/views.py
+++ b/webpage/views.py
@@ -513,6 +513,8 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView):
 
 
 
+from django.http import HttpResponse #used to send HTTP 404 error to ajax
+
 class SendMessage(LoginRequiredMixin, LogMixin, generic.edit.FormView):
     log_component = 'resources'
     log_action = 'send'
@@ -541,11 +543,17 @@ class SendMessage(LoginRequiredMixin, LogMixin, generic.edit.FormView):
         users = (self.request.POST.get('users[]','')).split(",")
         user = self.request.user
         subject = self.webpage.topic.subject
-        for u in users:
-            to_user = User.objects.get(email=u)
-            talk, create = Conversation.objects.get_or_create(user_one=user,user_two=to_user)
-            created = TalkMessages.objects.create(text=message,talk=talk,user=user,subject=subject,image=image)
-        return JsonResponse({"message":"ok"})
+        
+        if (users[0] is not ''):
+            for u in users:
+                to_user = User.objects.get(email=u)
+                talk, create = Conversation.objects.get_or_create(user_one=user,user_two=to_user)
+                created = TalkMessages.objects.create(text=message,talk=talk,user=user,subject=subject,image=image)
+            success = str(_('The message was successfull sent!'))
+            return JsonResponse({"message":success})
+        erro = HttpResponse(str(_("No user selected!")))
+        erro.status_code = 404
+        return erro
 
     def get_context_data(self, **kwargs):
         context = super(SendMessage,self).get_context_data()
--
libgit2 0.21.2