Changeset 1427

Timestamp:

02/28/11 01:54:06 (15 months ago)

Author:

winfried

Message:

- fixing the questionairres after the chats
- fixing the adding of the registration questions after the chat
- fixing the 'thank-you' page after answering the questions
- adding an offline data extraction tool for HelpIM2

Files:

• HelpIM3/branches/chatgroups/HelpIM/chat/tasks/GetConversationIdByNickname.py (modified) (1 diff)
• HelpIM3/branches/chatgroups/config/sites/full.xml (modified) (6 diffs)
• stable/tools/db2csv.py (added)

HelpIM3/branches/chatgroups/HelpIM/chat/tasks/GetConversationIdByNickname.py

@@ -20 +20 @@
         self.conv_id = None
         try:
-            jid = self.him_request.requestParameters['jid']
+            jid = self.him_request.requestParameters.get('jid')
+            if not jid:
+                # parameters got messed up in chat, dumb workaround for it
+                jid = self.him_request.requestParameters.get('conv_id')
+            self.log.debug(".performTask() GetConversationIdByNickName, looking for jid: %s" % jid)
             rooms = HelpIM.rooms.Rooms(self.him_request.site.application.metadata,
                                        self.him_request.site.database.engine)
             room = rooms.getByJid(jid)
-            
-            self.conv_id = int(room.chat_id)
+            self.log.debug('.performTask() GetConversationIdByNickName, found room: %s' % str(room))
+            if room.chat_id:
+                self.conv_id = room.chat_id
         except:
-            pass    
+            self.log.exception(".performTask() GetConversationIdByNickName: got error while fetching chatId")
+            # pass    
         if self.conv_id is None and self.him_request.site.siteConfig.bypass_GetConfigurationIdByNickame:
             self.conv_id = self.him_request.requestParameters['conv_id']

HelpIM3/branches/chatgroups/config/sites/full.xml

@@ -125 +125 @@
                 </actionPerformed>
                 <actionPerformed name="RunCareSeekerPostChatQuestionair">
-                        <actionResult name="actionResult_SUCCESS" target="EndCareSeekerChat" />
+                        <actionResult name="actionResult_SUCCESS" target="ShowCareSeekerEnd" />
                 </actionPerformed>
                 <actionPerformed name="RunCareWorkerPostChatQuestionair">
@@ -223 +223 @@
                 <page location="ShowShifts" module="chat" script="ShowShifts"
                         allowCookies="True" />
-                <page location="EndCareSeekerChat" module="chat" script="EndCareSeekerChat" />
+                <page location="ShowCareSeekerEnd" module="intranet" script="ShowTextPanel" />
+                <page location="EditCareSeekerEnd" module="intranet" script="EditTextPanel" />
                 <page location="EndCareWorkerChatPanel" module="chat"
                         script="EndCareWorkerChatPanel" />
@@ -294 +295 @@
         <UnAuthorizedResource key="RunCareSeekerPreChatQuestionair" />
         <UnAuthorizedResource key="RunCareSeekerPostChatQuestionair" />
-        <UnAuthorizedResource key="EndCareSeekerChat" />
+        <UnAuthorizedResource key="ShowCareSeekerEnd" />
         <UnAuthorizedResource key="RequestWebChat" />
         <UnAuthorizedResource key="ShowOpenSchedule" />
@@ -471 +472 @@
                 <AuthorizedLocation key="EndCareWorkerChatPanel" />
                 <AuthorizedLocation key="RunCareWorkerPostChatQuestionair" />
+                <AuthorizedLocation key="EditCareSeekerEnd" />
                 <!-- Chatrooms -->
                 <AuthorizedLocation key="ShowChatRooms" />
@@ -596 +598 @@
                 <AuthorizedLocation key="EndCareWorkerChatPanel" />
                 <AuthorizedLocation key="RunCareWorkerPostChatQuestionair" />
+                <AuthorizedLocation key="EditCareSeekerEnd" />
         </RoleAuthorization>
 
@@ -627 +630 @@
         </menuEntry>
 
-        <Text id="EndCareSeekerChatText" value="Bedankt voor de antwoorden, je kan nu het venster sluiten" />
         <Text id="EndCareWorkerChatPanelText" value="Dit venster is offline." />
         <Text id="organisationName" value="Veilig Samen"/>