Changeset 987

Timestamp:

06/21/10 01:37:29 (2 years ago)

Author:

winfried

Message:

Updating docstrings, adding / improving invitation table. refs #103

Location:

HelpIM3/HelpIM

Files:

• appl/site.py (modified) (2 diffs)
• auth/db/databaseMetadata.py (modified) (1 diff)
• chat/db/classes.py (modified) (1 diff)
• chat/db/databaseMetadata.py (modified) (2 diffs)
• chat/db/services.py (modified) (3 diffs)
• chat/pages/StartClientWebChat.py (modified) (1 diff)
• chat/pages/StartClientWebChatPost.py (modified) (1 diff)
• chat/pages/StartStaffWebChatPost.py (modified) (1 diff)

HelpIM3/HelpIM/appl/site.py

@@ -14 +14 @@
 log = logging.getLogger('HelpIM.appl.site')
 
-
+class ResourceNotFoundException(RuntimeError):
+    pass 
 
 class Site(object):
@@ -495 +496 @@
                  }
         return menu
-
-class ResourceNotFoundException(RuntimeError):
-    pass 

HelpIM3/HelpIM/auth/db/databaseMetadata.py

@@ -27 +27 @@
     return metadata
 
-    
+
 def get_UserTable_MetaData(metadata):
     user_table = Table(

HelpIM3/HelpIM/chat/db/classes.py

@@ -222 +222 @@
 
 class ChatInvitation(object):
-    pass
+    def __init__(self, inviter, invitee):
+        self.chat_Invitation_inviter_id = inviter
+        self.chat_Invitation_invitee_id = invitee
+
+    def __repr__(self):
+        if self.chat_Invitation_invitation_open:
+            opn = "Open"
+        else:
+            opn = "Closed"
+        s = "%(opn)s ChatInivitation %(id)s from %(invitername)s(%(inviterid)s) to %(inviteename)s(%(inviteeid)s)" % {
+            "opn": opn,
+            "id": self.chat_Invitation_id,
+            "invitername": self.invitingUser.user_userId,
+            "inviterid": self.invitingUser.user_id,
+            "inviteename": self.invitedUser.user_userId,
+            "inviteeid": self.invitedUser.user_id,
+            }
+        return s

HelpIM3/HelpIM/chat/db/databaseMetadata.py

@@ -6 +6 @@
 from HelpIM.chat.db.classes import ChatShift, IPBlock, ChatServerProperties, Conversation, ConversationEvent, ConversationParticipant, ConversationCareSeeker, ConversationCareWorker, ConversationalMessage, ChatConversation, ChatMessage, ConversationQuestion, ConversationFixedChoiceAnswer, ChatQueue, ConvMessageComment, ChatInvitation
 from HelpIM.auth.db.classes import User
+from HelpIM.auth.db.classes import User
+import HelpIM.auth.db.databaseMetadata
 
 def getMetadata(metadata):
@@ -552 +554 @@
                )
         )
-    mapper(ChatInvitation, chat_Invitation_table)
-    return metadata
+    try:
+        user_table=metadata.tables['auth_User']
+    except AttributeError:
+        for table in self.metadata.sorted_tables:
+            if table.name == name: return table
+
+    mapper(ChatInvitation, chat_Invitation_table, properties={
+        'invitingUser': relation(User, primaryjoin=chat_Invitation_table.c.chat_Invitation_inviter_id==user_table.c.user_id),
+        'invitedUser': relation(User, primaryjoin=chat_Invitation_table.c.chat_Invitation_invitee_id==user_table.c.user_id)
+         })
+    return metadata

HelpIM3/HelpIM/chat/db/services.py

@@ -4 +4 @@
 import sys
 from HelpIM.auth.db.databaseMetadata import User, HIM_SessionData
-from HelpIM.chat.db.databaseMetadata import ChatServerProperties, ChatShift, IPBlock, ChatConversation, Conversation, ChatQueue, ConversationCareWorker, ConversationCareSeeker, ConversationEvent, ChatMessage
+from HelpIM.chat.db.databaseMetadata import ChatServerProperties, ChatShift, IPBlock, ChatConversation, Conversation, ChatQueue, ConversationCareWorker, ConversationCareSeeker, ConversationEvent, ChatMessage, ChatInvitation
 from HelpIM.chat.db.classes import Shift_Duration, Availability_Duration
 from HelpIM.intranet.db.databaseMetadata import HIM_Text
@@ -13 +13 @@
 import logging
 
-
+class MissingDatabaseSession_Exception(RuntimeError):
+    pass 
 
 class DatabaseServices():
@@ -610 +611 @@
 
 
-
-          
-class MissingDatabaseSession_Exception(RuntimeError):
-    pass 
+    def getInvitees(self, site, userId):
+        session = site.database.getSession()
+        invitees = session.query(ChatInvitation).filter(
+            ChatInvitation.chat_Invitation_inviter_id == userId).filter(
+                ChatInvitation.chat_Invitation_invitation_open==True).order_by(
+                    ChatInvitation.chat_Invitation_invitation_time)
+        return invitees
+
+    def getInvitations(self, site, userId):
+        session = site.database.getSession()
+        invitations = session.query(ChatInvitation).filter(
+            ChatInvitation.chat_Invitation_invitee_id == userId).filter(
+                ChatInvitation.chat_Invitation_invitation_open==True).order_by(
+                    ChatInvitation.chat_Invitation_invitation_time)
+        return invitations
+
+

HelpIM3/HelpIM/chat/pages/StartClientWebChat.py

@@ -4 +4 @@
 
 class Handler(HelpIM.chat.pages.StartWebChatBase.Handler):
+    """This handler takes the nickname, topic and other previously submitted
+       data from the database and opens a chat window where the client has
+       been admitted to by a previous (waiting-queue) script"""
 
     def getRoom(self):

HelpIM3/HelpIM/chat/pages/StartClientWebChatPost.py

@@ -3 +3 @@
 
 class Handler(HelpIM.chat.pages.StartWebChatBase.Handler):
+    """This handler takes NICKNAME and TOPIC from the post variables
+       and tries to join a waiting sgtaff-memeber. Redericts to
+       /client_error.html when failing."""
 
     def getRoom(self):

HelpIM3/HelpIM/chat/pages/StartStaffWebChatPost.py

@@ -3 +3 @@
 
 class Handler(HelpIM.chat.pages.StartWebChatBase.Handler):
+    """This handler takes the "NICKNAME" from the post variables
+       and opens a chatroom for a staff-member."""
 
     def getRoom(self):