diff --git a/admin/assignsample.php b/admin/assignsample.php
index bd5b6b5f..5ac280ad 100644
--- a/admin/assignsample.php
+++ b/admin/assignsample.php
@@ -173,10 +173,10 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['rsid']))
-
+
:
" class="form-control">
diff --git a/admin/quotareport.php b/admin/quotareport.php
index 036a9da0..7aec9b9f 100644
--- a/admin/quotareport.php
+++ b/admin/quotareport.php
@@ -106,7 +106,7 @@ if (isset($_POST['submit']))
$db->CompleteTrans();
}
-xhtml_head(T_("Quota report"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../css/custom.css"),array("../js/window.js"));
+xhtml_head(T_("Quota report"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../include/font-awesome-4.3.0/css/font-awesome.css","../include/iCheck/skins/square/blue.css","../css/custom.css"),array("../js/jquery-2.1.3.min.js","../include/bootstrap-3.3.2/js/bootstrap.min.js","../include/iCheck/icheck.min.js","../js/window.js"));
print "
";
@@ -216,7 +216,7 @@ if ($questionnaire_id)
$status = T_("open");
}
- $report[] = array("strata" => "
" . $v['description'] . " ", "status" => $status, "quota" => $v['completions'], "sample" => $drawn + $remain, "sampleused" => $drawn, "sampleremain" => $remain, "completions" => $completions, "perc" => $perc, "priority" => "
", "autoprioritise" => "
");
+ $report[] = array("strata" => "
" . $v['description'] . " ", "status" => $status, "quota" => $v['completions'], "sample" => $drawn + $remain, "sampleused" => $drawn, "sampleremain" => $remain, "completions" => $completions, "perc" => $perc, "priority" => "
", "autoprioritise" => "
");
}
//c. (Questionnaire quota) Monitor outcomes of questions in completed questionnaires, and abort interview when completion limit is reached
@@ -295,7 +295,7 @@ if ($questionnaire_id)
if (count($report) > 1)
print "
-
";
+
" . TQ_("Update priorities") . "";
print "";
}
@@ -303,5 +303,11 @@ if ($questionnaire_id)
}
xhtml_foot();
-
?>
+
+
\ No newline at end of file
diff --git a/admin/quotarow.php b/admin/quotarow.php
index 1d16dfc6..9fe20387 100755
--- a/admin/quotarow.php
+++ b/admin/quotarow.php
@@ -284,7 +284,7 @@ if (isset($_GET['qsqri']) & isset($_GET['edit']))
$questionnaire_id = false;
if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']);
-xhtml_head(T_("Quota row management"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../include/bootstrap-toggle/css/bootstrap-toggle.min.css","../include/font-awesome-4.3.0/css/font-awesome.css","../include/iCheck/skins/square/blue.css","../css/custom.css"),array("../js/jquery-2.1.3.min.js","../include/bootstrap-toggle/js/bootstrap-toggle.min.js","../include/iCheck/icheck.min.js","../js/window.js"));
+xhtml_head(T_("Quota row management"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../include/bootstrap-toggle/css/bootstrap-toggle.min.css","../include/font-awesome-4.3.0/css/font-awesome.css","../include/iCheck/skins/square/blue.css","../css/custom.css"),array("../js/jquery-2.1.3.min.js","../include/bootstrap-3.3.2/js/bootstrap.min.js","../include/bootstrap-toggle/js/bootstrap-toggle.min.js","../include/iCheck/icheck.min.js","../js/window.js"));
print "
";
$sql = "SELECT questionnaire_id as value,description, CASE WHEN questionnaire_id = '$questionnaire_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
@@ -386,19 +386,17 @@ if ($questionnaire_id != false)
?>
" . TQ_("Delete") . "') as qdelete
+ CONCAT('
') as qdelete
FROM qsqr_question
WHERE questionnaire_sample_quota_row_id = $qsqri";
@@ -415,7 +413,7 @@ if ($questionnaire_id != false)
else
{
print "
" . T_("Only completed responses that have answered the following will be counted") . " ";
- xhtml_table($rs,array('description','lime_sgqa','comparison','value','qdelete'),array(T_("Description"),T_("SGQ code"),T_("Comparison"),T_("Value"),T_("Delete")));
+ xhtml_table($rs,array('description','lime_sgqa','comparison','value','qdelete'),array(T_("Description"),T_("SGQ code"),T_("Comparison"),T_("Value")," "));
print "";
}
@@ -451,12 +449,10 @@ if ($questionnaire_id != false)
if (isset($_GET['sgqa'])){
?>
-
:
:
- LIKE NOT LIKE = != < > <= >=
-
-
:
-
+
LIKE NOT LIKE = != < > <= >= :
+
:
+
" . TQ_("Delete") . "') as sdelete
+ CONCAT('
') as sdelete
FROM qsqr_sample
WHERE questionnaire_sample_quota_row_id = $qsqri";
@@ -503,7 +499,7 @@ if ($questionnaire_id != false)
else
{
print "
" . T_("Completed responses that have the following sample details will be counted towards the quota and excluded when the quota is reached") . " ";
- xhtml_table($rs,array('description','exclude_var_id','exclude_var','comparison','exclude_val','sdelete'),array(T_("Description"),T_("Sample var ID"),T_("Sample variable"),T_("Comparison"),T_("Value"),T_("Delete")));
+ xhtml_table($rs,array('description','exclude_var_id','exclude_var','comparison','exclude_val','sdelete'),array(T_("Description"),T_("Sample var ID"),T_("Sample variable"),T_("Comparison"),T_("Value")," "));
print "";
}
@@ -552,7 +548,7 @@ if ($questionnaire_id != false)
:
-
"/>
+
";}
print "";
@@ -562,7 +558,7 @@ if ($questionnaire_id != false)
else
{
$sql = "SELECT questionnaire_sample_quota_row_id,qsq.description,
- CONCAT('
', qsq.description, ' ') as qedit,
+ CONCAT('
') as qedit,
CONCAT('
') as qselect,
qsq.completions,qsq.quota_reached,qsq.current_completions,
CASE WHEN qsq.autoprioritise = 1 THEN '" . TQ_("Yes") . "' ELSE '" . TQ_("No") . "' END AS ap, qsq.priority,
@@ -580,8 +576,8 @@ if ($questionnaire_id != false)
else
{
print "