mirror of
https://github.com/ACSPRI/queXS
synced 2024-04-02 12:12:16 +00:00
cosmetics
This commit is contained in:
@@ -202,7 +202,7 @@ xhtml_head(T_("Data output"),true,array("../include/bootstrap/css/bootstrap.min.
|
|||||||
print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a questionnaire") . ": </h3>";
|
print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a questionnaire") . ": </h3>";
|
||||||
$questionnaire_id = false;
|
$questionnaire_id = false;
|
||||||
if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']);
|
if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']);
|
||||||
display_questionnaire_chooser($questionnaire_id,false,"form-inline col-sm-3 pull-left", "form-control");
|
display_questionnaire_chooser($questionnaire_id,false,"form-inline col-lg-4 pull-left", "form-control");
|
||||||
|
|
||||||
if ($questionnaire_id)
|
if ($questionnaire_id)
|
||||||
{
|
{
|
||||||
@@ -218,7 +218,7 @@ if ($questionnaire_id)
|
|||||||
print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a sample") . ": </h3>";
|
print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a sample") . ": </h3>";
|
||||||
$sample_import_id = false;
|
$sample_import_id = false;
|
||||||
if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']);
|
if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']);
|
||||||
display_sample_chooser($questionnaire_id,$sample_import_id,false,"form-inline col-sm-3 pull-left", "form-control");
|
display_sample_chooser($questionnaire_id,$sample_import_id,false,"form-inline col-lg-4 pull-left", "form-control");
|
||||||
|
|
||||||
if ($sample_import_id)
|
if ($sample_import_id)
|
||||||
{
|
{
|
||||||
@@ -232,7 +232,7 @@ if ($questionnaire_id)
|
|||||||
//download a key file linking the caseid to the sample
|
//download a key file linking the caseid to the sample
|
||||||
print "<div class='form-group '><h3 class='col-sm-4 text-right'>" . T_("Download key file: select sample var") . ": </h3>";
|
print "<div class='form-group '><h3 class='col-sm-4 text-right'>" . T_("Download key file: select sample var") . ": </h3>";
|
||||||
|
|
||||||
display_chooser($rs,"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&sample_import_id=$sample_import_id",true,true,false,true,"form-inline col-sm-3 pull-left");
|
display_chooser($rs,"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&sample_import_id=$sample_import_id",true,true,false,true,"form-inline col-lg-4 pull-left");
|
||||||
|
|
||||||
print "</div><div class=' col-sm-4'>";
|
print "</div><div class=' col-sm-4'>";
|
||||||
|
|
||||||
|
|||||||
@@ -309,7 +309,7 @@ if ($questionnaire_id != false)
|
|||||||
AND s.enabled = 1";
|
AND s.enabled = 1";
|
||||||
$s = $db->GetAll($sql);
|
$s = $db->GetAll($sql);
|
||||||
if (!empty($s)){
|
if (!empty($s)){
|
||||||
print "<h3 class='form-inline pull-left'>   " . T_("Sample") . ": </h3>";
|
print "<h3 class='form-inline pull-left'> " . T_("Sample") . ": </h3>";
|
||||||
|
|
||||||
display_chooser($s,"sample","sample_import_id",true,"questionnaire_id=$questionnaire_id",true,true,false,true,"pull-left");
|
display_chooser($s,"sample","sample_import_id",true,"questionnaire_id=$questionnaire_id",true,true,false,true,"pull-left");
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -57,9 +57,9 @@ function sRandomChars($length = 15,$pattern="23456789abcdefghijkmnpqrstuvwxyz")
|
|||||||
for($i=0;$i<$length;$i++)
|
for($i=0;$i<$length;$i++)
|
||||||
{
|
{
|
||||||
if(isset($key))
|
if(isset($key))
|
||||||
$key .= $pattern{mt_rand(0,$patternlength)};
|
$key .= $pattern{mt_rand(0,$patternlength)};
|
||||||
else
|
else
|
||||||
$key = $pattern{mt_rand(0,$patternlength)};
|
$key = $pattern{mt_rand(0,$patternlength)};
|
||||||
}
|
}
|
||||||
return $key;
|
return $key;
|
||||||
}
|
}
|
||||||
@@ -354,19 +354,19 @@ function add_case($sample_id,$questionnaire_id,$operator_id = "NULL",$testing =
|
|||||||
{
|
{
|
||||||
global $db;
|
global $db;
|
||||||
|
|
||||||
$ttries = 0;
|
$ttries = 0;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
$token = sRandomChars();
|
$token = sRandomChars();
|
||||||
|
|
||||||
$sql = "SELECT count(*) as c
|
$sql = "SELECT count(*) as c
|
||||||
FROM `case`
|
FROM `case`
|
||||||
WHERE token = '$token'";
|
WHERE token = '$token'";
|
||||||
|
|
||||||
$ttries++;
|
$ttries++;
|
||||||
} while ($db->GetOne($sql) > 0 && $ttries < 10);
|
} while ($db->GetOne($sql) > 0 && $ttries < 10);
|
||||||
|
|
||||||
|
|
||||||
$sql = "INSERT INTO `case` (case_id, sample_id, questionnaire_id, last_call_id, current_operator_id, current_call_id, current_outcome_id,token)
|
$sql = "INSERT INTO `case` (case_id, sample_id, questionnaire_id, last_call_id, current_operator_id, current_call_id, current_outcome_id,token)
|
||||||
VALUES (NULL, $sample_id, $questionnaire_id, NULL, $operator_id, NULL, '$current_outcome_id','$token')";
|
VALUES (NULL, $sample_id, $questionnaire_id, NULL, $operator_id, NULL, '$current_outcome_id','$token')";
|
||||||
|
|
||||||
@@ -727,7 +727,7 @@ function get_case_id($operator_id, $create = false)
|
|||||||
}
|
}
|
||||||
$r2 = $db->GetRow($sql);
|
$r2 = $db->GetRow($sql);
|
||||||
|
|
||||||
|
|
||||||
if (empty($r2))
|
if (empty($r2))
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user