Changeset 1372

Timestamp:

01/04/11 15:59:45 (17 months ago)

Author:

zeank

Message:

show list of facilitators and participants

refs #247

Location:

HelpIM3/branches/chatgroups/HelpIM/chatgroup

Files:

• db/databaseMetadata.py (modified) (2 diffs)
• db/services.py (modified) (2 diffs)
• pages/ChatLog.py (modified) (3 diffs)

HelpIM3/branches/chatgroups/HelpIM/chatgroup/db/databaseMetadata.py

@@ -90 +90 @@
         Column('created_at',
                DateTime,
-               default=func.now()
-               ),
+               default=func.now()),
 
         UniqueConstraint('group_id', 'email'),
@@ -147 +146 @@
                ForeignKey('conv_Participants.conv_participant_id'),
                primary_key=True),
-        Column(
-            'meeting_id',
-            Integer,
-            ForeignKey('chatgroup_meeting.id')
-            ),
-        Column(
-            'member_id',
-            Integer,
-            ForeignKey('chatgroup_member.id')
-            )
+        Column('meeting_id',
+               Integer,
+               ForeignKey('chatgroup_meeting.id')),
+        Column('member_id',
+               Integer,
+               ForeignKey('chatgroup_member.id')),
+        Column('is_admin',
+               Boolean,
+               nullable=False,
+               default=False),
+        Column('joined_at',
+               DateTime,
+               default=func.now()),
+        Column('left_at',
+               DateTime,
+               nullable=True),
         )
 

HelpIM3/branches/chatgroups/HelpIM/chatgroup/db/services.py

@@ -166 +166 @@
                 raise
 
-    """ iterates through meetings for members groups. if there's a
-    meeting today checks whether now is within window """
+    """ ChatgroupMeetingParticipant """
+
+    def getChatgroupMeetingParticipantsByMeetingId(self, site, meeting_id, is_admin=None):
+        session = site.database.getSession()
+        query = session.query(ChatgroupMeetingParticipant).filter_by(meeting_id=meeting_id)
+        if (is_admin is not None):
+            query = query.filter_by(is_admin=is_admin)
+        try:
+            meeting = query.all()
+            return meeting
+        except NoResultFound:
+            if raiseError:
+                raise
+        
+
     def getChatgroupMeetingByMember(self, site, member):
+        """ iterates through meetings for members groups. if there's a
+        meeting today checks whether now is within window """
         from HelpIM.utils import today
         from datetime import timedelta, datetime
@@ -192 +207 @@
                     participant.conv_participant_conv_id = meeting.id
                     participant.conv_participant_name = member.nickname
+                    participant.is_admin = member.is_admin
                     meeting.participants.append(participant)
                     session.flush()

HelpIM3/branches/chatgroups/HelpIM/chatgroup/pages/ChatLog.py

@@ -80 +80 @@
             }
 
-        
-        chatLogTable = self.getChatLogTableDef()
-        panelDef = [ chat_conv_detail_panel,
-                     chatLogTable ]
-        return panelDef
+        return [ chat_conv_detail_panel,
+                 self.getParticipantsDef('Facilitators', 'ChatgroupFacilitators'),
+                 self.getParticipantsDef('Participants', 'ChatgroupParticipants'),
+                 self.getChatLogTableDef() ]
+
+    def getParticipantsDef(self, panelName, dataTable):
+        return {
+            'table_panel': [
+                {'panelName': panelName,
+                 'dataTable': dataTable,
+                 'dataRecord': 'ChatgroupMeetingParticipant'},
+                [{'table_column': [
+                    {'heading': 'Naam',
+                     'valueAttr': 'conv_participant_name'}
+                    ]},
+                 {'table_column': [
+                     {'heading': 'joined',
+                      'valueAttr': 'joined_at'}
+                     ]},
+                 {'table_column': [
+                     {'heading': 'left',
+                      'valueAttr': 'left_at'}
+                     ]},
+                 {'table_column': [
+                     {'heading': 'lines',
+                      'valueAttr': 'conv_participant_nbr_lines'}
+                     ]},
+                 {'table_column': [
+                     {'heading': 'words',
+                      'valueAttr': 'conv_participant_nbr_words'}
+                     ]}
+                    ]
+                ]
+            }
 
     def getChatLogTableDef(self):
@@ -125 +154 @@
         chatData = self.site.pythonObjectAsTuple(
             chat,
-            self.chatConv_DataElements,
-            escape=['conv_Question_answerText'])
+            self.chatConv_DataElements)
 
         chatData['ChatgroupMeeting'][0]['chat_lines_total'] = len(chat.conv_messages)
@@ -136 +164 @@
         self.dbg(chatData)
 
-        panel_data = {  'panel_data': [  [chatData]  ] }
-        fieldErrors = { 'fieldErrors': [ self.errors ] }
-        panelMessage = { 'panelMessage': self.panelMessage}
+        participantDataElements = ['conv_participant_name', 'joined_at', 'left_at', 'conv_participant_nbr_lines', 'conv_participant_nbr_words']
+
+        facilitators = self.site.listOfPythonObjectsAsTuple(
+            'ChatgroupFacilitators',
+            self.site.getChatgroupMeetingParticipantsByMeetingId(
+                self.site,
+                self.getParam('conv_id'),
+                True),
+             participantDataElements
+            )
+            
+        self.dbg(facilitators)
+        
+        participants = self.site.listOfPythonObjectsAsTuple(
+            'ChatgroupParticipants',
+            self.site.getChatgroupMeetingParticipantsByMeetingId(
+                self.site,
+                self.getParam('conv_id'),
+                False),
+             participantDataElements
+            )
+            
+        self.dbg(participants)
+
+        panel_data   = {'panel_data'  : [[chatData, facilitators, participants]]}
+        fieldErrors  = {'fieldErrors' : [self.errors]}
+        panelMessage = {'panelMessage': self.panelMessage}
         
         return [panel_data, fieldErrors, panelMessage]