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

fixes for "client-panel" merged branch

Browse Source
This commit is contained in:
Alex
2015-11-23 15:49:24 +02:00
parent 5ac2db38f2 3e2b806b6a
commit 40bcebf49d
3 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
admin/clientquestionnaire.php
View File

@@ -140,18 +140,18 @@ if (isset($_POST['submit']))
} }
/* delete client from quexs and lime tables*/ //requires data-toggle-confirmation to finalize /* delete client from quexs and lime tables*/ //requires data-toggle-confirmation to finalize
if (isset($_POST['delete']) && isset($_POST['uid'])) if (isset($_GET['delete']) && isset($_GET['uid']) && isset($_GET['uname']))
{ {
$client_id = intval($_POST['delete']); $client_id = intval($_GET['delete']);
$uid = intval($_POST['uid']); $uid = intval($_GET['uid']);
$uname = $_POST['uname']; $uname = $_GET['uname'];
global $db; global $db;
$db->StartTrans();
if ($uid !=1){ //double protect superadmin from being deleted if ($uid !=1){ //double protect superadmin from being deleted
$db->StartTrans();
$sql = "DELETE FROM " . LIME_PREFIX . "templates_rights WHERE `uid` = '$uid' AND `uid` != 1"; $sql = "DELETE FROM " . LIME_PREFIX . "templates_rights WHERE `uid` = '$uid' AND `uid` != 1";
$db->Execute($sql); $db->Execute($sql);
@@ -164,20 +164,19 @@ if (isset($_POST['delete']) && isset($_POST['uid']))
$sql = "DELETE FROM " . LIME_PREFIX . "users WHERE `uid` = '$uid' AND `uid` != 1"; $sql = "DELETE FROM " . LIME_PREFIX . "users WHERE `uid` = '$uid' AND `uid` != 1";
$db->Execute($sql); $db->Execute($sql);
$sql = "DELETE FROM `client_questionnaire` WHERE `client_id` = '$client_id' ";
$db->Execute($sql);
$sql = "DELETE FROM `client` WHERE `client_id` = '$client_id'";
$db->Execute($sql);
$db->CompleteTrans();
} }
$sql = "DELETE FROM `client_questionnaire` WHERE `client_id` = '$client_id' ";
$db->Execute($sql);
$sql = "DELETE FROM `client` WHERE `client_id` = '$client_id'";
$db->Execute($sql);
$db->CompleteTrans();
if ($db->CompleteTrans()) $msg = "<p class='alert alert-info'>". T_("Client with username $uname deleted") . "</p>"; if ($db->CompleteTrans()) $msg = "<p class='alert alert-info'>". T_("Client with username $uname deleted") . "</p>";
else $msg = "<p class='alert alert-warning'>". T_("ERROR deleting client with username $uname") . "</p>"; else $msg = "<p class='alert alert-warning'>". T_("ERROR deleting client with username $uname") . "</p>";
unset($_POST['delete'], $_POST['uid'], $_POST['uname'], $client_id, $username, $uid); unset($_GET['delete'], $_GET['uid'], $_GET['uname'], $client_id, $username, $uid);
} }

3
admin/clients.php
View File

@@ -124,6 +124,9 @@ if (isset($_POST['client']) && !empty($_POST['client']))
} }
} }
else $a = T_("Username") . " " . $client . ". " . T_("is already in use"); else $a = T_("Username") . " " . $client . ". " . T_("is already in use");
$client =""; $firstname="";$lastname="";$email=""; $time_zone_name="";
unset($_POST['client'],$_POST['password'],$_POST['lastname'],$_POST['firstname'],$_POST['email'],$_POST['Time_zone_name']);
} }
$header = T_("Add a client"); $header = T_("Add a client");

20
client/index.php
View File

@@ -78,10 +78,9 @@ if ($client_id)
print "<p class='alert alert-info'>" . T_("There are no questionnaires assigned to you") . "</p>"; print "<p class='alert alert-info'>" . T_("There are no questionnaires assigned to you") . "</p>";
else else
{ {
print "<div class='col-lg-2'>";
foreach($qs as $q) foreach($qs as $q)
{ {
print "<div class='col-lg-2'>";
print "<div class=' '><h2>{$q['description']}</h2>"; print "<div class=' '><h2>{$q['description']}</h2>";
$questionnaire_id = $q['questionnaire_id']; $questionnaire_id = $q['questionnaire_id'];
@@ -116,22 +115,25 @@ if ($client_id)
if (!empty($rs)) if (!empty($rs))
{ {
translate_array($rs,array("des")); translate_array($rs,array("des"));
xhtml_table($rs,array("des","count"),array(T_("Outcome"),T_("Count")),"tclass",array("des" => "Complete")); xhtml_table($rs,array("des","count"),array(T_("Outcome"),T_("Count")),"tclass",array("des" => "Complete"),array("count"));
} }
else print "<p class='alert alert-info'>" . T_("No outcomes recorded for this questionnaire") . "</p>"; else print "<p class='alert alert-info'>" . T_("No outcomes recorded for this questionnaire") . "</p>";
print "</br><a href=\"?qsid=$qsid\" class=\"btn btn-default btn-block btn-lime\">" . T_("View summary results") . "</a></div>"; print "</br><a href=\"?qsid=$qsid\" class=\"btn btn-default btn-block btn-lime\">" . T_("View summary results") . "</a></div></div>";
} }
if (isset($_GET['qsid'])) $qsid = intval($_GET['qsid']); if (isset($_GET['qsid'])) {
$page = LIME_URL . "admin/admin.php?action=browse&amp;sid=$qsid"; $qsid = intval($_GET['qsid']);
?> $page = LIME_URL . "admin/admin.php?action=browse&amp;sid=$qsid"; }
</div> else $page ='';
<div class="col-lg-10" id=" " style="height:820px;"> if ($page){
?>
<div class="col-lg-10 pull-right" id=" " style="height:820px;">
<?php xhtml_object($page,' ',"full"); ?> <?php xhtml_object($page,' ',"full"); ?>
</div> </div>
<?php <?php
}
} }
} }