Download as
Browse Code »

Commit f1c25e0814bf047c27c82dba7d01beccef6dfefc

Authored by Jailson Dias
2 parents ae6c1839 2c02d7ee
Exists in master and in 2 other branches amadeus_univasf, refactoring

Merge branch 'refactoring' into amadeus_univasf

Showing 9 changed files with 100 additions and 7 deletions   Show diff stats
amadeus/static/js/chat.js
  Diff comments   View file @f1c25e0
1 var new_msgs = {}; 1 var new_msgs = {};
2 2
  3 +$(document).on('hidden.bs.modal', '.modal', function () {
  4 + $('.modal:visible').length && $(document.body).addClass('modal-open'); //Fixing scroll bar for modals
  5 +});
  6 +
3 $('#chat-modal-info').on('show.bs.modal', function (e) { 7 $('#chat-modal-info').on('show.bs.modal', function (e) {
4 var header = $(this).find('.talk_header'); 8 var header = $(this).find('.talk_header');
5 if (header.length > 0) { 9 if (header.length > 0) {
@@ -53,6 +57,12 @@ function getModalInfo(btn, space, space_type) { @@ -53,6 +57,12 @@ function getModalInfo(btn, space, space_type) {
53 $(this).animate({scrollTop: height}, 0); 57 $(this).animate({scrollTop: height}, 0);
54 }); 58 });
55 59
  60 + $(".messages-container").on('scroll', function () {
  61 + if ($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight) {
  62 + $('.messages_new').hide();
  63 + }
  64 + });
  65 +
56 setShortChatFormSubmit(); 66 setShortChatFormSubmit();
57 setFiltersSubmitAndPagination(); 67 setFiltersSubmitAndPagination();
58 } else { 68 } else {
@@ -63,6 +73,12 @@ function getModalInfo(btn, space, space_type) { @@ -63,6 +73,12 @@ function getModalInfo(btn, space, space_type) {
63 $(this).animate({scrollTop: height}, 0); 73 $(this).animate({scrollTop: height}, 0);
64 }); 74 });
65 75
  76 + $(".messages-container").on('scroll', function () {
  77 + if ($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight) {
  78 + $('.messages_new').hide();
  79 + }
  80 + });
  81 +
66 setShortChatFormSubmit(); 82 setShortChatFormSubmit();
67 setFiltersSubmitAndPagination(); 83 setFiltersSubmitAndPagination();
68 }); 84 });
@@ -73,6 +89,10 @@ function getModalInfo(btn, space, space_type) { @@ -73,6 +89,10 @@ function getModalInfo(btn, space, space_type) {
73 }); 89 });
74 90
75 $("#msg_editable").on('focusin', function () { 91 $("#msg_editable").on('focusin', function () {
  92 + $(".msg_placeholder").hide();
  93 + });
  94 +
  95 + $("#msg_editable").on('keydown', function () {
76 $("#send-img").hide(); 96 $("#send-img").hide();
77 $("#send-msg").show(); 97 $("#send-msg").show();
78 98
@@ -227,7 +247,7 @@ function setShortChatFormSubmit() { @@ -227,7 +247,7 @@ function setShortChatFormSubmit() {
227 new_msgs[data.talk_id].push(data.new_id); 247 new_msgs[data.talk_id].push(data.new_id);
228 248
229 editable.html(""); 249 editable.html("");
230 - editable.trigger("focusout"); 250 + editable.blur();
231 251
232 frm.attr('action', data.new_form_url); 252 frm.attr('action', data.new_form_url);
233 $("#send-img").data('url', data.new_form_url); 253 $("#send-img").data('url', data.new_form_url);
amadeus/static/js/socket.js
  Diff comments   View file @f1c25e0
@@ -21,6 +21,8 @@ socket.onmessage = function(e) { @@ -21,6 +21,8 @@ socket.onmessage = function(e) {
21 } 21 }
22 } else if (content.type == "chat") { 22 } else if (content.type == "chat") {
23 messageReceived(content); 23 messageReceived(content);
  24 + } else if (content.type == "user_status") {
  25 + changeUserStatus(content);
24 } 26 }
25 } 27 }
26 // Call onopen directly if socket is already open 28 // Call onopen directly if socket is already open
@@ -297,4 +299,18 @@ function messageReceived(content) { @@ -297,4 +299,18 @@ function messageReceived(content) {
297 setTimeout(notification.close.bind(notification), 3000); 299 setTimeout(notification.close.bind(notification), 3000);
298 } 300 }
299 } 301 }
  302 +}
  303 +
  304 +function changeUserStatus(content) {
  305 + var elem = $(".user_" + content.user_id + "_status");
  306 +
  307 + elem.removeClass(content.remove_class);
  308 +
  309 + if (content.status_class == "") {
  310 + elem.removeClass('active');
  311 + } else {
  312 + elem.addClass(content.status_class);
  313 + }
  314 +
  315 + elem.attr('data-original-title', content.status);
300 } 316 }
301 \ No newline at end of file 317 \ No newline at end of file
chat/templates/chat/_profile.html
  Diff comments   View file @f1c25e0
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <img src="{{ participant.image_url }}" /> 14 <img src="{{ participant.image_url }}" />
15 </span> 15 </span>
16 <h4> 16 <h4>
17 - <a class="status {{ status }}" title="{{ status|status_text }}"></a> 17 + <a class="user_{{ participant.id }}_status status {{ status }}" title="{{ status|status_text }}"></a>
18 <b>{{ participant }}</b> 18 <b>{{ participant }}</b>
19 </h4> 19 </h4>
20 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-raised btn-success btn-block">{% trans 'Send Message' %}</a> 20 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-raised btn-success btn-block">{% trans 'Send Message' %}</a>
chat/templates/chat/_view.html
  Diff comments   View file @f1c25e0
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <img src="{{ talking_to.image_url }}" class="img-responsive" /> 9 <img src="{{ talking_to.image_url }}" class="img-responsive" />
10 </div> 10 </div>
11 <div class="col-md-6 user-info"> 11 <div class="col-md-6 user-info">
12 - <h4 class='talking-header'><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ talking_to }} (<span class="chat_notify">{{ chat|notifies:request.user }}</span>)</h4> 12 + <h4 class='talking-header'><a class="user_{{ talking_to.id }}_status status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ talking_to }} (<span class="chat_notify">{{ chat|notifies:request.user }}</span>)</h4>
13 <p class="talk-last_msg">{% trans 'Last message in' %} {{ chat|last_message }}</p> 13 <p class="talk-last_msg">{% trans 'Last message in' %} {{ chat|last_message }}</p>
14 </div> 14 </div>
15 <div class="col-md-4 buttons pull-right text-center"> 15 <div class="col-md-4 buttons pull-right text-center">
chat/templates/chat/_view_participant.html
  Diff comments   View file @f1c25e0
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <img src="{{ participant.image_url }}" class="img-responsive" /> 7 <img src="{{ participant.image_url }}" class="img-responsive" />
8 </div> 8 </div>
9 <div class="col-md-6 user-info"> 9 <div class="col-md-6 user-info">
10 - <h4><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4> 10 + <h4><a class="user_{{ participant.id }}_status status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4>
11 </div> 11 </div>
12 <div class="col-md-4 buttons pull-right text-center"> 12 <div class="col-md-4 buttons pull-right text-center">
13 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:profile" participant.email %}' class="btn btn-raised btn-default">{% trans 'See Profile' %}</a> 13 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:profile" participant.email %}' class="btn btn-raised btn-default">{% trans 'See Profile' %}</a>
chat/templates/chat/talk.html
  Diff comments   View file @f1c25e0
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <img src="{{ participant.image_url }}" /> 11 <img src="{{ participant.image_url }}" />
12 </span> 12 </span>
13 <h4 class="pull-left" data-breadcrumb="{% trans 'Talk with ' %}{{ participant }}"> 13 <h4 class="pull-left" data-breadcrumb="{% trans 'Talk with ' %}{{ participant }}">
14 - <a class="status {{ status }}" title="{{ status|status_text }}"></a> 14 + <a class="user_{{ participant.id }}_status status {{ status }}" title="{{ status|status_text }}"></a>
15 <b>{{ participant }}</b> 15 <b>{{ participant }}</b>
16 </h4> 16 </h4>
17 </div> 17 </div>
subjects/templates/subjects/view.html
  Diff comments   View file @f1c25e0
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 93
94 <div class="participants-container"> 94 <div class="participants-container">
95 <div class="col-md-12 sub-user" data-toggle="popover" data-container="body" data-placement="left"> 95 <div class="col-md-12 sub-user" data-toggle="popover" data-container="body" data-placement="left">
96 - <h4><a class="status {{ status }}" data-placement="right" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4> 96 + <h4><a class="user_{{ participant.id }}_status status {{ status }}" data-placement="right" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4>
97 </div> 97 </div>
98 98
99 <div class="popover"> 99 <div class="popover">
users/middleware.py
  Diff comments   View file @f1c25e0
@@ -9,6 +9,11 @@ from session_security.utils import get_last_activity, set_last_activity @@ -9,6 +9,11 @@ from session_security.utils import get_last_activity, set_last_activity
9 9
10 from log.models import Log 10 from log.models import Log
11 11
  12 +from .models import User
  13 +from django.utils.translation import ugettext as _u
  14 +from channels import Group
  15 +import json
  16 +
12 class SessionExpireMiddleware(object): 17 class SessionExpireMiddleware(object):
13 18
14 def process_request(self, request): 19 def process_request(self, request):
@@ -33,4 +38,19 @@ class SessionExpireMiddleware(object): @@ -33,4 +38,19 @@ class SessionExpireMiddleware(object):
33 log.action = "logout" 38 log.action = "logout"
34 log.resource = "system" 39 log.resource = "system"
35 40
36 - log.save()  
37 \ No newline at end of file 41 \ No newline at end of file
  42 + log.save()
  43 +
  44 + users = User.objects.all().exclude(email = request.user.email)
  45 +
  46 + notification = {
  47 + "type": "user_status",
  48 + "user_id": str(request.user.id),
  49 + "status": _u("Offline"),
  50 + "status_class": "",
  51 + "remove_class": "away"
  52 + }
  53 +
  54 + notification = json.dumps(notification)
  55 +
  56 + for u in users:
  57 + Group("user-%s" % u.id).send({'text': notification})
38 \ No newline at end of file 58 \ No newline at end of file
users/views.py
  Diff comments   View file @f1c25e0
@@ -5,6 +5,7 @@ from django.contrib.auth import authenticate, login as login_user, logout as log @@ -5,6 +5,7 @@ from django.contrib.auth import authenticate, login as login_user, logout as log
5 from django.contrib.auth.mixins import LoginRequiredMixin 5 from django.contrib.auth.mixins import LoginRequiredMixin
6 from django.core.urlresolvers import reverse, reverse_lazy 6 from django.core.urlresolvers import reverse, reverse_lazy
7 from django.utils.translation import ugettext_lazy as _ 7 from django.utils.translation import ugettext_lazy as _
  8 +from django.utils.translation import ugettext as _u
8 from django.db.models import Q, Count 9 from django.db.models import Q, Count
9 10
10 from braces import views as braces_mixins 11 from braces import views as braces_mixins
@@ -19,6 +20,10 @@ from .models import User @@ -19,6 +20,10 @@ from .models import User
19 from .utils import has_dependencies 20 from .utils import has_dependencies
20 from .forms import RegisterUserForm, ProfileForm, UserForm, ChangePassForm, PassResetRequest, SetPasswordForm 21 from .forms import RegisterUserForm, ProfileForm, UserForm, ChangePassForm, PassResetRequest, SetPasswordForm
21 22
  23 +#USER STATUS NOTIFICATION
  24 +from channels import Group
  25 +import json
  26 +
22 #RECOVER PASS IMPORTS 27 #RECOVER PASS IMPORTS
23 from django.contrib.auth.tokens import default_token_generator 28 from django.contrib.auth.tokens import default_token_generator
24 from django.core.mail import send_mail 29 from django.core.mail import send_mail
@@ -501,6 +506,21 @@ def login(request): @@ -501,6 +506,21 @@ def login(request):
501 if not security.maintence or user.is_staff: 506 if not security.maintence or user.is_staff:
502 login_user(request, user) 507 login_user(request, user)
503 508
  509 + users = User.objects.all().exclude(email = username)
  510 +
  511 + notification = {
  512 + "type": "user_status",
  513 + "user_id": str(user.id),
  514 + "status": _u("Online"),
  515 + "status_class": "active",
  516 + "remove_class": "away"
  517 + }
  518 +
  519 + notification = json.dumps(notification)
  520 +
  521 + for u in users:
  522 + Group("user-%s" % u.id).send({'text': notification})
  523 +
504 next_url = request.GET.get('next', None) 524 next_url = request.GET.get('next', None)
505 525
506 if next_url: 526 if next_url:
@@ -519,8 +539,25 @@ def login(request): @@ -519,8 +539,25 @@ def login(request):
519 539
520 @log_decorator('user', 'logout', 'system') 540 @log_decorator('user', 'logout', 'system')
521 def logout(request, next_page = None): 541 def logout(request, next_page = None):
  542 + user = request.user
  543 +
522 logout_user(request) 544 logout_user(request)
523 545
  546 + users = User.objects.all().exclude(email = user.email)
  547 +
  548 + notification = {
  549 + "type": "user_status",
  550 + "user_id": str(user.id),
  551 + "status": _u("Offline"),
  552 + "status_class": "",
  553 + "remove_class": "away"
  554 + }
  555 +
  556 + notification = json.dumps(notification)
  557 +
  558 + for u in users:
  559 + Group("user-%s" % u.id).send({'text': notification})
  560 +
524 if next_page: 561 if next_page:
525 return redirect(next_page) 562 return redirect(next_page)
526 563