From 53c483005186d35e4568170337c3145755ff449b Mon Sep 17 00:00:00 2001
From: Holger Trampe <htrampe@gmail.com>
Date: Tue, 19 May 2020 22:59:07 +0200
Subject: [PATCH] csrf

---
 chat/templates/chat/chatmanagement.html       |  13 ++-
 chat/views.py                                 |   1 +
 .../__pycache__/settings.cpython-38.pyc       | Bin 4750 -> 4750 bytes
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 11379 -> 11669 bytes
 standards/templatetags/counter_tag.py         |  17 +++-
 users/models.py                               |  11 +++
 users/signals.py                              |   3 +-
 users/templates/users/base.html               |  75 ++++++++++++++++--
 users/urls.py                                 |   1 +
 users/views.py                                |   7 ++
 10 files changed, 120 insertions(+), 8 deletions(-)

diff --git a/chat/templates/chat/chatmanagement.html b/chat/templates/chat/chatmanagement.html
index bb14ecc..8678f6e 100644
--- a/chat/templates/chat/chatmanagement.html
+++ b/chat/templates/chat/chatmanagement.html
@@ -69,7 +69,16 @@
         <div style="float: left;" class="col-12 ">
           <div class='icon-container mr-2'>
             <img class="img-profile roundimg" src="{{ user.profile.get_photo_url }}">
-            <div class='status-circle' id="userstatus_circle_{{user.pk}}" style="background-color: {% if user in onlineusers %} green {% else %} grey {% endif %};">
+            <div class='status-circle' id="userstatus_circle_{{user.pk}}" style="background-color: {% if user in onlineusers %} 
+                  {% if user.profile.onlinestatus == 0 %}
+                    green
+                  {% elif user.profile.onlinestatus == 1 %}
+                    red
+                  {% elif user.profile.onlinestatus == 2 %}
+                    orange
+                  {% elif user.profile.onlinestatus == 3 %}
+                    grey
+              {% else %} grey {% endif %};">
             </div>       
           </div>
           <h5 class="mt-3">{{user.first_name}} {{user.last_name}}</h5>      
@@ -130,6 +139,8 @@
           console.log(data);
           $( ".status-circle" ).each(function( index ) {
             if(data["onlineusers"].indexOf($(this)[0]["id"].split("_")[2]) !== -1){
+
+                console.log(data["onlineusers"][index+1]);
                 $("#" + $(this)[0]["id"]).css("background-color", "green");
             }
             else{
diff --git a/chat/views.py b/chat/views.py
index 4fa3b54..0739a1f 100644
--- a/chat/views.py
+++ b/chat/views.py
@@ -52,6 +52,7 @@ def getloggedusersdata(request):
 		for u in users_agency:	
 			if(u in users_online):
 				user_online_final.append("" + str(u.pk))
+				user_online_final.append("" + str(u.pk) + "_" + u.profile.onlinestatus)
 
 		return JsonResponse({"onlineusers" : user_online_final})
 	else:
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 8d6cd54230d87f99c6a87a29eee94b167b304932..bd1326b5449c70a4fedbe08821bb9ff32d671f7f 100644
GIT binary patch
delta 19
YcmeBE?Nj9n<>lpK0D@^A8@XD904U4^82|tP

delta 19
YcmeBE?Nj9n<>lpK00Kp)ja)54044APo&W#<

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 89ba1312a94f7a0695cf4b7f29f609a14253217e..3415ff3304729a876b23e2b13d5490a484c1a751 100644
GIT binary patch
delta 336
zcmewyF*TYml$V!_0SNqDj>Pd8PUMqeG}@@G%q)^BlO>;$mXhAW(99U+o5CK<pqa5b
zgxN-|KA91u9txO%GzdEbaj_qeNMWpHtYOGv$YM-k%4RAOOJS~M%rk+CumD9gKq~T-
zpdze55vvq7pojoegdHg2mBIlug%M~cr{68+qSTZkke#<!(~DA5UGs|MfSjTYAQ86w
zqQt!P)S~qu4hvAaQj@8u7{uYp&&$coOD!%*EGaDp3aSGIqd0RDGxL)3bMlKOC-R7x
zA}axl?g3g;ECN)?z{JAD!^p;nz${Efdx7Gbew!z0er06bJGqcmV)ATlKE_j%S81PQ
J;bLZC1OT{hQE31G

delta 58
zcmbOl{W*d!l$V!_0SF8Z?2g-@Kao#{QDvjHGBaBWdoY7$+U6u?8#N|P-_5JFzA{c;
Ns-whsZ1M@6lK|ZZ5$yl~

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 1d00d60..8c9665b 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -439,4 +439,19 @@ def getsomeyears(start):
 
 @register.simple_tag
 def getsomemonths():
-	return ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"]
\ No newline at end of file
+	return ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"]
+
+@register.simple_tag
+def getonlinestatuscolor(user):
+	maincolor = "red"
+
+	if(user.profile.onlinestatus == 0):
+		maincolor = "green"
+	elif(user.profile.onlinestatus == 1):
+		maincolor = "red"
+	elif(user.profile.onlinestatus == 2):
+		maincolor = "orange"
+	elif(user.profile.onlinestatus == 3):
+		maincolor = "grey"
+
+	return maincolor
\ No newline at end of file
diff --git a/users/models.py b/users/models.py
index 57c8d0a..c29c0eb 100644
--- a/users/models.py
+++ b/users/models.py
@@ -212,6 +212,17 @@ class Profile(models.Model):
 	user_messages_mail = models.BooleanField(default=True)
 	user_messages_push = models.BooleanField(default=True)
 
+	# ONLINESTATUS
+	'''
+
+		0 = ONLINE - green
+		1 = BESCHAFTIGT - red
+		2 = ABWESEND - orange
+		3 = OFFLINE - grey
+
+	'''
+	onlinestatus = models.IntegerField(default=0)
+
 	def __str__(self):
 		return f'{self.user.last_name}'
 
diff --git a/users/signals.py b/users/signals.py
index 45f3428..884e920 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -54,9 +54,10 @@ def loadingFreeDays(plz):
 # CHECK SOMETHING WHEN USER LOGGED IN
 @receiver(signal=user_logged_in, sender=User)
 def checkForWorkDays(sender, user, request, **kwargs):
+	user.profile.onlinestatus = 0
+	user.save()
 	today = date.today()	
 	wd = Workday.objects.filter(user=user, end=None, start__day__lte=today.day)
-
 	for d in wd:
 		d.end = datetime.datetime(d.start.year, d.start.month, d.start.day, 23, 59, 00) 
 		d.save()
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index a28ee00..89ed206 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -332,11 +332,13 @@
               </div>
             </li>
             <style type="text/css">
-            .roundimg {
+              {% getonlinestatuscolor request.user as onlinecolor %}
+
+            .roundimg_base {
               border-radius: 50%;
-              -webkit-box-shadow: 0px 0px 4px 5px red;
-              -moz-box-shadow: 0px 0px 4px 5px red;
-              box-shadow: 0px 0px 4px 5px red;             
+              -webkit-box-shadow: 0px 0px 4px 5px {{onlinecolor}};
+              -moz-box-shadow: 0px 0px 4px 5px {{onlinecolor}};
+              box-shadow: 0px 0px 4px 5px {{onlinecolor}};             
             }
           </style>
             <div class="topbar-divider d-none d-sm-block"></div>
@@ -344,10 +346,29 @@
             <li class="nav-item dropdown no-arrow">
               <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="mr-2 d-none d-lg-inline text-gray-600 small">{{request.user.first_name}} {{request.user.last_name}}</span>
-                <img class="img-profile roundimg ml-2" src="{{ user.profile.get_photo_url }}">
+                <img id="userbaseprofilepicture" class="img-profile roundimg_base ml-2" src="{{ user.profile.get_photo_url }}">
               </a>
               <!-- Dropdown - User Information -->
               <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="userDropdown">
+                <a class="dropdown-item" onclick="javascript:changeOnlineStatus(0)" href="#/"> 
+                  <i class="fas fa-circle mr-2" style="color: green"></i>
+                  Online
+                </a>
+                <a class="dropdown-item" onclick="javascript:changeOnlineStatus(1)" href="#/"> 
+                  <i class="fas fa-circle mr-2" style="color: red"></i>
+                  Beschäftigt
+                </a>
+                <a class="dropdown-item" onclick="javascript:changeOnlineStatus(2)" href="#/"> 
+                  <i class="fas fa-circle mr-2" style="color: yellow"></i>
+                  Abwesend
+                </a>
+                <a class="dropdown-item" onclick="javascript:changeOnlineStatus(3)" href="#/"> 
+                  <i class="fas fa-circle mr-2" style="color: grey"></i>
+                  Offline anzeigen
+                </a>
+
+
+                <div class="dropdown-divider"></div>
                 <!--<a class="dropdown-item" onclick="userGoToSettings({{user.pk}})" href="{% url 'orga-single' user.pk %}">-->
                 <a class="dropdown-item" onclick="userGoToSettings()" href="#/"> 
                   <i class="fas fa-user fa-sm fa-fw mr-2 text-gray-400"></i>
@@ -653,6 +674,50 @@ $(document).on('click', function (e) {
 
 <!-- WEBSOCKETS -->
 <script type="text/javascript">
+function changeOnlineStatus(newstat){
+  $.ajax(
+  {
+      type: "GET",
+      url: "{% url 'users-updateonlinestat' %}",
+      data : {
+        newstat : newstat
+      },
+      success: function( data ) 
+      { 
+          if(data["newstat"] == "0"){
+            $("#userbaseprofilepicture").css({
+              '-webkit-box-shadow' : '0px 0px 4px 5px green',
+              '-moz-box-shadow': '0px 0px 4px 5px green',
+              'box-shadow': '0px 0px 4px 5px green'
+            })
+          }
+          else if(data["newstat"] == "1"){
+            $("#userbaseprofilepicture").css({
+              '-webkit-box-shadow' : '0px 0px 4px 5px red',
+              '-moz-box-shadow': '0px 0px 4px 5px red',
+              'box-shadow': '0px 0px 4px 5px red'
+            })
+          }
+          else if(data["newstat"] == "2"){
+            $("#userbaseprofilepicture").css({
+              '-webkit-box-shadow' : '0px 0px 4px 5px orange',
+              '-moz-box-shadow': '0px 0px 4px 5px orange',
+              'box-shadow': '0px 0px 4px 5px orange'
+            })            
+          }
+          else if(data["newstat"] == "3"){
+            $("#userbaseprofilepicture").css({
+              '-webkit-box-shadow' : '0px 0px 4px 5px grey',
+              '-moz-box-shadow': '0px 0px 4px 5px grey',
+              'box-shadow': '0px 0px 4px 5px grey'
+            })
+            
+          }
+      }
+   });
+}
+
+
 $(document).ready(function(){
 
   $("#chat_alluserscontent").hide();
diff --git a/users/urls.py b/users/urls.py
index c8d5f33..24ee00e 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -35,6 +35,7 @@ urlpatterns = [
     path('impressum/', views.impressum, name="impressumda"),                   
     path('setuserparent/', views.setuserparent, name="users-setuserparent"),
     path('sendpassmail/', views.sendpassmail, name="users-sendpassmail"),
+    path('changeonlinestat/', views.changeonlinestat, name="users-updateonlinestat"),
     path('dacron/<slug:code>', views.cronactions, name="cronmain")
 ]
 
diff --git a/users/views.py b/users/views.py
index 2a3fde1..e2d8029 100644
--- a/users/views.py
+++ b/users/views.py
@@ -471,6 +471,13 @@ def setuserparent(request):
 	else:
 		return HttpResponse("Request method is not a GET")
 
+@login_required
+def changeonlinestat(request):
+	if request.method == 'GET':		
+		request.user.profile.onlinestatus = request.GET["newstat"]
+		request.user.save()
+		return JsonResponse({"newstat" : request.GET["newstat"]})
+
 '''
 
 	# DELETE A USER