From 1edadf3a764982e47c6227d4f299cbbddf694dfa Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Sun, 24 May 2020 03:08:42 +0200 Subject: [PATCH] =?UTF-8?q?Chat=20mit=20BUtton=20f=C3=BCr=20eine=20Person?= =?UTF-8?q?=20FERTIG!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chat/templates/chat/chat_allusers.html | 42 +++- chat/templates/chat/chat_content.html | 39 +-- .../templates/chat/chat_content_basechat.html | 227 ++++++++++++++++++ chat/templates/chat/chatmanagement.html | 3 +- chat/views.py | 8 +- users/templates/users/base.html | 18 +- 6 files changed, 288 insertions(+), 49 deletions(-) create mode 100644 chat/templates/chat/chat_content_basechat.html diff --git a/chat/templates/chat/chat_allusers.html b/chat/templates/chat/chat_allusers.html index 3b4b3db..1edd0ff 100644 --- a/chat/templates/chat/chat_allusers.html +++ b/chat/templates/chat/chat_allusers.html @@ -23,7 +23,7 @@
-

Chat starten +

Chat öffnen

@@ -32,16 +32,48 @@
-
+
{{user.first_name}} {{user.last_name}} - +
{% endfor %}
-
- + \ No newline at end of file diff --git a/chat/templates/chat/chat_content.html b/chat/templates/chat/chat_content.html index a2cc885..942bb3b 100644 --- a/chat/templates/chat/chat_content.html +++ b/chat/templates/chat/chat_content.html @@ -1,8 +1,8 @@ {% load counter_tag %} {% if roomdata.creator == user %} -

Gespräch mit {{roomdata.chatmember_single.first_name}} {{roomdata.chatmember_single.last_name}}

+

{{roomdata.chatmember_single.first_name}} {{roomdata.chatmember_single.last_name}}

{% else %} -

Gespräch mit {{roomdata.creator.first_name}} {{roomdata.creator.last_name}}

+

{{roomdata.creator.first_name}} {{roomdata.creator.last_name}}

{% endif %}
@@ -56,39 +56,7 @@
{% endif %} - - - - {% endfor %} - - - -   @@ -100,9 +68,6 @@   - - -
diff --git a/chat/templates/chat/chat_content_basechat.html b/chat/templates/chat/chat_content_basechat.html new file mode 100644 index 0000000..9b23693 --- /dev/null +++ b/chat/templates/chat/chat_content_basechat.html @@ -0,0 +1,227 @@ + +{% load counter_tag %} +{% if roomdata.creator == user %} +

{{roomdata.chatmember_single.first_name}} {{roomdata.chatmember_single.last_name}} +{% else %} +

{{roomdata.creator.first_name}} {{roomdata.creator.last_name}} +{% endif %} + +

+
+
+
+ +
+ Unterhaltung gestartet am {{roomdata.chatroom_createddate}} +
+
+ +
+ {% for message in roomdata.messages.all %} + + {% if forloop.counter0 == 0 %} + {% setMessageDayInfo message %} + {% else %} + {% getMessageDayInfo message as newday %} + {% if newday == True %} +
+
+
+ {{message.sendtime|date:"d.m.Y"}} +
+
+ {% endif %} + {% endif %} + + {% if message.author == request.user %} +
+
+ +
+
{{message.sendtime|date:"H:i"}}
+
+ + {{message.content}} + +
+
+ {% else %} +
+
+ +
+
{{message.author.first_name}} {{message.author.last_name}}, {{message.sendtime|date:"H:i"}}
+
+ + {{message.content}} + +
+
+ {% endif %} + {% endfor %} +
+   +
+ +
+ +   + +
+
+
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/chat/templates/chat/chatmanagement.html b/chat/templates/chat/chatmanagement.html index 42c4877..4d9547c 100644 --- a/chat/templates/chat/chatmanagement.html +++ b/chat/templates/chat/chatmanagement.html @@ -119,7 +119,8 @@ url: "{% url 'chat:chat-ajax' %}", data : { action : "startnewchat_user_user", - new_chat_userid : $(this)[0]["id"].split("_")[1] + new_chat_userid : $(this)[0]["id"].split("_")[1], + is_basechat : 0 }, success: function( data ) { diff --git a/chat/views.py b/chat/views.py index 2e004d8..84dbcc6 100644 --- a/chat/views.py +++ b/chat/views.py @@ -33,7 +33,7 @@ def getloggedusers(request): users_online = Room.objects.get(channel_name="agency_" + str(request.user.profile.agency.pk)) context = { - "usersofagency" : User.objects.filter(profile__agency=request.user.profile.agency).exclude(pk=request.user.pk).oder_by("last_name"), + "usersofagency" : User.objects.filter(profile__agency=request.user.profile.agency).exclude(pk=request.user.pk).order_by("last_name"), "onlineusers" : users_online.get_users() } @@ -90,8 +90,10 @@ def chatajaxmain(request): context = { "roomdata" : list(getroom)[0] } - - return render(request, "chat/chat_content.html", context) + if(request.GET["is_basechat"] == "1"): + return render(request, "chat/chat_content_basechat.html", context) + else: + return render(request, "chat/chat_content.html", context) elif request.GET["action"] == "addnewmessage": room = ChatRoom.objects.get(pk=request.GET["room"]) if(request.user == room.creator or request.user == room.chatmember_single): diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 9c6e1f2..80b4e39 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -236,7 +236,7 @@ Impressum
- Version 0.9.0 + Version 0.9.1
@@ -434,10 +434,22 @@ {% if active_link != 'chat' %} - + + + + + + {% endif %}