Keep track of number of hosts and show the launch page until there is at least one host

2 files changed, 11 insertions, 0 deletions

diff --git a/src/meetingtools/apps/room/models.py b/src/meetingtools/apps/room/models.py
index b49925a..82aae6a 100644
--- a/src/meetingtools/apps/room/models.py
+++ b/src/meetingtools/apps/room/models.py
@@ -27,6 +27,7 @@ class Room(models.Model):
     folder_sco_id = IntegerField(verbose_name="Adobe Connect Room Folder",editable=False)
     description = TextField(blank=True,null=True)
     user_count = IntegerField(verbose_name="User Count At Last Visit",editable=False,blank=True,null=True)
+    host_count = IntegerField(verbose_name="Host Count At Last Visit",editable=False,blank=True,null=True)
     timecreated = models.DateTimeField(auto_now_add=True)
     lastupdated = models.DateTimeField(auto_now=True)
     lastvisited = models.DateTimeField(blank=True,null=True)
@@ -61,6 +62,12 @@ class Room(models.Model):
         else:
             return self.user_count
         
+    def nhosts(self):
+        if self.host_count == None:
+            return "unknown many"
+        else:
+            return self.host_count
+        
 tagging.register(Room)
 
 def _magic_tags(sender,**kwargs):
diff --git a/src/meetingtools/apps/room/views.py b/src/meetingtools/apps/room/views.py
index 1639ca2..6c22c14 100644
--- a/src/meetingtools/apps/room/views.py
+++ b/src/meetingtools/apps/room/views.py
@@ -347,8 +347,10 @@ def _goto(request,room,clean=True,promote=False):
     if clean:
         userlist = api.request('meeting-usermanager-user-list',{'sco-id': room.sco_id},False)
         room.user_count = 0
+        room.host_count = 0
         if userlist.status_code() == 'ok':
             room.user_count = int(userlist.et.xpath("count(.//userdetails)"))
+            room.host_count = int(userlist.et.xpath("count(.//userdetails/role[text() = 'host'])"))
         
         #session_info = api.request('report-meeting-sessions',{'sco-id':room.sco_id})
         #room.user_count = _nusers(session_info)
@@ -357,6 +359,8 @@ def _goto(request,room,clean=True,promote=False):
         if room.self_cleaning:
             if (room.user_count == 0) and (abs(lastvisit - now) > GRACE):        
                 room = _clean(request,room)
+                
+            if room.host_count == 0:
                 return respond_to(request, {"text/html": "apps/room/launch.html"}, {'room': room})
     else:
         room.save()