From b5bb58124509eb74597cd381bb9abeda9c39926b Mon Sep 17 00:00:00 2001 From: azammitdcarf Date: Tue, 1 May 2012 00:58:42 +0000 Subject: [PATCH] Updated changelog and translation file Made the test sample a bit more interesting --- CHANGELOG | 11 +++ locale/quexs.pot | 183 ++++++++++++++++++++++++----------------- userdoc/testsample.csv | 48 +++++++++-- 3 files changed, 160 insertions(+), 82 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 85997999..07c5a1cd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +queXS 1.5.3 - Changes since 1.5.2: + +New Feature: Automatically create tokens table when activating (as is required by queXS) +New Feature: Sample only quota for row quota (set quotas based on sample record values) +New Feature: Complete sample file output with caseid (if assigned) and current outcome +New Feature: Added a listing of cases by outcome for a questionnaire when clicking on the outcome code. Can then link through to individual case management + +Fixed Bug: Make sure to mark system sort process as stopped when manually killed +Fixed Bug: Question quota selections to work properly with Limesurvey 1.91+ database structure + + queXS 1.5.2 - Changes since 1.5.1: New Feature: Add a response via XML RPC. Using this revision of queXS and queXF 1.13.0 - you can export a paper form from queXS and once paper forms are scanned and verified, the data can be sent from queXF back to queXS using XMLRPC (can be on different servers) diff --git a/locale/quexs.pot b/locale/quexs.pot index d4bad4fb..423cde24 100644 --- a/locale/quexs.pot +++ b/locale/quexs.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: queXS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-10 11:04+1000\n" +"POT-Creation-Date: 2012-05-01 10:40+1000\n" "PO-Revision-Date: \n" "Last-Translator: Adam Zammit \n" "Language-Team: \n" @@ -831,52 +831,52 @@ msgstr "" msgid "Please wait for this call to answer before attempting to call the supervisor" msgstr "" -#: admin/systemsort.php:73 -#: admin/systemsort.php:96 -#: admin/systemsort.php:97 +#: admin/systemsort.php:75 +#: admin/systemsort.php:98 +#: admin/systemsort.php:99 msgid "Monitor system wide case sorting" msgstr "" -#: admin/systemsort.php:75 +#: admin/systemsort.php:77 msgid "Running process:" msgstr "" -#: admin/systemsort.php:79 +#: admin/systemsort.php:81 msgid "Kill signal sent: Please wait..." msgstr "" -#: admin/systemsort.php:80 +#: admin/systemsort.php:82 msgid "Process is already closed (eg. server was rebooted) - click here to confirm" msgstr "" -#: admin/systemsort.php:84 +#: admin/systemsort.php:86 msgid "Kill the running process" msgstr "" -#: admin/systemsort.php:90 -#: admin/systemsort.php:104 +#: admin/systemsort.php:92 +#: admin/systemsort.php:106 msgid "Log id" msgstr "" -#: admin/systemsort.php:90 -#: admin/systemsort.php:104 +#: admin/systemsort.php:92 +#: admin/systemsort.php:106 msgid "Date" msgstr "" -#: admin/systemsort.php:90 -#: admin/systemsort.php:104 +#: admin/systemsort.php:92 +#: admin/systemsort.php:106 msgid "Log entry" msgstr "" -#: admin/systemsort.php:98 +#: admin/systemsort.php:100 msgid "Click here to enable and begin system wide case sorting" msgstr "" -#: admin/systemsort.php:99 +#: admin/systemsort.php:101 msgid "System wide case sorting is periodically (via SYSTEM_SORT_MINUTES configuration directive) sorting cases on a system wide basis instead of finding the most appropriate case each time an operator requests a new case. This may increase performance where there are a large number of cases or complex quotas in place. If you are not experiencing any performance problems, it is not recommended to use this feature." msgstr "" -#: admin/systemsort.php:100 +#: admin/systemsort.php:102 msgid "Outcome of last process run (if any)" msgstr "" @@ -1123,12 +1123,13 @@ msgid "Stop calling this sample when:" msgstr "" #: admin/quota.php:152 -#: admin/quotarow.php:177 +#: admin/quotarow.php:187 msgid "for" msgstr "" #: admin/quota.php:152 -#: admin/quotarow.php:177 +#: admin/quotarow.php:184 +#: admin/quotarow.php:187 msgid "completions" msgstr "" @@ -1141,7 +1142,7 @@ msgid "Quota not yet reached" msgstr "" #: admin/quota.php:159 -#: admin/quotarow.php:185 +#: admin/quotarow.php:195 msgid "Current completions: " msgstr "" @@ -1149,41 +1150,41 @@ msgstr "" msgid "Select a question for the quota" msgstr "" -#: admin/quota.php:190 +#: admin/quota.php:192 msgid "Enter the details for creating the quota:" msgstr "" -#: admin/quota.php:191 -#: admin/quotarow.php:259 +#: admin/quota.php:193 +#: admin/quotarow.php:275 msgid "Pre defined values for this question:" msgstr "" -#: admin/quota.php:204 -#: admin/quotarow.php:272 +#: admin/quota.php:205 +#: admin/quotarow.php:287 msgid "No labels defined for this question" msgstr "" -#: admin/quota.php:206 -#: admin/quotarow.php:274 +#: admin/quota.php:207 +#: admin/quotarow.php:289 msgid "Code value" msgstr "" -#: admin/quota.php:212 -#: admin/quotarow.php:284 +#: admin/quota.php:213 +#: admin/quotarow.php:299 msgid "The code value to compare" msgstr "" -#: admin/quota.php:213 -#: admin/quotarow.php:285 +#: admin/quota.php:214 +#: admin/quotarow.php:300 msgid "The type of comparison" msgstr "" -#: admin/quota.php:214 -#: admin/quotarow.php:286 +#: admin/quota.php:215 +#: admin/quotarow.php:305 msgid "The number of completions to stop calling at" msgstr "" -#: admin/quota.php:218 +#: admin/quota.php:219 msgid "Add quota" msgstr "" @@ -1344,7 +1345,7 @@ msgid "Set values in questionnaire to pre fill" msgstr "" #: admin/index.php:64 -#: admin/quotarow.php:119 +#: admin/quotarow.php:126 msgid "Quota row management" msgstr "" @@ -1786,93 +1787,103 @@ msgstr "" msgid "Submit changes" msgstr "" -#: admin/quotarow.php:147 -#: admin/quotarow.php:153 +#: admin/quotarow.php:154 +#: admin/quotarow.php:160 msgid "Copied quotas" msgstr "" -#: admin/quotarow.php:156 +#: admin/quotarow.php:163 msgid "Current row quotas (click to delete)" msgstr "" -#: admin/quotarow.php:168 +#: admin/quotarow.php:175 msgid "Currently no row quotas" msgstr "" -#: admin/quotarow.php:175 +#: admin/quotarow.php:182 msgid "Replicate: Where" msgstr "" -#: admin/quotarow.php:175 -#: admin/quotarow.php:177 +#: admin/quotarow.php:182 +#: admin/quotarow.php:184 +#: admin/quotarow.php:187 msgid "like" msgstr "" -#: admin/quotarow.php:177 -msgid "Stop calling" +#: admin/quotarow.php:184 +msgid "Sample only. Stop calling where" msgstr "" -#: admin/quotarow.php:177 +#: admin/quotarow.php:184 +#: admin/quotarow.php:187 msgid "rows from this sample when:" msgstr "" -#: admin/quotarow.php:180 +#: admin/quotarow.php:187 +msgid "Stop calling" +msgstr "" + +#: admin/quotarow.php:190 msgid "Row quota reached (Closed)" msgstr "" -#: admin/quotarow.php:182 +#: admin/quotarow.php:192 msgid "Row quota not yet reached (Open)" msgstr "" -#: admin/quotarow.php:202 +#: admin/quotarow.php:212 msgid "Copy quotas for this sample to (No error/duplicate checking): " msgstr "" -#: admin/quotarow.php:204 +#: admin/quotarow.php:214 msgid "Copy" msgstr "" -#: admin/quotarow.php:206 +#: admin/quotarow.php:216 msgid "Copy quotas for this sample to (No error/duplicate checking) with adjusting: " msgstr "" -#: admin/quotarow.php:208 +#: admin/quotarow.php:218 msgid "Copy adjustments" msgstr "" -#: admin/quotarow.php:214 +#: admin/quotarow.php:224 msgid "Select a question for the row quota" msgstr "" -#: admin/quotarow.php:236 +#: admin/quotarow.php:248 msgid "No question (Replicate)" msgstr "" -#: admin/quotarow.php:246 +#: admin/quotarow.php:252 +msgid "Sample only quota" +msgstr "" + +#: admin/quotarow.php:262 msgid "Select the sample variable to exclude" msgstr "" -#: admin/quotarow.php:258 +#: admin/quotarow.php:274 msgid "Enter the details for creating the row quota:" msgstr "" -#: admin/quotarow.php:280 +#: admin/quotarow.php:295 msgid "Describe this quota" msgstr "" -#: admin/quotarow.php:281 +#: admin/quotarow.php:296 msgid "Quota priority (50 is default, 100 highest, 0 lowest)" msgstr "" -#: admin/quotarow.php:282 +#: admin/quotarow.php:297 msgid "Should the priority be automatically updated based on the number of completions in this quota?" msgstr "" -#: admin/quotarow.php:292 +#: admin/quotarow.php:311 msgid "Exclude from the sample where the value is like" msgstr "" -#: admin/quotarow.php:310 +#: admin/quotarow.php:329 msgid "Add row quota" msgstr "" @@ -2284,6 +2295,28 @@ msgstr "" msgid "Saturdays" msgstr "" +#: admin/casesbyoutcome.php:52 +msgid "Cases by outcome" +msgstr "" + +#: admin/casesbyoutcome.php:72 +#: admin/supervisor.php:220 +msgid "Project" +msgstr "" + +#: admin/casesbyoutcome.php:73 +#: admin/supervisor.php:223 +msgid "Current outcome:" +msgstr "" + +#: admin/casesbyoutcome.php:84 +msgid "No cases with this outcome" +msgstr "" + +#: admin/casesbyoutcome.php:91 +msgid "Error with input" +msgstr "" + #: admin/process.php:90 msgid "Cannot connect to VoIP Server" msgstr "" @@ -2368,27 +2401,31 @@ msgstr "" msgid "Save changes to shifts" msgstr "" -#: admin/dataoutput.php:203 +#: admin/dataoutput.php:222 msgid "Download data for this questionnaire via Limesurvey" msgstr "" -#: admin/dataoutput.php:205 +#: admin/dataoutput.php:224 #: admin/samplecallattempts.php:90 msgid "Please select a sample" msgstr "" -#: admin/dataoutput.php:212 +#: admin/dataoutput.php:231 msgid "Download data for this sample via Limesurvey" msgstr "" -#: admin/dataoutput.php:219 +#: admin/dataoutput.php:238 msgid "Download key file: select sample var" msgstr "" -#: admin/dataoutput.php:223 +#: admin/dataoutput.php:242 msgid "Download complete key file" msgstr "" +#: admin/dataoutput.php:245 +msgid "Download complete sample file with current outcomes" +msgstr "" + #: admin/callrestrict.php:82 msgid "Modify call restriction times" msgstr "" @@ -2528,19 +2565,19 @@ msgstr "" msgid "Add/Remove Timezones" msgstr "" -#: admin/timezonetemplate.php:88 +#: admin/timezonetemplate.php:101 msgid "Click to remove a Timezone from the default list" msgstr "" -#: admin/timezonetemplate.php:100 +#: admin/timezonetemplate.php:113 msgid "Add a Timezone:" msgstr "" -#: admin/timezonetemplate.php:103 +#: admin/timezonetemplate.php:116 msgid "Timezone: " msgstr "" -#: admin/timezonetemplate.php:104 +#: admin/timezonetemplate.php:117 msgid "Add Timezone" msgstr "" @@ -2565,14 +2602,6 @@ msgstr "" msgid "Set outcome" msgstr "" -#: admin/supervisor.php:220 -msgid "Project" -msgstr "" - -#: admin/supervisor.php:223 -msgid "Current outcome:" -msgstr "" - #: admin/supervisor.php:247 msgid "No appointments for this case" msgstr "" diff --git a/userdoc/testsample.csv b/userdoc/testsample.csv index 611a8d6c..33efafeb 100644 --- a/userdoc/testsample.csv +++ b/userdoc/testsample.csv @@ -1,5 +1,43 @@ -name,number,postcode -Adam,03 98765432,3000 -Adam,(03) 9876 5432,3000 -Adam,03-9876-5432,3000 -Adam,0398765432,3000 +"name","number","postcode","secondnum" +"Adam","03 98765432",3000,"03 98765432" +"Adam","(03) 9876 5432",3000,"(03) 9876 5432" +"Adam","03-9876-5432",3000,"03-9876-5432" +"Adam",398765432,3000,398765432 +"Adam",398765433,3001,398765433 +"Adam",398765434,3002,398765434 +"Adam",398765435,3003,398765435 +"Adam",398765436,3004,398765436 +"Adam",398765437,3005,398765437 +"Adam",398765438,3006,398765438 +"Adam",398765439,3007,398765439 +"Adam",398765440,3008,398765440 +"Adam",398765441,3009,398765441 +"Adam",398765442,3010,398765442 +"Adam",398765443,3011,398765443 +"Adam",398765444,3012,398765444 +"Adam",398765445,3013,398765445 +"Adam",398765446,3014,398765446 +"Adam",398765447,3015,398765447 +"Adam",398765448,3016,398765448 +"Adam",398765449,3017,398765449 +"Adam",398765450,3018,398765450 +"Adam",398765451,3019,398765451 +"Adam",398765452,3020,398765452 +"Adam",398765453,3021,398765453 +"Adam",398765454,3022,398765454 +"Adam",398765455,3023,398765455 +"Adam",398765456,3024,398765456 +"Adam",398765457,3025,398765457 +"Adam",398765458,3026,398765458 +"Adam",398765459,3027,398765459 +"Adam",398765460,3028,398765460 +"Adam",398765461,3029,398765461 +"Adam",398765462,3030,398765462 +"Adam",398765463,3031,398765463 +"Adam",398765464,3032,398765464 +"Adam",398765465,3033,398765465 +"Adam",398765466,3034,398765466 +"Adam",398765467,3035,398765467 +"Adam",398765468,3036,398765468 +"Adam",398765469,3037,398765469 +"Adam",398765470,3038,398765470