Changeset 1431 for HelpIM3

Timestamp:

03/01/11 05:52:27 (15 months ago)

Author:

winfried

Message:

- fixing startupmessages for the staff when client enters chat
- make questions appear in order of entering
- make answers appear in order of code
- pimping the closed page
- adding custom text to the RunCareSeekerPostChat? page

Location:

HelpIM3/branches/chatgroups

Files:

• HelpIM/chat/pages/ShowOpenSchedule.py (modified) (3 diffs)
• HelpIM/chat/templates/Chat.py (modified) (3 diffs)
• HelpIM/questionair/db/services.py (modified) (1 diff)
• HelpIM/questionair/pages/RunCareSeekerPostChatQuestionair.py (modified) (1 diff)
• config/sites/full.xml (modified) (6 diffs)
• htdocs/chat.js (modified) (2 diffs)
• htdocs/helpim.js (modified) (1 diff)
• htdocs/xslt/HelpIM_html_UI_common.xslt (modified) (1 diff)

HelpIM3/branches/chatgroups/HelpIM/chat/pages/ShowOpenSchedule.py

@@ -12 +12 @@
         self.log = logging.getLogger('HelpIM.chat.pages.ShowShifts.Handler')
         self.panelId = 'ShowShifts'
-        self.panelName = 'Openingstijden'
+        self.panelName = 'Gesloten'
         self.showMenu = False
+        if kwargs['him_request'].site.siteConfig.dictOf__Text.has_key('ShowOpenScheduleText'):
+            self.panelMessage = kwargs['him_request'].site.siteConfig.dictOf__Text['ShowOpenScheduleText'].value
+
 
     def showSession(self):
@@ -24 +27 @@
         self.log.debug('.getPanelData()')
         
-        shiftDataElements = ['chat_shift_id', 'chat_shift_dayOfWeek', 'chat_shift_start_time', 'chat_shift_duration_time', 'endTime']
+        shiftDataElements = ['chat_shift_id', 'chat_shift_dayOfWeek', 'chat_shift_start_time', 'endTime']
         order_by = ['chat_shift_dayOfWeek', 'chat_shift_start_time']
-        shiftsList = self.site.getTableData('Table_Data', 'Table_Record', self.site.getShiftList(self.site, order_by=['chat_shift_dayOfWeek', 'chat_shift_start_time']), shiftDataElements, fieldsAsAttributes) 
+        shiftsList = self.site.getTableData('Table_Data', 'Table_Record', self.site.getShiftList(self.site, order_by=['chat_shift_dayOfWeek', 'chat_shift_start_time']), shiftDataElements, fieldsAsAttributes)
+        self.log.debug("*************  " + str(shiftsList['Table_Data'][1])) #[0]['Table_Record']))
+        for i in range(len(shiftsList['Table_Data'][1])):
+            shiftsList['Table_Data'][1][i]['Table_Record'][0]["chat_shift_start_time"] = shiftsList['Table_Data'][1][i]['Table_Record'][0]["chat_shift_start_time"][:-3] + " uur"
+            shiftsList['Table_Data'][1][i]['Table_Record'][0]["endTime"] = shiftsList['Table_Data'][1][i]['Table_Record'][0]["endTime"][:-3] + " uur"
 
         weekDayElements = {'weekDay_id':'id', 'weekDay_name':'desc'}
@@ -66 +73 @@
                                                  ] 
                           },
-                          {  'table_column': [  {    'heading':'Duur',
-                                                     'attrName': 'chat_shift_duration_time'
-                                                     }
-                                                 ] 
-                          },
                           {  'table_column': [  {    'heading':'Eind',
                                                      'attrName': 'endTime'

HelpIM3/branches/chatgroups/HelpIM/chat/templates/Chat.py

@@ -81 +81 @@
             if not self.configs.get("NICKNAME", False):
                 self.configs["NICKNAME"] = "Helpline"
+            self.configs["ISSTAFF"] = "true"
         else:
             if not self.configs.get("TOPIC", False):
@@ -86 +87 @@
             if not self.configs.get("NICKNAME", False):
                 self.configs["NICKNAME"] = "Child"
+            self.configs["ISSTAFF"] = "false"
 
         # read config from config file
@@ -155 +157 @@
 var STAFFCHAT = %(STAFFCHAT)s;
 var MAXCHATS = %(MAXCHATS)s;
-var ISSTAFF_RAW, ISSTAFF = "%(ISSTAFF)s";
+var ISSTAFF = %(ISSTAFF)s;
 var STARTUPLINES = %(STARTUPLINES)s;
 var CHATGROUP_CHAT = %(CHATGROUP_CHAT)s;

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

@@ -45 +45 @@
             questionair = qQuery.one()
             self.log.debug('Found questionair(%s)' % questionair.questionair_name)
+            # sort the fixed choice answers
+            for question in questionair.questions:
+                if question.question_type == "MK":
+                   question.answerDefinitions.sort(key=lambda k: k.fcAnswer_code)
             return questionair
         except NoResultFound:

HelpIM3/branches/chatgroups/HelpIM/questionair/pages/RunCareSeekerPostChatQuestionair.py

@@ -21 +21 @@
         self.questionair = None
         self.questionairName = 'CS_POST_CHAT'
+        if kwargs['him_request'].site.siteConfig.dictOf__Text.has_key('RunCareSeekerPostChatQuestionairText'):
+            self.panelMessage = kwargs['him_request'].site.siteConfig.dictOf__Text['RunCareSeekerPostChatQuestionairText'].value
 
     def performAction(self, *pargs, **kwargs):

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

@@ -19 +19 @@
         NumberOfChatsWaitingBeforeMe="0"
         isWaitingQueueFull="False"
-        cs_subject_id="2"
+        cs_subject_id="28"
         cs_nickname_id="1"
         chatQueueLength="120"
@@ -63 +63 @@
                 </actionPerformed>
                 <actionPerformed name="AddQuestion">
-                        <actionResult name="actionResult_SUCCESS" target="ShowQuestions">
+                        <actionResult name="actionResult_SUCCESS" target="ShowQuestionairs">
                                 <actionParm name="questionair_id" />
                         </actionResult>
                 </actionPerformed>
                 <actionPerformed name="EditQuestion">
-                        <actionResult name="actionResult_SUCCESS" target="ShowQuestions">
+                        <actionResult name="actionResult_SUCCESS" target="ShowQuestionairs">
                                 <actionParm name="questionair_id" />
                         </actionResult>
                 </actionPerformed>
                 <actionPerformed name="DeleteQuestion">
-                        <actionResult name="actionResult_SUCCESS" target="ShowQuestions">
+                        <actionResult name="actionResult_SUCCESS" target="ShowQuestionairs">
                                 <actionParm name="questionair_id" />
                         </actionResult>
@@ -270 +270 @@
                         allowCookies="True" />
                 <page location="EditQuestionair" module="questionair" script="EditQuestionair"
-                        allowCookies="True" />
-                <page location="ShowQuestions" module="questionair" script="ShowQuestions"
                         allowCookies="True" />
                 <page location="AddQuestion" module="questionair" script="AddQuestion"
@@ -514 +512 @@
                 <AuthorizedLocation key="AddQuestionair" />
                 <AuthorizedLocation key="EditQuestionair" />
-                <AuthorizedLocation key="ShowQuestions" />
                 <AuthorizedLocation key="AddQuestion" />
                 <AuthorizedLocation key="EditQuestion" />
@@ -634 +631 @@
                 <AuthorizedLocation key="AddQuestionair" />
                 <AuthorizedLocation key="EditQuestionair" />
-                <AuthorizedLocation key="ShowQuestions" />
                 <AuthorizedLocation key="AddQuestion" />
                 <AuthorizedLocation key="EditQuestion" />
@@ -692 +688 @@
         <Text id="organisationName" value="Veilig Samen"/>
         <Text id="chatName" value="chat"/>
-
+  <Text id="RunCareSeekerPreChatQuestionairText" value="Om je snel van dienst te kunnen zijn vragen we je voor je gaat chatten een aantal vragen te beantwoorden. Daardoor kan de hulpverlener snel to-the-point komen en het helpt ons bij het verbeteren van het aanbod op deze site. We vragen niet naar persoonsgegevens en slaan geen IP-adressen op. Je blijft dus anoniem. Als je meer wilt lezen over je privacy en veiligheid als gebruiker van deze site, kijk dan op: https://www.veiligsamen.nl/privacy"/>
+  <Text id="RunCareSeekerPostChatQuestionairText" value="Wat vind je van deze site en het gesprek dat je net had? Dit is een nieuwe site en we willen iedereen zo goed mogelijk helpen. We hopen dat je onderstaande acht vragen wilt beantwoorden. Dat kan door het beste antwoord aan te klikken. Je blijft natuurlijk anoniem. Alvast bedankt!"/>
+  <Text id="ShowOpenScheduleText" value="De chat is momenteel gesloten. Onze openingstijden zijn:"/>
 </siteConfig>

HelpIM3/branches/chatgroups/htdocs/chat.js

@@ -249 +249 @@
             user.roster.subject = msg.getSubject();
             document.getElementById('header').innerHTML = TOPICHEADER+" "+htmlEnc(msg.getSubject());
-            if (ISSTAFF == true) {
+            if (ISSTAFF) {
                 putMsgHTML(TOPICMESSAGE+" "+msg.getSubject(), mtime, group);
             }
@@ -257 +257 @@
         /* look for startuplines */
         if (msg.getType() == 'groupchat' && msg.getBody().substring(0,16) == "[#startuplines#]") {
-            if (ISSTAFF == true) {
+            if (ISSTAFF) {
                 putMsgHTML(msg.getBody().substring(16), mtime, group);
             }

HelpIM3/branches/chatgroups/htdocs/helpim.js

@@ -31 +31 @@
 
 var aRoom = ROOMNAME+'@'+MUCDOMAIN;
-
-var ISSTAFF = (ISSTAFF_RAW == "True");
 
 var FULLPOSTURI;

HelpIM3/branches/chatgroups/htdocs/xslt/HelpIM_html_UI_common.xslt

@@ -301 +301 @@
                                                 <xsl:apply-templates
                                                         select="//panel_data//*[name()=current()/@dataTable]//*[name()=current()/@dataRecord]">
-                                                        <xsl:sort select="@question_id"/>
+                                                        <xsl:sort select="@question_creation_timestamp"/>
                                                         </xsl:apply-templates>
                         </xsl:element>