From e4e33c3036bf90692c03586d600bb1d1006a09be Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Wed, 14 Sep 2016 22:36:37 -0300
Subject: [PATCH] Adding student/teacher home content with infinite scroll [Issues: #44 / #43]

---
 app/templates/home.html                         |  15 +++++++++++----
 app/templates/home_admin_content.html           |   2 +-
 app/templates/home_teacher_student_content.html |  19 +++++++++++++++++++
 app/views.py                                    |   4 ++--
 core/static/css/base/amadeus.css                |   2 +-
 logs/log_file_02-09-2016.txt                    |   6 ------
 logs/log_file_03-09-2016.txt                    |   3 ---
 logs/log_file_05-09-2016.txt                    |  52 ----------------------------------------------------
 logs/log_file_06-09-2016.txt                    | 100 ----------------------------------------------------------------------------------------------------
 logs/log_file_07-09-2016.txt                    |  10 ----------
 10 files changed, 34 insertions(+), 179 deletions(-)
 delete mode 100644 logs/log_file_02-09-2016.txt
 delete mode 100644 logs/log_file_03-09-2016.txt
 delete mode 100644 logs/log_file_05-09-2016.txt
 delete mode 100644 logs/log_file_06-09-2016.txt
 delete mode 100644 logs/log_file_07-09-2016.txt

diff --git a/app/templates/home.html b/app/templates/home.html
index 93131ef..d3381b9 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -103,11 +103,18 @@
 {% block content %}
 	{% if user|has_role:'system_admin' %}
 		<h3>{% trans 'Courses' %}</h3>
-	{% endif %}
 
-	<div id="timeline">
-		{% include page_template %}
-	</div>
+		<div id="timeline">
+			{% include page_template %}
+		</div>
+	{% else %}
+		<ul class="timeline" style="-webkit-padding-start: 0px">
+			<div id="timeline">
+				{% include page_template %}
+			</div>
+		</ul>
+	{% endif %}
+	
 	<div id="loading" class="alert alert-primary" role="alert" style="display: none">
 		<center>
 			<span class="fa fa-spin fa-circle-o-notch"></span>
diff --git a/app/templates/home_admin_content.html b/app/templates/home_admin_content.html
index 49f926d..9e858a5 100644
--- a/app/templates/home_admin_content.html
+++ b/app/templates/home_admin_content.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-{% for course in courses %}
+{% for course in objects %}
     <div class="panel panel-default courseHome">
       	<div class="panel-body">
         	<p>{{ course }}</p>
diff --git a/app/templates/home_teacher_student_content.html b/app/templates/home_teacher_student_content.html
index e69de29..7e77852 100644
--- a/app/templates/home_teacher_student_content.html
+++ b/app/templates/home_teacher_student_content.html
@@ -0,0 +1,19 @@
+{% load i18n %}
+
+{% for notification in objects %}
+    <li {% if not notification.read %}class="not_read"{% endif %}>
+        <div class="avatar">
+            <img src="{{ notification.user.image.url }}">
+        </div>
+        <div class="bubble-container">
+            <div class="bubble">
+                <div class="retweet" style="color: white">
+                    {{ notification.datetime }}
+                </div>
+                <h3>{{ notification.user }}</h3> - <h3>{{ notification.action_resource }}</h3><br/>
+                <a href="{% url 'core:notification_read' notification.id %}">{{ notification }}</a>
+            </div>
+            <div class="arrow"></div>
+        </div>
+    </li>
+{% endfor %}
\ No newline at end of file
diff --git a/app/views.py b/app/views.py
index bb82053..0d1f7b0 100644
--- a/app/views.py
+++ b/app/views.py
@@ -15,7 +15,7 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
 	redirect_field_name = 'next'
 
 	template_name = "home.html"
-	context_object_name = 'courses'
+	context_object_name = 'objects'
 	paginate_by = 10
 
 	not_action = "Acessar"
@@ -25,7 +25,7 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
 		if self.request.user.is_staff:
 			objects = Course.objects.all()
 		else:
-			objects = Notification.objects.filter(user = self.request.user)
+			objects = Notification.objects.filter(user = self.request.user).order_by('-datetime')
 
 		return objects
 
diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index 64b487d..e45b509 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -115,7 +115,7 @@ ul {
   margin-bottom: 2em; }
   .timeline li {
     padding: 1em 0; }
-  .timeline li:nth-child(even) {
+  .timeline li.not_read {
     background-color: #d3d7d8; }
 
 .avatar {
diff --git a/logs/log_file_02-09-2016.txt b/logs/log_file_02-09-2016.txt
deleted file mode 100644
index b34f623..0000000
--- a/logs/log_file_02-09-2016.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-02/09/2016 23:34:45 - zambom - Entrou no sistema
-02/09/2016 23:34:45 - zambom - Acessou home
-02/09/2016 23:55:55 - jailson - Entrou no sistema
-02/09/2016 23:55:55 - jailson - Acessou home
-02/09/2016 23:56:05 - jailson - Acessou home
-02/09/2016 23:56:25 - jailson - Acessou home
diff --git a/logs/log_file_03-09-2016.txt b/logs/log_file_03-09-2016.txt
deleted file mode 100644
index f5934d4..0000000
--- a/logs/log_file_03-09-2016.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-03/09/2016 20:13:26 - zambom - Entrou no sistema
-03/09/2016 20:13:26 - zambom - Acessou home
-03/09/2016 20:13:45 - zambom - Acessou home
diff --git a/logs/log_file_05-09-2016.txt b/logs/log_file_05-09-2016.txt
deleted file mode 100644
index 6596cda..0000000
--- a/logs/log_file_05-09-2016.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-05/09/2016 02:41:58 - matheuslins - Entrou no sistema
-05/09/2016 02:41:58 - matheuslins - Acessou home
-05/09/2016 02:43:00 - matheuslins - Acessou home
-05/09/2016 02:43:14 - matheuslins - Entrou no sistema
-05/09/2016 02:43:14 - matheuslins - Acessou home
-05/09/2016 02:43:18 - matheuslins - Acessou home
-05/09/2016 02:44:46 - matheuslins - Acessou home
-05/09/2016 02:45:32 - matheuslins - Entrou no sistema
-05/09/2016 02:45:32 - matheuslins - Acessou home
-05/09/2016 03:09:26 - matheuslins - Acessou home
-05/09/2016 03:09:29 - matheuslins - Acessou home
-05/09/2016 03:11:13 - matheuslins - Acessou home
-05/09/2016 04:07:13 - test - Entrou no sistema
-05/09/2016 04:07:13 - test - Acessou home
-05/09/2016 04:08:48 - test - Entrou no sistema
-05/09/2016 04:08:48 - test - Acessou home
-05/09/2016 04:09:55 - test - Entrou no sistema
-05/09/2016 04:09:55 - test - Acessou home
-05/09/2016 04:12:37 - test - Entrou no sistema
-05/09/2016 04:12:37 - test - Acessou home
-05/09/2016 04:13:00 - test - Entrou no sistema
-05/09/2016 04:13:00 - test - Acessou home
-05/09/2016 04:13:23 - test - Entrou no sistema
-05/09/2016 04:13:23 - test - Acessou home
-05/09/2016 04:15:02 - test - Entrou no sistema
-05/09/2016 04:15:02 - test - Acessou home
-05/09/2016 04:20:19 - matheuslins - Entrou no sistema
-05/09/2016 04:20:19 - matheuslins - Acessou home
-05/09/2016 04:21:11 - matheuslins - Acessou home
-05/09/2016 04:36:46 - test - Entrou no sistema
-05/09/2016 04:36:46 - test - Acessou home
-05/09/2016 04:37:23 - test - Entrou no sistema
-05/09/2016 04:37:23 - test - Acessou home
-05/09/2016 04:37:41 - test - Entrou no sistema
-05/09/2016 04:37:41 - test - Acessou home
-05/09/2016 04:38:01 - test - Entrou no sistema
-05/09/2016 04:38:01 - test - Acessou home
-05/09/2016 04:38:23 - test - Entrou no sistema
-05/09/2016 04:38:23 - test - Acessou home
-05/09/2016 04:38:39 - test - Entrou no sistema
-05/09/2016 04:38:39 - test - Acessou home
-05/09/2016 04:39:39 - test - Entrou no sistema
-05/09/2016 04:39:39 - test - Acessou home
-05/09/2016 04:40:28 - matheuslins - Acessou home
-05/09/2016 15:14:48 - matheuslins - Acessou home
-05/09/2016 15:28:49 - zambom - Acessou home
-05/09/2016 15:29:02 - zambom - Entrou no sistema
-05/09/2016 15:29:02 - zambom - Acessou home
-05/09/2016 15:31:13 - zambom - Entrou no sistema
-05/09/2016 15:31:13 - zambom - Acessou home
-05/09/2016 20:20:12 - admin - Entrou no sistema
-05/09/2016 20:20:13 - admin - Acessou home
\ No newline at end of file
diff --git a/logs/log_file_06-09-2016.txt b/logs/log_file_06-09-2016.txt
deleted file mode 100644
index 51c5b28..0000000
--- a/logs/log_file_06-09-2016.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-06/09/2016 00:07:02 - teste - Entrou no sistema
-06/09/2016 00:07:02 - teste - Acessou home
-06/09/2016 00:08:58 - teste - Acessou home
-06/09/2016 01:01:27 - test - Entrou no sistema
-06/09/2016 01:01:27 - test - Acessou home
-06/09/2016 01:05:49 - test - Entrou no sistema
-06/09/2016 01:05:49 - test - Acessou home
-06/09/2016 01:07:43 - test - Entrou no sistema
-06/09/2016 01:07:43 - test - Acessou home
-06/09/2016 01:08:45 - test - Entrou no sistema
-06/09/2016 01:08:45 - test - Acessou home
-06/09/2016 01:11:30 - test - Entrou no sistema
-06/09/2016 01:11:30 - test - Acessou home
-06/09/2016 01:12:02 - test - Entrou no sistema
-06/09/2016 01:12:02 - test - Acessou home
-06/09/2016 01:13:00 - test - Entrou no sistema
-06/09/2016 01:13:00 - test - Acessou home
-06/09/2016 01:16:27 - test - Entrou no sistema
-06/09/2016 01:16:27 - test - Acessou home
-06/09/2016 01:17:35 - test - Entrou no sistema
-06/09/2016 01:17:35 - test - Acessou home
-06/09/2016 01:18:15 - test - Entrou no sistema
-06/09/2016 01:18:15 - test - Acessou home
-06/09/2016 01:22:19 - test - Entrou no sistema
-06/09/2016 01:22:19 - test - Acessou home
-06/09/2016 01:25:09 - test - Entrou no sistema
-06/09/2016 01:25:09 - test - Acessou home
-06/09/2016 01:25:35 - test - Entrou no sistema
-06/09/2016 01:25:35 - test - Acessou home
-06/09/2016 01:26:40 - test - Entrou no sistema
-06/09/2016 01:26:40 - test - Acessou home
-06/09/2016 01:27:40 - test - Entrou no sistema
-06/09/2016 01:27:40 - test - Acessou home
-06/09/2016 01:28:50 - test - Entrou no sistema
-06/09/2016 01:28:50 - test - Acessou home
-06/09/2016 01:30:51 - test - Entrou no sistema
-06/09/2016 01:30:51 - test - Acessou home
-06/09/2016 01:41:51 - test - Entrou no sistema
-06/09/2016 01:41:51 - test - Acessou home
-06/09/2016 01:43:59 - test - Entrou no sistema
-06/09/2016 01:43:59 - test - Acessou home
-06/09/2016 01:45:22 - test - Entrou no sistema
-06/09/2016 01:45:22 - test - Acessou home
-06/09/2016 01:45:51 - test - Entrou no sistema
-06/09/2016 01:45:51 - test - Acessou home
-06/09/2016 01:46:02 - test - Entrou no sistema
-06/09/2016 01:46:02 - test - Acessou home
-06/09/2016 01:46:18 - test - Entrou no sistema
-06/09/2016 01:46:18 - test - Acessou home
-06/09/2016 01:46:28 - test - Entrou no sistema
-06/09/2016 01:46:28 - test - Acessou home
-06/09/2016 02:39:03 - test - Entrou no sistema
-06/09/2016 02:39:03 - test - Acessou home
-06/09/2016 02:39:41 - test - Entrou no sistema
-06/09/2016 02:39:41 - test - Acessou home
-06/09/2016 02:40:57 - test - Entrou no sistema
-06/09/2016 02:40:57 - test - Acessou home
-06/09/2016 02:41:50 - test - Entrou no sistema
-06/09/2016 02:41:50 - test - Acessou home
-06/09/2016 02:46:53 - test - Entrou no sistema
-06/09/2016 02:46:53 - test - Acessou home
-06/09/2016 02:47:14 - test - Entrou no sistema
-06/09/2016 02:47:14 - test - Acessou home
-06/09/2016 02:50:33 - test - Entrou no sistema
-06/09/2016 02:50:33 - test - Acessou home
-06/09/2016 02:52:54 - test - Entrou no sistema
-06/09/2016 02:52:54 - test - Acessou home
-06/09/2016 02:57:03 - test - Entrou no sistema
-06/09/2016 02:57:03 - test - Acessou home
-06/09/2016 03:02:15 - test - Entrou no sistema
-06/09/2016 03:02:15 - test - Acessou home
-06/09/2016 16:20:42 - test - Entrou no sistema
-06/09/2016 16:20:42 - test - Acessou home
-06/09/2016 16:29:26 - test - Entrou no sistema
-06/09/2016 16:29:26 - test - Acessou home
-06/09/2016 16:31:14 - test - Entrou no sistema
-06/09/2016 16:31:14 - test - Acessou home
-06/09/2016 16:33:06 - test - Entrou no sistema
-06/09/2016 16:33:06 - test - Acessou home
-06/09/2016 16:33:26 - test - Entrou no sistema
-06/09/2016 16:33:26 - test - Acessou home
-06/09/2016 16:33:36 - test - Entrou no sistema
-06/09/2016 16:33:36 - test - Acessou home
-06/09/2016 16:34:10 - test - Entrou no sistema
-06/09/2016 16:34:10 - test - Acessou home
-06/09/2016 16:34:29 - test - Entrou no sistema
-06/09/2016 16:34:29 - test - Acessou home
-06/09/2016 21:30:40 - test - Entrou no sistema
-06/09/2016 21:30:40 - test - Acessou home
-06/09/2016 21:32:32 - test - Entrou no sistema
-06/09/2016 21:32:32 - test - Acessou home
-06/09/2016 21:34:11 - test - Entrou no sistema
-06/09/2016 21:34:11 - test - Acessou home
-06/09/2016 21:38:44 - test - Entrou no sistema
-06/09/2016 21:38:44 - test - Acessou home
-06/09/2016 21:58:49 - jailson - Entrou no sistema
-06/09/2016 21:58:49 - jailson - Acessou home
-06/09/2016 21:59:05 - jailson - Acessou home
-06/09/2016 21:59:35 - jailson - Acessou home
-06/09/2016 21:59:42 - jailson - Acessou home
diff --git a/logs/log_file_07-09-2016.txt b/logs/log_file_07-09-2016.txt
deleted file mode 100644
index 9515f31..0000000
--- a/logs/log_file_07-09-2016.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-07/09/2016 17:10:46 - matheuslins - Entrou no sistema
-07/09/2016 17:10:46 - matheuslins - Acessou home
-07/09/2016 17:10:58 - matheuslins - Acessou home
-07/09/2016 17:12:12 - matheuslins - Acessou home
-07/09/2016 17:12:15 - matheuslins - Acessou home
-07/09/2016 17:12:24 - matheuslins - Acessou home
-07/09/2016 17:17:16 - matheuslins - Entrou no sistema
-07/09/2016 17:17:16 - matheuslins - Acessou home
-07/09/2016 17:24:09 - test - Entrou no sistema
-07/09/2016 17:24:09 - test - Acessou home
--
libgit2 0.21.2