Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

revert manings to already translated ones, unset "$_GET['sort']" both for up and down requests, code simplified

Browse Source
This commit is contained in:
Alex
2015-12-15 12:22:33 +03:00
parent 22b2c42701
commit a71f3cc91a
2 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
admin/assignsample.php
View File

@@ -242,72 +242,49 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['rsid']))
xhtml_foot($js_foot); xhtml_foot($js_foot);
die(); die();
} }
else if (isset($_GET['sort'])) else if (isset($_GET['sort']) && ($_GET['sort'] == "up" || $_GET['sort'] == "down"))
{ {
$cso = $db->GetOne(" SELECT sort_order $cso = $db->GetOne(" SELECT sort_order
FROM questionnaire_sample FROM questionnaire_sample
WHERE questionnaire_id = $questionnaire_id WHERE questionnaire_id = $questionnaire_id
AND sample_import_id = $sid"); AND sample_import_id = $sid");
if ($_GET['sort'] == "up") if ($_GET['sort'] == "up")
{ { //find previous in sort order
//find previous in sort order and do a swap $dir = "<";
$sql = "SELECT sample_import_id,sort_order }
else if ($_GET['sort'] == "down")
{ //find next in sort order
$dir = ">";
}
$sql = "SELECT sample_import_id,sort_order
FROM questionnaire_sample FROM questionnaire_sample
WHERE questionnaire_id = $questionnaire_id WHERE questionnaire_id = $questionnaire_id
AND sort_order < $cso AND sort_order $dir $cso
ORDER BY sort_order DESC LIMIT 1"; ORDER BY sort_order DESC LIMIT 1";
$rs = $db->GetRow($sql); $rs = $db->GetRow($sql);
//do a swap
$ssid = $rs['sample_import_id'];
$sso = $rs['sort_order'];
$ssid = $rs['sample_import_id']; $sql = "UPDATE questionnaire_sample
$sso = $rs['sort_order'];
$sql = "UPDATE questionnaire_sample
SET sort_order = $sso SET sort_order = $sso
WHERE sample_import_id = $sid WHERE sample_import_id = $sid
AND questionnaire_id = $questionnaire_id"; AND questionnaire_id = $questionnaire_id";
$db->Execute($sql); $db->Execute($sql);
$sql = "UPDATE questionnaire_sample $sql = "UPDATE questionnaire_sample
SET sort_order = $cso SET sort_order = $cso
WHERE sample_import_id = $ssid WHERE sample_import_id = $ssid
AND questionnaire_id = $questionnaire_id"; AND questionnaire_id = $questionnaire_id";
$db->Execute($sql); $db->Execute($sql);
}
else
{
//find next in sort order and do a swap
$sql = "SELECT sample_import_id,sort_order
FROM questionnaire_sample
WHERE questionnaire_id = $questionnaire_id
AND sort_order > $cso
ORDER BY sort_order ASC LIMIT 1";
$rs = $db->GetRow($sql);
$ssid = $rs['sample_import_id'];
$sso = $rs['sort_order'];
$sql = "UPDATE questionnaire_sample
SET sort_order = $sso
WHERE sample_import_id = $sid
AND questionnaire_id = $questionnaire_id";
$db->Execute($sql);
$sql = "UPDATE questionnaire_sample
SET sort_order = $cso
WHERE sample_import_id = $ssid
AND questionnaire_id = $questionnaire_id";
$db->Execute($sql);
unset($_GET['sort']); unset($_GET['sort']);
}
} }
else else
{ {
@@ -324,8 +301,8 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['rsid']))
} }
$subtitle = T_("Assign questionnaire samples"); $subtitle = T_("List & Add Sample");
xhtml_head(T_("Assign questionnaire samples"),true,$css,$js_head,false,false,false,$subtitle);//array("../css/table.css"),array("../js/window.js") xhtml_head(T_("Assign samples to questionnaires"),true,$css,$js_head,false,false,false,$subtitle);//array("../css/table.css"),array("../js/window.js")
print "<a href='' onclick='history.back();return false;' class='btn btn-default pull-left'><i class='fa fa-chevron-left fa-lg text-primary'></i>&emsp;" . T_("Go back") . "</a>"; print "<a href='' onclick='history.back();return false;' class='btn btn-default pull-left'><i class='fa fa-chevron-left fa-lg text-primary'></i>&emsp;" . T_("Go back") . "</a>";
@@ -333,7 +310,7 @@ print "<a href='' onclick='history.back();return false;' class='btn btn-default
$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']);
print "<div class='form-group clearfix'><h2 class='col-lg-6 text-right'><i class='fa fa-link text-primary'></i>&emsp;" . T_("Assign samples to questionnaire: ") . "</h2>"; print "<div class='form-group clearfix'><h2 class='col-lg-4 text-right'><i class='fa fa-link text-primary'></i>&emsp;" . T_("Select a questionnaire") . "</h2>";
display_questionnaire_chooser($questionnaire_id,false, "pull-left btn", "form-control "); display_questionnaire_chooser($questionnaire_id,false, "pull-left btn", "form-control ");
print "</div>"; print "</div>";

2
admin/index.php
View File

@@ -132,7 +132,7 @@ include ("../functions/functions.operator.php");
<li><a href="?g=2&amp;page=import.php"><i class="fa fa-upload fa-fw"></i><?php print T_("Import a sample file") ;?></a></li> <li><a href="?g=2&amp;page=import.php"><i class="fa fa-upload fa-fw"></i><?php print T_("Import a sample file") ;?></a></li>
<li><a href="?g=2&amp;page=samplelist.php"><i class="fa fa-list fa-fw"></i><?php print T_("Sample management") ;?></a></li> <li><a href="?g=2&amp;page=samplelist.php"><i class="fa fa-list fa-fw"></i><?php print T_("Sample management") ;?></a></li>
<li><a href="?g=2&amp;page=samplesearch.php"><i class="fa fa-search fa-fw"></i><?php print T_("Search the sample") ;?></a></li> <li><a href="?g=2&amp;page=samplesearch.php"><i class="fa fa-search fa-fw"></i><?php print T_("Search the sample") ;?></a></li>
<li><a href="?g=2&amp;page=assignsample.php"><i class="fa fa-link fa-fw"></i><?php print T_("Assign questionnaire samples") ;?></a></li> <li><a href="?g=2&amp;page=assignsample.php"><i class="fa fa-link fa-fw"></i><?php print T_("Assign samples to questionnaires") ;?></a></li>
<li><a href="?g=2&amp;page=sortsample.php"><i class='fa fa-sort-numeric-asc fa-fw'></i><?php print T_("Sort questionnaire samples") ;?></a></li> <li><a href="?g=2&amp;page=sortsample.php"><i class='fa fa-sort-numeric-asc fa-fw'></i><?php print T_("Sort questionnaire samples") ;?></a></li>
</ul> </ul>
</li> </li>