From ba3f098fcbde9bb0feb9667ed25001bb929520b9 Mon Sep 17 00:00:00 2001 From: emile Date: Mon, 2 Sep 2024 08:50:47 +0300 Subject: [PATCH] new --- .DS_Store | Bin 8196 -> 8196 bytes osinaweb/.DS_Store | Bin 10244 -> 10244 bytes osinaweb/db.sqlite3 | Bin 1974272 -> 1974272 bytes .../__pycache__/consumers.cpython-310.pyc | Bin 17330 -> 17457 bytes .../api/__pycache__/views.cpython-310.pyc | Bin 1700 -> 1794 bytes osinaweb/osichat/api/views.py | 6 +++--- osinaweb/osichat/consumers.py | 10 +++++++++- osinaweb/osinacore/.DS_Store | Bin 10244 -> 10244 bytes osinaweb/osinacore/templates/.DS_Store | Bin 12292 -> 12292 bytes .../templates/add_templates/.DS_Store | Bin 8196 -> 8196 bytes .../templates/edit_templates/.DS_Store | Bin 6148 -> 6148 bytes .../templates/listing_pages/.DS_Store | Bin 6148 -> 6148 bytes osinaweb/static/.DS_Store | Bin 10244 -> 10244 bytes osinaweb/static/js/.DS_Store | Bin 6148 -> 8196 bytes osinaweb/static/js/osichat-admin/osichat.js | 2 +- osinaweb/static/js/osichat/visitors.js | 4 ++-- osinaweb/support/.DS_Store | Bin 6148 -> 6148 bytes osinaweb/support/templates/.DS_Store | Bin 8196 -> 8196 bytes 18 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.DS_Store b/.DS_Store index 8ef316585e71d374e50ed3f7eaf4a05710389dc8..795b3695bfc33a234dd0bd7bd8613a4e4b900edf 100644 GIT binary patch delta 87 zcmZp1XmQwZRgg(iX7Y8xJJRt2{KXmh<(|p;c>zVKWtpkv5t%@CaAsBNi_@% delta 87 zcmZp1XmQwZRgg(qa`JV-JJJ!E$@zJ~nN_Lr0{q1p`Q@HKZa`6LS!QbaQ6C;FXkb%-riZN@l zqLA2TL7^qgjAoPL#9b!;5`8n7UuyT{MdFzgYk4+vOE|MnZj$nV@HsZKE4ah?tYAX` DNq8P; diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 68cf7fe82498956ebb838cda20473c615156e54a..bf7d2f1975af03d8b5c5bcf78bdc2b9ecafaad2f 100644 GIT binary patch delta 3401 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 Lj4GRho#Gh*2|kHm delta 359 zcmdnk!MLfNkuRT@mx}=iT7}P~X;f|GlT>0f*sP)CA~t!QDKF!R$yF8__39-oHB8Nn zwJbFZS*#^&S?npSH7qG?bC^mvQrLT$QaE}U85vR-f*FAF%qg7NOhq0goGDy2%qiTx zOtq{KT?;_En6kKv>_B7|cOGL3Lk(*R&m883j0h8e`gqaxc|tWt;nS$e=U21~=#Qc> zAfd@rbREQA0U{zn#8$BA_7=1*44OpLF9vJ$NOfU<`-3)^02WW2NawcRa7 Z#xI+XIe0TNvQHLr+RrGn`I1vSBLLu9TF(Fg diff --git a/osinaweb/osichat/api/__pycache__/views.cpython-310.pyc b/osinaweb/osichat/api/__pycache__/views.cpython-310.pyc index aa54544fa75744a30d0ef04d8cb7cea82d962e3b..7ca2bba69dea4ea54b80bf844dc90d630096f190 100644 GIT binary patch delta 316 zcmX}mF-yZh6bJC!_3m;>ld5r1QCeIigPojJ5I505&@lwlh6^F5$<^tyR2*Hr(F!fN zINH$<;OyjZegeNj5%EOv!4KXW-v7M^f7tT5@4J?%kNCC!{^Z|5*D=$cQGKc@oF1*! zM3T%gT%&1thA&zf%CIDfa|6b66Dylf+!3j5iN_1lo&aE7oJu5d(j38>ia^pUaBPL1 zx^KK30&QQiiV0qZL_?Ms=Nk3%IMoiTB3|UI=xLe^%2+U7Xqv~Bh;p8WP~$T`D1@ee z0aduDZqYVrn~%$7^@ci|tESa0!9|=${}JxV@4*9}YV;GQv0x(asTpd6j#|O%xLh)e iY9H@_Ep?4I0t5m;W*&tN2*?-3Wmi4pN6=LX+5HAAFkrm^ delta 222 zcmZqTTf)nm&&$ij00c8d&!k0f&1-v!v3mF+13d3tyYFJaa<}lTAlXmU^9%zR9ryVVH95aDujCd-S!Qu&Nq$kWCjaE)EOu-%K+B6HCUdhY zut)=$lOtH=8D%F|uqtuhVuvc7JfGE`(O~j@R&_qMKRj$q%uI}I|2SBSG$u>1tz^`g Ie2C2f0FysHTL1t6 diff --git a/osinaweb/osichat/api/views.py b/osinaweb/osichat/api/views.py index f75175fc..eb587aac 100644 --- a/osinaweb/osichat/api/views.py +++ b/osinaweb/osichat/api/views.py @@ -26,13 +26,13 @@ def get_visitors(request): end_date = parse_date(end_date) if start_date and end_date: # Range of time - visitors = Visitor.objects.filter(Q(visitorlog__visit_date__date__range=[start_date, end_date]) | Q(visitorlog__left_date__date__range=[start_date, end_date])).distinct() + visitors = Visitor.objects.filter(Q(visitorlog__visit_date__date__range=[start_date, end_date]) | Q(visitorlog__left_date__date__range=[start_date, end_date])).distinct().annotate(latest_visit=Max('visitorlog__visit_date')).order_by('-latest_visit') elif start_date and not end_date: # Specific date - visitors = Visitor.objects.filter(Q(visitorlog__visit_date__date=start_date) | Q(visitorlog__left_date__date=start_date)).distinct() + visitors = Visitor.objects.filter(Q(visitorlog__visit_date__date=start_date) | Q(visitorlog__left_date__date=start_date)).distinct().annotate(latest_visit=Max('visitorlog__visit_date')).order_by('-latest_visit') else: # Active visitors - visitors = Visitor.objects.filter(visitorlog__left_date__isnull=True).distinct() + visitors = Visitor.objects.filter(visitorlog__left_date__isnull=True).distinct().annotate(latest_visit=Max('visitorlog__visit_date')).order_by('-latest_visit') visitors_count = visitors.count() visitors_data = [] diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py index 30c0c4ee..26e99ce0 100644 --- a/osinaweb/osichat/consumers.py +++ b/osinaweb/osichat/consumers.py @@ -326,7 +326,7 @@ class OsichatVisitor(WebsocketConsumer): class OsitcomChatRoom(WebsocketConsumer): def connect(self): - self.domain = 'https://osina.ositcom.com' + self.domain = 'http://192.168.1.111:8000' self.session_id = self.scope['url_route']['kwargs']['session_id'] self.visitor = Visitor.objects.filter(session_id=self.session_id).last() if not self.visitor: @@ -684,9 +684,17 @@ class OsitcomChatRoom(WebsocketConsumer): } if self.client_type == 'mobile_admin': chat_message_data = model_to_dict(chat_message) + member = chat_message.member + member_data = { + 'id': member.id, + 'first_name': member.first_name, + 'last_name': member.last_name, + 'image': member.staffprofile.image + } self.send(text_data=json.dumps({ 'event_type': 'send_message', 'chat_message_data': chat_message_data, + 'member_data': member_data },cls=DjangoJSONEncoder)) elif self.client_type == 'website_admin': html = render_to_string("chat_templates/partials/message.html", context=context) diff --git a/osinaweb/osinacore/.DS_Store b/osinaweb/osinacore/.DS_Store index db6bd212edae70508237da291e8ba97a819dc2f5..99c8883abf00707ccd9f4a728d67d39f85fe26bc 100644 GIT binary patch delta 202 zcmZn(XbISmEI9eR#GcIxLbI8`j0#ah7RE!9S4k>yii(Pfi%LjJNKd{hc}F^4fWJ5+ zzuYr9KQEvtwJbBWJR%dw4$iDfoqR@0O^HK<0TnQEhUDevrE)4e1VAJvt4S-GOEM}k zYBQQJ+A`WRdN6u2MlnV+CNL&KR4_3@jgUbzDr@pO39-#Hr1M!OHb`t{SNO#;Ia^G7 NvZJKe<_gh1CII}{E*1a) delta 273 zcmZn(XbISmEI3(7Z0}}yq1jA8Mj5-MxsHONnZ@M!Vh)?jL=9OOZ%kexsl+KJDlQ=@ zB`qU0`Lg64>4?na{Jh}Is?>M^{^E@Ma!(*PpeVI0Gqrs3DJivjWe48|1`yy70aFNq zQQ0B!0hr4fl9!*Cs_YN|k>q6HV9;i8WbkDOW5{NxVwlJ3o*W V>^uqJOTg! diff --git a/osinaweb/osinacore/templates/.DS_Store b/osinaweb/osinacore/templates/.DS_Store index 024a4bcc2742983cd371094e847f25a844bcbebb..a62f4f7bceae4366e4eb32a4338f996565cc0ef5 100644 GIT binary patch delta 81 zcmZokXi3;`TVS$}@Se$=1!O0eEAwqWEZEBe7Wg14y;(#2F~?+1g;gMdiI=4}cPkdL aaWG^u9_{OsNw+a(8TnGRU6`Q|8-zNU)a$D7km?dr|4lYT}PM nCUYyS00~UIEWNo)v51X5ogtGUk3nxUi^eyW%|BI`nPDOTAom~8 diff --git a/osinaweb/osinacore/templates/add_templates/.DS_Store b/osinaweb/osinacore/templates/add_templates/.DS_Store index c631ee6241395f06800471b6e4433c1140a8d98c..7ddbc4060a8de673664a2ebe03eb51131ec7c482 100644 GIT binary patch delta 48 zcmV-00MGw~K!iY$PXQCLP`eKS6O#-Oo3r~63yI}iYEsM zYA`YKZJr|_&a5m0S6d8Jk;sq+gar)w48=gzARYM(c|i3lY>Yn{7#QYlULm}hc{97j LH|?AeqRJ286l{1q}H>K1e(h c$jY1Sz$(GU;K;zhFmJOFTPx#cc8 diff --git a/osinaweb/osinacore/templates/listing_pages/.DS_Store b/osinaweb/osinacore/templates/listing_pages/.DS_Store index 98ebf4f191ba4162c871c26759fc7d98a008a70d..b6332802df469aa67122077472a2ef54bec839a8 100644 GIT binary patch delta 43 zcmZoMXffCj%*rmrkj0SCkTltkO^1!ak%56>-eeEf-j!QThGK>ihD3%mhP261tU64LKQ~vfbu(^e=lIJH00CPJXaE2J diff --git a/osinaweb/static/.DS_Store b/osinaweb/static/.DS_Store index bf414b15825db6b0c41e13a0d8bbfd0f7ea51cdd..2276b057b341345e23502f6cad76658a79cb3d06 100644 GIT binary patch delta 219 zcmZn(XbIS`Uu<%ag z-XVTRI$nUkI3vH@GdVvmpeVI0GqpS-6UYwEtV*4{UP5hho~S5qeqJi4vO@p^7)+8> zG?!#lV$^0dVYFqmXY^q7WQ<~rW=vpAgeYKQgwPB!P#Q`xW^Im=T+24GfoC(j!VWf4 HoaqYy{lGO1 delta 233 zcmZn(XbIS`Uu?3wK&hyqiJ6Xqk+ET|jzYDefuXsMf{C%wAY%|?GGhv3CSwsq5fdYXW{`!_P>Qj5v!CQzw$1DcJJ=|7pbr3B Cx-!WC diff --git a/osinaweb/static/js/.DS_Store b/osinaweb/static/js/.DS_Store index 743eba2132b46bffd4a2a28c58529ce72ef753e8..0d88dfa36de407be6c693568a6d58a2ca93a7412 100644 GIT binary patch literal 8196 zcmeHM&2G~`5T5N{T!og1AE^kCEOFt`Kw2nL#U+Gt;7Sl200k#bQ@4&cvK=B+73B=? zz$- z2N#uPJ(FWC)z*PV9RVO0a9b7haSl)zHnp zrG}Hxa1xnik)2S4vJRZ9)JfE}w5?^pGBC*ipWUyLM;%;U%B)6uP z56g_=FA2$1d*2H7mZ3d>ehZ#>KmljYaIRNCl(H`sp_)O@)K>m{%=vQx;||pLMyn4$+*ozFV0b-{ucju)kfC`c(+rT0yz(AUIukiNIWswu zs)#O*=qZ`5;^|#3o|a%aQZX1&*R)O?J$c;{blFA+Sp&AVtEUO?wQGhod1P9aKJk6DF>*t;_quN{z@u>^&U2{tEdS4f%X~Uv%o=tQ5A9% z&Ah&|R)%~u`}_X{&fc&LSO(4x17cyPxzm6@CqG<@uJKvhMSYFRh4sc-DhL{N9EViL samdqu7^3e&l`-{9jXwr zs!ukMVVV3`#A>pysM*Fc4)(?D92|noAe}(P+(5z=h}$<7erKM{FJs8aFxiGjng?hY P$O4d^44dP5<}d>QmkJgD diff --git a/osinaweb/static/js/osichat-admin/osichat.js b/osinaweb/static/js/osichat-admin/osichat.js index 246fd19c..00d48d08 100644 --- a/osinaweb/static/js/osichat-admin/osichat.js +++ b/osinaweb/static/js/osichat-admin/osichat.js @@ -1,6 +1,6 @@ let admin_chat_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws"; let protocol = window.location.protocol === "https:" ? "https" : "http"; -let admin_chat_domain = "osina.ositcom.com"; +let admin_chat_domain = "192.168.1.111:8000"; let userId = document.getElementById('userId').textContent.trim(); let osichatadminroomSocket = null; let currentChatId = null; diff --git a/osinaweb/static/js/osichat/visitors.js b/osinaweb/static/js/osichat/visitors.js index 2e3fed1a..36683e1f 100644 --- a/osinaweb/static/js/osichat/visitors.js +++ b/osinaweb/static/js/osichat/visitors.js @@ -1,7 +1,7 @@ const wsScheme = window.location.protocol === "https:" ? "wss" : "ws"; const protocol = window.location.protocol === "https:" ? "https" : "http"; -const osinaDomain = "osina.ositcom.com"; -const ositcomDomain = "ositcom.com"; +const osinaDomain = "192.168.1.111:8000"; +const ositcomDomain = "192.168.1.111:3000"; async function fetchClientData() { diff --git a/osinaweb/support/.DS_Store b/osinaweb/support/.DS_Store index 9685a61a9241699935f737ed6b2a0eba956aab77..d3ea69e69eaa288badc0c49ba02079c7a84f271d 100644 GIT binary patch delta 207 zcmZoMXfc@J&nU1lU^g?Pz+@hl&%!(m$qe}nc?`u2r3|?YsSHI7#gi3SMAVql85kJ! z{(}LK#lXPJkOGtjDK272WGDgCAf=Lw^Co{`Ddgt@isu6jDPhP28kY`~5oKIIxr0?{ zas{g`!A4ToZP(puF1Y^ j@{HY+bJ;>U*?}e&G2}oT#RhiNyvf_ysyDN9{N)D#f$TR+ delta 123 zcmZoMXfc@J&&abeU^g=(&tx8!&yx#T(Z2Mn(wDzzd~eRM%t?_Rz`G*$XB%T;0sh H@s}R}l#U#g diff --git a/osinaweb/support/templates/.DS_Store b/osinaweb/support/templates/.DS_Store index 98c0dbf4fe33e3c9456a33f9b119c437e23ba48c..638e75c670ee5dd5001d57925d96cf3a46e9f729 100644 GIT binary patch delta 146 zcmZp1XmQw(FTl8Ca)CghxdSN1!U