Updated logout to disable automatic logout on volunteer_chat

Author: HonakerM

forge/settings.py

@@ -139,8 +139,8 @@
 
 LOGIN_URL = '/login'
 
-CHAT_SITE_URL="172.18.54.169"
-CHAT_SITE_PORT=8000
+CHAT_SITE_URL="127.0.0.1"
+CHAT_SITE_PORT=8001
 
 
 # Allow pages to be loaded in a frame

forge/static/forge/js/logout.js

@@ -6,14 +6,20 @@ function notify() {
 
 
 function automatic_logout() {
-	location.replace("/logout");
+    
+    if(typeof disable_logout !== 'undefined' && disable_logout){
+        logout_event = setTimeout(automatic_logout, 1000 * 60 * 10);
+        return;
+    }
+    
+    location.replace("/logout");
 	setTimeout(notify, 10);
 }
 
-
 logout_event = setTimeout(automatic_logout, 1000 * 60 * 10);
 
-document.onclick = function() {
+function update_logout() {
 	clearTimeout(logout_event);
 	logout_event = setTimeout(automatic_logout, 1000 * 60 * 10);
-}
+}
+

machine_usage/views.py

@@ -123,7 +123,7 @@ def create_machine_usage(request):
         u.machine = machine
         u.userprofile = request.user.userprofile
         u.save() # Necessary so start_time gets set to current time before referencing it below
-        u.set_end_time(int(data["hours"]), int(data["minutes"]))
+        u.set_end_time(float(data["hours"]), float(data["minutes"]))
 
         u.for_class = for_class
         u.own_material = own_material

myforge/templates/myforge/myforge.html

@@ -67,8 +67,15 @@
 
 {% block scripts %}
 <script>
+    var disable_logout = false;
+    
 	function setFrame(src) {
 		$("#myforge_frame").attr("src", src);
+        if(src == 'dyn/volunteer_chat_join'){
+            disable_logout = true;
+        } else {
+            disable_logout = false;
+        }
 	}
 
 	setFrame('dyn/project_list');

myforge/views.py

@@ -50,7 +50,7 @@ def get_chat_url(request, path):
 def user_chat(request):
     #return HttpResponseRedirect("http://10.0.0.24:8000/user/chat?uuid={}".format(request.user.userprofile.uuid))
     url = get_chat_url(request, '/user/info')
-        
+    
 
     return render(request, 'myforge/forms/user_chat_template.html', {'channels_link':url})
 

requirements.txt

@@ -11,7 +11,7 @@ google-auth-oauthlib==0.4.1
 httplib2>=0.18.0
 idna==2.8
 oauthlib==3.1.0
-Django==2.2.14
+django==2.2.14
 psycopg2==2.8.4
 pyasn1==0.4.8
 pyasn1-modules==0.2.7