diff --git a/CHANGELOG b/CHANGELOG
index 44940fce..b4785991 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,63 @@
+queXS 2.0.0 - Changes since 1.15.0
+
+queXS 2.0.0 removes the included version of Limesurvey 1.91+ and instead relies on an existing install of Limesurvey
+of at least version 2.0, with the JSON remote control API enabled to collect data.
+
+Therefore queXS 2.0.0 has an additional requirement of a separate installation of Limesurvey with the JSON RPC API enabled.
+
+Both the 1.x and 2.x branches will continue to be maintained for now. Be warned: If you choose to upgrade to the 2.0.0 version,
+there is "no going back" unless you restore from a backup.
+
+Due to the previous tight integration of queXS and Limesurvey, some noteable features are NOT supported in the 2.x series, including:
+
+- Data export:
+* Exporting data "by sample" or "by questionnaire" from Limesurvey directly
+* queXS paradata export from within Limesurvey
+
+- Integration:
+* {SAMPLE:xxx} replacement fields in Limesurvey (you will need to replace these with {TOKEN:attribute_1}, {TOKEN:attribute_2}, etc)
+* queXS replacement fields including: CALLATTEMPTS, ONAPPOINTMENT, PERIODOFDAY, APPOINTMENTDATE, APPOINTMENTTIME, APPOINTMENTNUMBER, PERCCOMPLETE, ENDINTERVIEWURL, STARTINTERVIEWURL
+* Altering of template / mode of delivery for self complete surveys versus interviewer administered surveys
+
+- Interface:
+* Automatically proceedingt to next question on answer selection (no need to press "NEXT")
+
+Please note that you may be able to implement some of these in Limesurvey directly or work around them. If they are critical for your operations,
+please do not proceed with the upgrade to queXS 2.0.0
+
+
+
+Upgrade procedure from 1.15.0 to 2.0.0:
+
+
+
ALTER TABLE `questionnaire` ADD `remote_id` INT NOT NULL ,
ADD INDEX ( `remote_id` ) ;
+queXS 1.15.0 - Changes since 1.14.4
+
+This release contains a weighted timeslot feature to allow for varying numbers of attempts in particular timeslots,
+as well as features and fixes to web/CATI mode integration.
+
+New feature: Weighted timeslots (allow more attempts in particular timeslots)
+New feature: Allow for tokens to be imported in a queXS sample
+
+Fixed issue: Database structure not optimised for sample_var_import_restrict table
+Fixed issue: Cases being generated without a valid email address when importing to Limesurvey
+Fixed issue: Limesurvey save form not displaying
+Fixed issue: Limesurvey welcome screen not displaying
+Fixed issue: Admin permissions not propogating to Limesurvey
+Fixed issue: Mode of delivery (single page, group by group, etc) not determined if no token in queXS
+
+Database changes required:
+
+INSERT INTO `sample_var_type` (`type`, `description`, `table`) VALUES(9, 'Token', '');
+ALTER TABLE `sample_import_var_restrict` ADD INDEX ( `var` ) ;
+ALTER TABLE `sample_import_var_restrict` ADD INDEX ( `sample_import_id` ) ;
+ALTER TABLE `questionnaire_timeslot` ADD `weight` INT( 11 ) NOT NULL DEFAULT '1';
+ALTER TABLE `questionnaire_sample_timeslot` ADD `weight` INT( 11 ) NOT NULL DEFAULT '1';
+
queXS 1.14.4 - Changes since 1.14.3
Fourth bug fix release.
diff --git a/admin/assignsample.php b/admin/assignsample.php
index a9efad0a..a4ce3bda 100644
--- a/admin/assignsample.php
+++ b/admin/assignsample.php
@@ -81,7 +81,6 @@ global $db;
$error = "";
-
if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET['call_max']) && isset($_GET['call_attempt_max']))
{
//need to add sample to questionnaire
@@ -106,7 +105,6 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET['
if (isset($_GET['generatecases']))
{
-
//find the number of sample variables required
$sql = "SELECT count(*)
FROM sample_import_var_restrict
@@ -122,28 +120,31 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample']) && isset($_GET['
}
include_once("../functions/functions.operator.php");
+ include_once("../functions/functions.limesurvey.php");
$db->StartTrans();
$lime_sid = $db->GetOne("SELECT lime_sid FROM questionnaire WHERE questionnaire_id = '$questionnaire_id'");
$testing = $db->GetOne("SELECT testing FROM questionnaire WHERE questionnaire_id = '$questionnaire_id'");
- //generate one case for each sample record and set outcome to 41
- $sql = "SELECT sample_id
- FROM sample
- WHERE import_id = '$sid'";
+ //generate one case for each sample record and set outcome to 41 (where an email address provided)
+ $sql = "SELECT s.sample_id, sv.val as email
+ FROM sample as s
+ LEFT JOIN (sample_var as sv, sample_import_var_restrict as sivr) ON (sv.sample_id = s.sample_id and sv.var_id = sivr.var_id and sivr.type = 8)
+ WHERE s.import_id = '$sid'";
$rs = $db->GetAll($sql);
foreach($rs as $r)
{
set_time_limit(30);
- if (add_case($r['sample_id'],$questionnaire_id,"NULL",$testing,41, $addsample) === false) {
- $error = "Could not add case - please ensure there enough additional attributes available in your Limesurvey participant table";
- break;
+ if (validate_email($r['email'])) {
+ if (add_case($r['sample_id'],$questionnaire_id,"NULL",$testing,41, $addsample) === false) {
+ $error = "Could not add case - please ensure there enough additional attributes available in your Limesurvey participant table";
+ break;
+ }
}
}
-
$db->CompleteTrans();
}
}
@@ -300,6 +301,9 @@ xhtml_head(T_("Assign samples to questionnaires"),true,$css,$js_head,false,false
print " " . T_("Go back") . "";
+if (!empty($error)) {
+ print "
$error
";
+}
$questionnaire_id = false;
if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']);
@@ -401,7 +405,7 @@ if ($questionnaire_id != false)
" . T_("Assigning call attempt time slots to questionnaires will only allow cases to be attempted in a time slot for the n + 1th time where it has been attempted at least n times in all assigned timeslots. Please note timeslots must cover all possible time periods otherwise no cases will be available during missing timeslots.") ."
";
- $sql = "SELECT q.availability_group_id,a.description as description, CONCAT('" . T_("Click to unassign") . "') as link
-
- FROM questionnaire_timeslot as q, availability_group as a
- WHERE q.availability_group_id = a.availability_group_id
- AND q.questionnaire_id = '$questionnaire_id'";
+$sql = "SELECT q.availability_group_id,a.description as description,
+ CONCAT('" . T_("Click to unassign") . "') as link,
+ q.weight
+ FROM questionnaire_timeslot as q, availability_group as a
+ WHERE q.availability_group_id = a.availability_group_id
+ AND q.questionnaire_id = '$questionnaire_id'";
$qs = $db->GetAll($sql);
print "
";
@@ -231,7 +234,7 @@ print "
" . T_("Assigning call attempt time slots to questionna
else
{
print "
" . T_("Call attempt time slots selected for this questionnaire") . "
" . T_("Assigning call attempt time slots to questionna
{
print "";
}
- print "
-
-
+ print "
";
+?>
+
+
+
+
+
+
";
}
print "";
@@ -270,7 +279,9 @@ print "
" . T_("Assigning call attempt time slots to questionna
if ($sample_import_id !== false)
{
- $sql = "SELECT q.availability_group_id,a.description as description, CONCAT('" . T_("Click to unassign") . "') as link
+ $sql = "SELECT q.availability_group_id,a.description as description,
+ CONCAT('" . T_("Click to unassign") . "') as link,
+ q.weight
FROM questionnaire_sample_timeslot as q, availability_group as a
WHERE q.availability_group_id = a.availability_group_id
AND q.questionnaire_id = '$questionnaire_id'
@@ -285,7 +296,7 @@ print "
" . T_("Assigning call attempt time slots to questionna
else
{
print "
" . T_("Call attempt time slots selected for this sample") . ":