diff --git a/admin/index.php b/admin/index.php
index 75f41971..d3c4c1ab 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -98,7 +98,7 @@ include ("../lang.inc.php");
-
+
@@ -162,7 +162,7 @@ include ("../lang.inc.php");
">
-
+
diff --git a/admin/new.php b/admin/new.php
index 61952567..1f8b82bc 100644
--- a/admin/new.php
+++ b/admin/new.php
@@ -89,7 +89,6 @@ if (isset($_POST['import_file']))
}
$do = implode($do,",");
- //print $do . "";
//** - end
diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php
index 08db3ba8..e99658be 100644
--- a/admin/questionnairelist.php
+++ b/admin/questionnairelist.php
@@ -576,6 +576,7 @@ else
CONCAT('')
END as outcomes,
CONCAT('') as calls,
+ CONCAT('') as setoutcomes,
CASE WHEN enabled = 0 THEN
CONCAT('')
ELSE
@@ -594,7 +595,7 @@ else
FROM questionnaire";
$rs = $db->GetAll($sql);
- $columns = array("qid","description","status","enabledisable","outcomes","calls","casestatus","shifts","assample","dataout","modify","inlime","prefill","deletee");
+ $columns = array("qid","description","status","enabledisable","outcomes","calls","casestatus","shifts","assample","dataout","modify","setoutcomes","inlime","prefill","deletee");
xhtml_table($rs,$columns,false,"table-hover table-condensed ");
print "";
diff --git a/admin/set_outcomes.php b/admin/set_outcomes.php
index 60884676..0de4a196 100644
--- a/admin/set_outcomes.php
+++ b/admin/set_outcomes.php
@@ -81,22 +81,19 @@ if (isset($_POST['qid']) && isset($_POST['save'])){
$def = $db->GetAll($sql);
for ($i=0; $i < count($def); $i++){
- foreach($def[$i] as $key => $val){
- $sel[] = $val;
- }
+ foreach($def[$i] as $key => $val){
+ $sel[] = $val;
+ }
}
if(!empty($_POST['select']) ){
//add selected outcomes
- foreach($_POST['select'] as $n => $val)
- {
- $sel[] = $val;
- }
+ foreach($_POST['select'] as $n => $val){
+ $sel[] = $val;
+ }
}
$sel=implode($sel,",");
-
- print $sel . "";
$qid = intval($_POST['qid']);
$sql = "UPDATE questionnaire
@@ -105,7 +102,6 @@ if (isset($_POST['qid']) && isset($_POST['save'])){
$db->Execute($sql);
-
$_GET['qid'] = $_POST['qid'];
unset($_POST['qid']);
@@ -116,8 +112,8 @@ if (isset($_POST['qid']) && isset($_POST['save'])){
/*select outcomes list*/
-if (isset($_GET['default'])) { $title = T_("Default outcomes"); }
-else if (isset($_GET['qid'])){ $title = T_("Questionnaire outcomes"); $qid = intval($_GET['qid']); }
+if (isset($_GET['default'])) { $title = T_("Set default outcomes"); }
+else if (isset($_GET['qid'])){ $title = T_("Set questionnaire outcomes"); $qid = intval($_GET['qid']); }
else die();
xhtml_head($title,true,$css,$js_head);
@@ -212,7 +208,6 @@ if (isset($rs) && !empty($rs)){
}
}
-
?>