2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

reverted "Go back" href, added button to switch to quota report page (#1472568)

icons + buttons  in  quotareport.php
fix minor differences between working installation and tree in shifttemplate.php
This commit is contained in:
Alex
2015-07-09 18:24:10 +03:00
parent eaace40a18
commit acd5bedffd
3 changed files with 10 additions and 8 deletions

View File

@@ -204,16 +204,16 @@ if ($questionnaire_id)
if ($completions < $v['completions']) //if completions less than the quota, allow for closing/opening
{
if ($v['quota_reached'] == 1)
$status = "<a href='?questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id&amp;rowquota=$qsqr&amp;open=open'>" . T_("closed") . "</a>";
$status = "<span class='label label-default fa-lg'>" . T_("closed") . "</span><a class='btn' data-toggle='tooltip' title='" . T_("open") . "' href='?questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id&amp;rowquota=$qsqr&amp;open=open'><i class='fa fa-lock fa-2x' style='color:red;'></i></a>";
else
$status = "<a href='?questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id&amp;rowquota=$qsqr&amp;close=close'>" . T_("open") . "</a>";
$status = "<span class='label label-primary fa-lg'>" . T_("open") . "&emsp;</span><a class='btn' data-toggle='tooltip' title='" . T_("close") . "' href='?questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id&amp;rowquota=$qsqr&amp;close=close'><i class='fa fa-unlock fa-2x'></i></a>";
}
else
{
if ($v['quota_reached'] == 1)
$status = T_("closed");
$status = "<span class='label label-default fa-lg'>" . T_("closed") . "</span>";
else
$status = T_("open");
$status = "<span class='label label-primary fa-lg'>" . T_("open") . "&emsp;</span>";
}
$report[] = array("strata" => "<a href='quotarow.php?qsqri=$qsqr&amp;edit=edit&amp;questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id'>" . $v['description'] . "</a>", "status" => $status, "quota" => $v['completions'], "sample" => $drawn + $remain, "sampleused" => $drawn, "sampleremain" => $remain, "completions" => $completions, "perc" => $perc, "priority" => "<input type='number' maxlength='3' min='0' max='100' size='3' style='width:6em;' value='$priority' id='p$qsqr' name='p$qsqr' class='form-control'/>", "autoprioritise" => "&emsp;&emsp;<input type='checkbox' id='a$qsqr' name='a$qsqr' $checked />");
@@ -302,7 +302,7 @@ if ($questionnaire_id)
}
xhtml_foot();
xhtml_foot(array("../js/custom.js"));
?>
<script type="text/javascript">