Merge pull request #583 from amadeusproject/refactoring

Daily Update - 10_10_2017

Merge pull request #583 from amadeusproject/refactoring
Daily Update - 10_10_2017
Erik Zambom · GitHub
2 parents f0701a3a 336aaa96
Showing 6 changed files with 57 additions and 17 deletions Show diff stats
amadeus/templates/base.html
api/views.py
categories/templates/categories/_form.html
chat/serializers.py
subjects/templates/subjects/_form.html
subjects/templates/subjects/view.html
@@ -87,7 +87,7 @@
         if (array.length > 1) {
             new_lang += '-';
-            new_lang += array[1].toUpperCase();            
+            new_lang += array[1].toUpperCase();
         }
     </script>
@@ -205,7 +205,7 @@
                 </ul>
             </div>
         </div>
-		
+
         <!-- Mobile Menu -->
         <div class="navbar navbar-default hidden-lg hidden-md">
             <div class="navbar-header">
@@ -366,23 +366,25 @@
                             <a href=""><i class="fa fa-bar-chart" aria-hid{% get_current_language as LANGUAGE_CODE %}den="true"></i></a>
                         </li>
                     </ul>
-                {% endblock %}           
+                {% endblock %}
             </div>
             <div id="page_content" class="col-xs-12 col-sm-12 col-md-11 col-lg-11">
+							<div class="dropdown dropdown_crumb">
                 {% block breadcrumbs %}
                     {% breadcrumb 'Home' 'home' %}
                 {% endblock %}
+								<div class="drop_change" style="width:100%">
                 {% block render_breadcrumbs %}
                     {% render_breadcrumbs %}
                 {% endblock %}
-                
+								</div>
+							</div>
                 {% block content %}
                 {% endblock %}
             </div>
         </div>
     </div>
-
     {% block footer %}
     {% endblock %}
@@ -312,7 +312,7 @@ class ChatViewset(viewsets.ModelViewSet, LogMixin):
 			messages = TalkMessages.objects.filter((Q(talk__user_one__email = username) & Q(talk__user_two__email = user_two)) | (Q(talk__user_one__email = user_two) & Q(talk__user_two__email = username))).order_by('-create_date')
-			serializer = ChatSerializer(messages, many = True)
+			serializer = ChatSerializer(messages, many = True, context = {"request_user": user})
 			json_r = json.dumps(serializer.data)
 			json_r = json.loads(json_r)
@@ -63,8 +63,14 @@
 			</div>
 		{% endif %}
 	{% endfor %}
-	<div class="row text-center">
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
+	<div class="row">
+		<div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
+			<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
+		</div>
+
+		<div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
+			<a href="{% url 'home' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
+		</div>
 	</div>
 </form>
 from rest_framework import serializers
-from .models import TalkMessages
+from django.db.models import Q
+
+from .models import TalkMessages, ChatFavorites
 from subjects.serializers import SubjectSerializer
 from users.serializers import UserSerializer
@@ -8,7 +10,16 @@ from users.serializers import UserSerializer
 class ChatSerializer(serializers.ModelSerializer):
 	user = UserSerializer()
 	subject = SubjectSerializer()
+	favorite = serializers.SerializerMethodField()
+
+	def get_favorite(self, message):
+		user = self.context.get("request_user", None)
+
+		if not user is None:
+			return ChatFavorites.objects.filter(Q(user = user) & Q(message = message)).exists()
+
+		return False
 	class Meta:
 		model = TalkMessages
-		fields = ('text', 'user', 'subject', 'image_url', 'create_date', )
+		fields = ('text', 'user', 'subject', 'image_url', 'create_date', 'favorite')
@@ -87,8 +87,14 @@
 			</div>
 		{% endif %}
 	{% endfor %}
-	<div class="row text-center">
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
+	<div class="row">
+		<div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
+			<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
+		</div>
+
+		<div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
+			<a href="{% url 'home' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
+		</div>
 	</div>
 </form>
@@ -6,8 +6,23 @@
 {% block javascript%}
     {{ block.super }}
     <script type="text/javascript" src="{% static 'subjects/js/modal_subject.js' %}"></script>
+    <script type="text/javascript">
+    $(document).ready( function () {
+    	var ul = '';
+    	var div_crumb = $(".dropdown_crumb");
+      var div_change = $(".drop_change");
+    	if(window.innerWidth < 768) {
+    		ul = document.querySelector("ul.breadcrumb");
+    		if (ul) {
+    			ul.classList.remove('breadcrumb');
+    			ul.classList.add('screen_drop');
+    		}
+        div_change.addClass("dropdown-menu");
+        div_crumb.prepend("<button class='btn btn-block dropdown-toggle' type='button' data-toggle='dropdown'>{% trans 'Navigate' %} <span class='caret'></span></button>")
+      }
+    });
+    </script>
 {% endblock%}
-
 {% block breadcrumbs %}
     {{ block.super }}
     {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
@@ -83,7 +98,7 @@
             {% endif %}
             {% include 'topics/list.html' with subject=subject %}
-            
+
             <div id="participants" data-toggle="tooltip" data-title="{% trans 'Participants' %}">
                 <i class="fa fa-group"></i>
             </div>
@@ -163,7 +178,7 @@
                     var popover = $(".popover.fade.in"),
                         buttons = popover.parent().find('a'),
                         close = popover.parent().find('.close:visible');
-    
+
                     popover.animate({
                         'max-width': '330px',
                     }, 0);
@@ -178,7 +193,7 @@
                     close.on("click", function () {
                         popover.popover('hide');
-                    }); 
+                    });
                     buttons.on("click", function () {
                         popover.popover('hide');
@@ -189,7 +204,7 @@
             $('#participants').on('click', function(){
                 var $this = $(this),
                     list = $this.parent().find(".participants-list");
-                
+
                 if ($this.hasClass('open')) {
                     $this.animate({
                         right : '0px'
	@@ -312,7 +312,7 @@ class ChatViewset(viewsets.ModelViewSet, LogMixin):		@@ -312,7 +312,7 @@ class ChatViewset(viewsets.ModelViewSet, LogMixin):
312		312
313	messages = TalkMessages.objects.filter((Q(talk__user_one__email = username) & Q(talk__user_two__email = user_two)) \| (Q(talk__user_one__email = user_two) & Q(talk__user_two__email = username))).order_by('-create_date')	313	messages = TalkMessages.objects.filter((Q(talk__user_one__email = username) & Q(talk__user_two__email = user_two)) \| (Q(talk__user_one__email = user_two) & Q(talk__user_two__email = username))).order_by('-create_date')
314		314
315	- serializer = ChatSerializer(messages, many = True)	315	+ serializer = ChatSerializer(messages, many = True, context = {"request_user": user})
316		316
317	json_r = json.dumps(serializer.data)	317	json_r = json.dumps(serializer.data)
318	json_r = json.loads(json_r)	318	json_r = json.loads(json_r)