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

cosmetic and equalization with working branch

Browse Source
This commit is contained in:
Alex
2015-05-20 15:35:02 +03:00
parent 485b6ded38
commit b2a0602fd5
11 changed files with 59 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin/callhistory.php
View File

@@ -72,7 +72,7 @@ $operator_id = get_operator_id();
Modified Call history list to have more information more suitable way with filtering, soring, paging and submenu for Cse history with asterisk records.... Modified Call history list to have more information more suitable way with filtering, soring, paging and submenu for Cse history with asterisk records....
Need to be linked with cdr records from asterisk!! for monitoring (requires addtional field for call_attempt table to request and store asterisk UniqueID as a reference to CDR .wav file list at /var/spool/asterisk/monitor/ ) Need to be linked with cdr records from asterisk!! for monitoring (requires addtional field for call_attempt table to request and store asterisk UniqueID as a reference to CDR .wav file list at /var/spool/asterisk/monitor/ )
*/ */
if ($operator_id) if ($operator_id)
{ {
if (isset($_GET['questionnaire_id'])) $qid = $_GET['questionnaire_id']; if (isset($_GET['questionnaire_id'])) $qid = $_GET['questionnaire_id'];
@@ -85,9 +85,9 @@ if ($operator_id)
$sql .= " as case_id, q.description as qd , contact_phone.phone as cpi, sample_import.description as spl $sql .= " as case_id, q.description as qd , contact_phone.phone as cpi, sample_import.description as spl
FROM `call` as c FROM `call` as c
JOIN (operator as op, respondent as r) on (op.operator_id = '$operator_id' AND r.respondent_id = c.respondent_id)"; JOIN (operator as op, respondent as r) on (op.operator_id = '$operator_id' and r.respondent_id = c.respondent_id)";
if ($qid) $quest = "$qid AND q.questionnaire_id= $qid"; else $quest = "q.questionnaire_id"; if ($qid) $quest = "$qid and q.questionnaire_id= $qid"; else $quest = "q.questionnaire_id";
if ($sid) $samimpid = "$sid AND sample_import.sample_import_id=$sid"; else $samimpid = "sample_import.sample_import_id"; if ($sid) $samimpid = "$sid and sample_import.sample_import_id=$sid"; else $samimpid = "sample_import.sample_import_id";
$sql .= " $sql .= "
JOIN (`case` as ca, questionnaire as q) ON (ca.case_id = c.case_id AND ca.questionnaire_id = $quest) JOIN (`case` as ca, questionnaire as q) ON (ca.case_id = c.case_id AND ca.questionnaire_id = $quest)
@@ -102,7 +102,7 @@ if ($operator_id)
$sql .= " LIMIT 500"; $sql .= " LIMIT 500";
else $sql .= " LIMIT 5000"; else $sql .= " LIMIT 5000";
$rs = $db->Execute($sql); $rs = $db->Execute($sql);
if (empty($rs)) if (empty($rs))
{ {
print "<div class='alert alert-warning col-sm-6'><p>" . T_("No calls ever made") . "</p></div>"; print "<div class='alert alert-warning col-sm-6'><p>" . T_("No calls ever made") . "</p></div>";
@@ -134,7 +134,6 @@ if ($operator_id)
else else
{ {
xhtml_head(T_("Call History List"),true,$css,$js_head); xhtml_head(T_("Call History List"),true,$css,$js_head);
echo "<div class='form-group col-sm-2'><a href='' onclick='history.back();return false;' class='btn btn-default'><i class='fa fa-chevron-left fa-lg text-primary'></i>&emsp;" . T_("Go back") . "</a></div>"; echo "<div class='form-group col-sm-2'><a href='' onclick='history.back();return false;' class='btn btn-default'><i class='fa fa-chevron-left fa-lg text-primary'></i>&emsp;" . T_("Go back") . "</a></div>";
$rs = $rs->GetArray(); $rs = $rs->GetArray();

4
admin/casestatus.php
View File

@@ -106,7 +106,7 @@ function case_status_report($questionnaire_id = false, $sample_id = false, $outc
LEFT JOIN case_queue as cq ON (cq.case_id = c.case_id) LEFT JOIN case_queue as cq ON (cq.case_id = c.case_id)
LEFT JOIN operator as oq ON (cq.operator_id = oq.operator_id) LEFT JOIN operator as oq ON (cq.operator_id = oq.operator_id)
WHERE c.current_operator_id IS NULL $q $o WHERE c.current_operator_id IS NULL $q $o
ORDER BY availableinmin ASC"; ORDER BY c.case_id ASC";
// print $sql; // print $sql;
@@ -116,7 +116,7 @@ function case_status_report($questionnaire_id = false, $sample_id = false, $outc
$headers = array(T_("Case id"),T_("Sample"),T_("Timezone"),T_("Time NOW"),T_("Call attempts"),T_("Calls"),T_("Outcome"),T_("Available in"),T_("Assigned to"),T_("Order"),"<i class='fa fa-check-square-o fa-lg'></i>"); $headers = array(T_("Case id"),T_("Sample"),T_("Timezone"),T_("Time NOW"),T_("Call attempts"),T_("Calls"),T_("Outcome"),T_("Available in"),T_("Assigned to"),T_("Order"),"<i class='fa fa-check-square-o fa-lg'></i>");
if (isset($_GET['sample_import_id'])){ unset($datacol[1]); unset($headers[1]); } if (isset($_GET['sample_import_id'])){ unset($datacol[1]); unset($headers[1]); }
xhtml_table($db->GetAll($sql),$datacol,$headers,"tclass",false,false,"bs-table"); xhtml_table($db->GetAll($sql),$datacol,$headers,"tclass",false,false,"bs-table");
$sql = "SELECT operator_id as value,CONCAT(firstName,' ', lastName) as description, '' selected $sql = "SELECT operator_id as value,CONCAT(firstName,' ', lastName) as description, '' selected

23
admin/dataoutput.php
View File

@@ -1,5 +1,4 @@
<?php <?php /**
/**
* Output data as a fixed width ASCII file * Output data as a fixed width ASCII file
* *
* *
@@ -196,7 +195,7 @@ xhtml_head(T_("Data output"),true,array("../include/bootstrap-3.3.2/css/bootstra
print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a questionnaire") . ":&emsp;</h3>"; print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a questionnaire") . ":&emsp;</h3>";
$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']);
display_questionnaire_chooser($questionnaire_id,false,"form-inline pull-left", "form-control"); display_questionnaire_chooser($questionnaire_id,false,"form-inline col-sm-3 pull-left", "form-control");
if ($questionnaire_id) if ($questionnaire_id)
{ {
@@ -207,17 +206,16 @@ if ($questionnaire_id)
$ls = $db->GetRow($sql); $ls = $db->GetRow($sql);
$lsid = $ls['lime_sid']; $lsid = $ls['lime_sid'];
print "&emsp;&emsp;<a href='" . LIME_URL . "admin/admin.php?action=exportresults&amp;sid=$lsid' class='btn btn-default fa btn-lime'>". T_("Download data for this questionnaire via Limesurvey") . "</a></div>"; print "&emsp;<a href='" . LIME_URL . "admin/admin.php?action=exportresults&amp;sid=$lsid' class='btn btn-default fa btn-lime'>". T_("Download data for this questionnaire via Limesurvey") . "</a></div>";
print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a sample") . ":&emsp;</h3>"; print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Please select a sample") . ":&emsp;</h3>";
$sample_import_id = false; $sample_import_id = false;
if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']); if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']);
display_sample_chooser($questionnaire_id,$sample_import_id,false,"form-inline pull-left", "form-control"); display_sample_chooser($questionnaire_id,$sample_import_id,false,"form-inline col-sm-3 pull-left", "form-control");
if ($sample_import_id) if ($sample_import_id)
{ {
print "&emsp;&emsp;<a href='" .LIME_URL . "admin/admin.php?action=exportresults&amp;sid=$lsid&amp;quexsfilterinc=$questionnaire_id:$sample_import_id' class='btn btn-default fa btn-lime'>" . T_("Download data for this sample via Limesurvey") . "</a></div>"; print "&emsp;<a href='" .LIME_URL . "admin/admin.php?action=exportresults&amp;sid=$lsid&amp;quexsfilterinc=$questionnaire_id:$sample_import_id' class='btn btn-default fa btn-lime'>" . T_("Download data for this sample via Limesurvey") . "</a></div>";
//get sample vars //get sample vars
$sql = "SELECT sivr.var_id as value, sivr.var as description $sql = "SELECT sivr.var_id as value, sivr.var as description
FROM `sample_import_var_restrict` as sivr FROM `sample_import_var_restrict` as sivr
@@ -225,18 +223,17 @@ if ($questionnaire_id)
$rs = $db->GetAll($sql); $rs = $db->GetAll($sql);
//download a key file linking the caseid to the sample //download a key file linking the caseid to the sample
print "<div class='form-group clearfix'><h3 class='col-sm-4 text-right'>" . T_("Download key file: select sample var") . ":&emsp;</h3>"; print "<div class='form-group '><h3 class='col-sm-4 text-right'>" . T_("Download key file: select sample var") . ":&emsp;</h3>";
display_chooser($rs,"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id",true,true,false,true,"form-inline pull-left"); display_chooser($rs,"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id",true,true,false,true,"form-inline col-sm-3 pull-left");
// print "</div><div class='form-group col-sm-offset-4'>"; print "</div><div class=' col-sm-4'>";
//download complete key file //download complete key file
print "&emsp;&emsp;<a href='?key=key&amp;questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id' class='btn btn-default fa'>" . T_("Download complete key file") . "</a>"; print "<a href='?key=key&amp;questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id' class='btn btn-default fa'>" . T_("Download complete key file") . "</a></br></br>";
//download complete sample file with outcomes //download complete sample file with outcomes
print "&emsp;&emsp;<a href='?sample=sample&amp;questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id' class='btn btn-default fa'>" . T_("Download complete sample file with current outcomes") . "</a></div>"; print "<a href='?sample=sample&amp;questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id' class='btn btn-default fa'>" . T_("Download complete sample file with current outcomes") . "</a></div>";
} }
} }

7
admin/displayappointments.php
View File

@@ -132,8 +132,6 @@ if ( (isset($_GET['appointment_id']) && isset($_GET['case_id'])) ||(($_GET['new'
print "<script type='text/javascript'> print "<script type='text/javascript'>
$(document).ready(function() { var startDateTextBox = $('#start'); var endDateTextBox = $('#end'); $(document).ready(function() { var startDateTextBox = $('#start'); var endDateTextBox = $('#end');
/* var std = '$startdate'.split(/[- :]/);
var etd = '$enddate'.split(/[- :]/); */
$.timepicker.datetimeRange( $.timepicker.datetimeRange(
startDateTextBox,endDateTextBox,{ startDateTextBox,endDateTextBox,{
minInterval: (1000*60*15), // 15min minInterval: (1000*60*15), // 15min
@@ -233,11 +231,10 @@ if ( (isset($_GET['appointment_id']) && isset($_GET['case_id'])) ||(($_GET['new'
else { else {
$operator_id = get_operator_id(); $operator_id = get_operator_id();
$subtitle = T_("Appointments"); $subtitle = T_("Appointments");
xhtml_head(T_("Display Appointments"),true,$css,$js_head, false,30); //array("../css/table.css") xhtml_head(T_("Display Appointments"),true,$css,$js_head,false,30); //array("../css/table.css")
print "<h3>" . T_("All appointments (with times displayed in your time zone)") . "</h3>"; print "<h3>" . T_("All appointments (with times displayed in your time zone)") . "</h3>";
$sql = "SELECT q.description, CONVERT_TZ(a.start,'UTC',@@session.time_zone) as start, CONVERT_TZ(a.end,'UTC',@@session.time_zone) as end, CONCAT(r.firstName, ' ', r.lastName) as resp, IFNULL(ou.description,'" . TQ_("Not yet called") . "') as outcome, oo.firstName as makerName, ooo.firstName as callerName, $sql = "SELECT q.description, CONVERT_TZ(a.start,'UTC',@@session.time_zone) as start, CONVERT_TZ(a.end,'UTC',@@session.time_zone) as end,CONCAT(r.firstName, ' ', r.lastName) as resp, IFNULL(ou.description,'" . TQ_("Not yet called") . "') as outcome, oo.firstName as makerName, ooo.firstName as callerName,
CONCAT('<a href=\'supervisor.php?case_id=', c.case_id, '\'>', c.case_id, '</a>') as case_id, CONCAT('<a href=\'supervisor.php?case_id=', c.case_id, '\'>', c.case_id, '</a>') as case_id,
CONCAT('&emsp;<a href=\'\'><i class=\'fa fa-trash-o fa-lg text-danger\' toggle=\'confirmation\' data-placement=\'left\' data-href=\'?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '&amp;delete=delete\' ></i></a>&emsp;') as link, CONCAT('&emsp;<a href=\'\'><i class=\'fa fa-trash-o fa-lg text-danger\' toggle=\'confirmation\' data-placement=\'left\' data-href=\'?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '&amp;delete=delete\' ></i></a>&emsp;') as link,
CONCAT('&emsp;<a href=\'?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '\'><i class=\'fa fa-pencil-square-o fa-lg\' ></i></a>&emsp;') as edit,IFNULL(ao.firstName,'" . TQ_("Any operator") . "') as witho CONCAT('&emsp;<a href=\'?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '\'><i class=\'fa fa-pencil-square-o fa-lg\' ></i></a>&emsp;') as edit,IFNULL(ao.firstName,'" . TQ_("Any operator") . "') as witho

6
admin/operatorlist.php
View File

@@ -345,7 +345,7 @@ if (isset($_GET['operator_id']))
if ($display) if ($display)
{ {
$sql = "SELECT $sql = "SELECT operator_id,
CONCAT(firstName, ' ', lastName) as name, CONCAT(firstName, ' ', lastName) as name,
CONCAT ('<a href=\'extensionstatus.php?edit=',e.extension_id,'\'>', e.extension ,'</a>') as `extension`, CONCAT ('<a href=\'extensionstatus.php?edit=',e.extension_id,'\'>', e.extension ,'</a>') as `extension`,
CONCAT('<a href=\'?winbat=winbat&amp;operator_id=',operator_id,'\'>" . TQ_("Win .bat file") . "</a>') as winbat, CONCAT('<a href=\'?winbat=winbat&amp;operator_id=',operator_id,'\'>" . TQ_("Win .bat file") . "</a>') as winbat,
@@ -368,8 +368,8 @@ if ($display)
xhtml_head(T_("Operator list"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../include/font-awesome-4.3.0/css/font-awesome.css","../css/custom.css")); xhtml_head(T_("Operator list"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../include/font-awesome-4.3.0/css/font-awesome.css","../css/custom.css"));
$columns = array("name","username","extension","enabledisable","edit"); $columns = array("operator_id","name","username","extension","enabledisable","edit");
$titles = array(T_("Operator"),T_("Username"),T_("Extension"),"&emsp;<i class='fa fa-lg fa-power-off '></i>","&emsp;<i class='fa fa-lg fa-pencil-square-o'></i>"); $titles = array("ID",T_("Operator"),T_("Username"),T_("Extension"),"&emsp;<i class='fa fa-lg fa-power-off '></i>","&emsp;<i class='fa fa-lg fa-pencil-square-o'></i>");
if (VOIP_ENABLED) if (VOIP_ENABLED)
{ {

22
admin/samplelist.php
View File

@@ -121,16 +121,16 @@ if (isset($_POST['ed']))
else if ($val == 8) $eml++; else if ($val == 8) $eml++;
} }
/* if($prph == 1) {$ch1 = true;} /* if($prph == 1) {$ch1 = true;}
else { echo "<div class='alert alert-warning'>", T_("Please check that One and One Only Primary Phone number is selected"), "</div>";}
if (( ($pcd +$st) <= 2 )&&($pcd == 1 || $st == 1)) {$ch2 = true;}
else { echo "<div class='alert alert-warning'>", T_("Please check selected types for Postcode and/or State"), "</div>";}
// ! need to add DB tables check for existing timezone data in tables and additional check if prefix_timezone selected
if (( ($fn + $ln) <= 2 )&&($fn == 1 || $ln == 1)) {$ch3 = true;}
else { echo "<div class='alert alert-warning'>", T_("Please check selected types for Firstname and/or Lastname"), "</div>";}
if ($eml < 2) {$ch4 = true;}
else { echo "<div class='alert alert-warning'>", T_("Too many e-mail fields. Please check selected types for E-mail."), "</div>"; }
if ($ch1 && $ch2 && $ch3 && $ch4) */$typecheck = true; //echo $ch1,$ch2,$ch3,$ch4, "typecheck=",$typecheck, "</br>" ; if ($ch1 && $ch2 && $ch3 && $ch4) */$typecheck = true; //echo $ch1,$ch2,$ch3,$ch4, "typecheck=",$typecheck, "</br>" ;
if ($typecheck){ if ($typecheck){
@@ -496,7 +496,7 @@ echo "<div class='form-group'>
<a href='import.php' class='btn btn-default col-sm-offset-4' ><i class='fa fa-upload fa-lg'></i>&emsp;" . T_("Import a sample file") . "</a> <a href='import.php' class='btn btn-default col-sm-offset-4' ><i class='fa fa-upload fa-lg'></i>&emsp;" . T_("Import a sample file") . "</a>
</div>"; </div>";
$columns = array("id","description","cnt","status","enabledisable","calls","did","ssearch","delsample"); //"vp","rname", $columns = array("id","description","cnt","status","enabledisable","calls","did","ssearch","delsample"); //"vp","rname",
//$titles = array(T_("ID"),T_("Sample"), T_("Call History"),T_("Enable/Disable"), T_("Status"), T_("Deidentify"), T_("View"), T_("Rename"), T_("Search")); //$titles = array(T_("ID"),T_("Sample"),T_("Records"), T_("Call History"),T_("Enable/Disable"), T_("Status"), T_("Deidentify"), T_("View"), T_("Rename"), T_("Search"), T_("Delete sample"));
xhtml_table($rs,$columns, false, "table-hover table-condensed "); xhtml_table($rs,$columns, false, "table-hover table-condensed ");
xhtml_foot($js_foot); xhtml_foot($js_foot);

8
admin/shifttemplate.php
View File

@@ -83,8 +83,8 @@ if (isset($_POST['day']))
$start = $db->qstr($_POST['start'][$key],get_magic_quotes_gpc()); $start = $db->qstr($_POST['start'][$key],get_magic_quotes_gpc());
$end = $db->qstr($_POST['end'][$key],get_magic_quotes_gpc()); $end = $db->qstr($_POST['end'][$key],get_magic_quotes_gpc());
$sql = "INSERT INTO shift_template (day_of_week,start,end) $sql = "INSERT INTO shift_template(day_of_week,start,end)
VALUES ('$val',$start,$end)"; VALUES ($val,$start,$end)";
$db->Execute($sql); $db->Execute($sql);
} }
} }
@@ -112,13 +112,13 @@ print "<div class='well'><t>" . T_("Enter standard shift start and end times for
* Begin displaying currently loaded shifts * Begin displaying currently loaded shifts
*/ */
$sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT('$year',' ','$woy',' ',day_of_week -1),'%x %v %w' ), '%W' ) AS dt,day_of_week,start,end $sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT('$year',' ','$woy',' ',day_of_week -1),'%x %v %w'), '%W') AS dt,day_of_week,start,end
FROM shift_template"; FROM shift_template";
$shifts = $db->GetAll($sql); $shifts = $db->GetAll($sql);
translate_array($shifts,array("dt")); translate_array($shifts,array("dt"));
$sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year,' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W') as description, day_of_week as value, '' as selected $sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT('$year',' ','$woy',' ',day_of_week - 1),'%x %v %w'), '%W') as description, day_of_week as value, '' as selected
FROM day_of_week"; FROM day_of_week";
$daysofweek = $db->GetAll($sql); $daysofweek = $db->GetAll($sql);

23
admin/supervisor.php
View File

@@ -305,7 +305,7 @@ if ($case_id != false)
print "<div class='panel-body'><h4 class=''><i class='fa fa-book'></i>&emsp;" . T_("Sample details")."</h4>"; print "<div class='panel-body'><h4 class=''><i class='fa fa-book'></i>&emsp;" . T_("Sample details")."</h4>";
$sql = "SELECT sv.sample_id, c.case_id , s.Time_zone_name, $sql = "SELECT sv.sample_id, c.case_id , s.Time_zone_name,
TIME_FORMAT(CONVERT_TZ(NOW(),@@session.time_zone,s.Time_zone_name),'". TIME_FORMAT ."') as time TIME_FORMAT(CONVERT_TZ(NOW(),@@session.time_zone,s.Time_zone_name),'". TIME_FORMAT ."') as time
FROM sample_var AS sv FROM sample_var AS sv
LEFT JOIN (`case` AS c , sample as s) ON ( c.sample_id = sv.sample_id AND s.sample_id = c.sample_id ) WHERE c.case_id = '$case_id' LEFT JOIN (`case` AS c , sample as s) ON ( c.sample_id = sv.sample_id AND s.sample_id = c.sample_id ) WHERE c.case_id = '$case_id'
GROUP BY sv.sample_id"; GROUP BY sv.sample_id";
@@ -355,8 +355,8 @@ if ($case_id != false)
CONCAT (oo.firstName,' ', oo.lastName) as makerName, CONCAT (oo.firstName,' ', oo.lastName) as makerName,
CONCAT (ooo.firstName,' ', ooo.lastName) as callerName, CONCAT (ooo.firstName,' ', ooo.lastName) as callerName,
CONCAT('<a href=\'supervisor.php?case_id=', c.case_id, '\'>', c.case_id, '</a>') as case_id, CONCAT('<a href=\'supervisor.php?case_id=', c.case_id, '\'>', c.case_id, '</a>') as case_id,
CONCAT('&emsp;<a href=\'\' data-toggle=\'confirmation\' data-placement=\'left\' data-href=\'displayappointments.php?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '&amp;delete=delete\'><i class=\'fa fa-trash fa-lg text-danger\' data-toggle=\'tooltip\' title=\'" . TQ_("Delete") . "\'></i></a>&emsp;') as link, CONCAT('&emsp;<a href=\'\' data-toggle=\'confirmation\' data-placement=\'left\' data-href=\'displayappointments.php?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id,'&amp;delete=delete\'><i class=\'fa fa-trash fa-lg text-danger\' data-toggle=\'tooltip\' title=\'" . TQ_("Delete") . "\'></i></a>&emsp;') as link,
CONCAT('&emsp;<a href=\'displayappointments.php?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '\' data-toggle=\'tooltip\' title=\'" . TQ_("Edit") . "\' ><i class=\'fa fa-edit fa-lg\'></i></a>&emsp;') as edit CONCAT('&emsp;<a href=\'displayappointments.php?case_id=', c.case_id, '&amp;appointment_id=', a.appointment_id, '\' data-toggle=\'tooltip\' title=\'" . TQ_("Edit") . "\'><i class=\'fa fa-edit fa-lg\'></i></a>&emsp;') as edit
FROM appointment as a FROM appointment as a
JOIN (`case` as c, respondent as r, questionnaire as q, operator as oo, call_attempt as cc) on (a.case_id = c.case_id and a.respondent_id = r.respondent_id and q.questionnaire_id = c.questionnaire_id and a.call_attempt_id = cc.call_attempt_id and cc.operator_id = oo.operator_id) JOIN (`case` as c, respondent as r, questionnaire as q, operator as oo, call_attempt as cc) on (a.case_id = c.case_id and a.respondent_id = r.respondent_id and q.questionnaire_id = c.questionnaire_id and a.call_attempt_id = cc.call_attempt_id and cc.operator_id = oo.operator_id)
LEFT JOIN (`call` as ca, outcome as ou, operator as ooo) ON (ca.call_id = a.completed_call_id and ou.outcome_id = ca.outcome_id and ca.operator_id = ooo.operator_id) LEFT JOIN (`call` as ca, outcome as ou, operator as ooo) ON (ca.call_id = a.completed_call_id and ou.outcome_id = ca.outcome_id and ca.operator_id = ooo.operator_id)
@@ -378,7 +378,7 @@ if ($case_id != false)
if ($r[0]['sample_id']){ if ($r[0]['sample_id']){
$rtz= $r[0]['Time_zone_name']; $rtz= $r[0]['Time_zone_name'];
print "&emsp;<a href='displayappointments.php?case_id=$case_id&rtz=$rtz&new=new' class='btn btn-default'><i class='fa fa-clock-o fa-lg'></i>&emsp;" . T_("Create appointment") . "</a>"; } print "&emsp;<a href='displayappointments.php?case_id=$case_id&rtz=$rtz&new=new' class='btn btn-default'><i class='fa fa-clock-o fa-lg'></i>&emsp;" . T_("Create appointment") . "</a>"; }
// *
print "</div>"; print "</div>";
@@ -411,7 +411,7 @@ if ($case_id != false)
print "<div class='panel-body col-sm-6'><h4 class=''><i class='fa fa-file-text'></i>&emsp;" . T_("Case notes")."</h4>"; print "<div class='panel-body col-sm-6'><h4 class=''><i class='fa fa-file-text'></i>&emsp;" . T_("Case notes")."</h4>";
if (empty($rs)) if (empty($rs))
print "<p class='alert text-info '>" . T_("No notes") . "</p>"; print "<p class='alert text-info'>" . T_("No notes") . "</p>";
else { else {
xhtml_table($rs,array("time","firstName","note","link"),array(T_("Date/Time"),T_("Operator"),T_("Note"),"&emsp;<i class='fa fa-trash fa-lg'></i>&emsp;")); xhtml_table($rs,array("time","firstName","note","link"),array(T_("Date/Time"),T_("Operator"),T_("Note"),"&emsp;<i class='fa fa-trash fa-lg'></i>&emsp;"));
print "<br/>"; print "<br/>";
@@ -420,7 +420,7 @@ if ($case_id != false)
?> ?>
<form method="get" action="?" class="form-inline" > <form method="get" action="?" class="form-inline" >
<input type="hidden" name="case_id" value="<?php echo $case_id;?>"/> <input type="hidden" name="case_id" value="<?php echo $case_id;?>"/>
<input type="text" class="textclass form-control" name="note" id="note" style="width: 80%;"/>&ensp; <input type="text" class="textclass form-control" name="note" id="note" style="width: 70%;"/>&ensp;
<button class="submitclass btn btn-default" type="submit" name="submit"><i class="fa fa-file-text"></i>&emsp;<?php echo T_("Add note"); ?></button> <button class="submitclass btn btn-default" type="submit" name="submit"><i class="fa fa-file-text"></i>&emsp;<?php echo T_("Add note"); ?></button>
</form> </form>
<?php <?php
@@ -483,11 +483,9 @@ if ($case_id != false)
print "<div class='alert text-danger' role='alert'>" . T_("Case not yet started in Limesurvey") . "</div>"; print "<div class='alert text-danger' role='alert'>" . T_("Case not yet started in Limesurvey") . "</div>";
print "</div></div>"; print "</div></div>";
if ($r[0]['sample_id']){ // if sample data exists view availability if ($r[0]['sample_id']){ // if sample data exists view availability
print "<div class='panel-body col-sm-6'><h4 class=''><i class='fa fa-calendar'></i>&emsp;" . T_("Availability groups") . "</h4>"; print "<div class='panel-body col-sm-6'><h4 class=''><i class='fa fa-calendar'></i>&emsp;" . T_("Availability groups") . "</h4>";
if (is_using_availability($case_id)) if (is_using_availability($case_id))
{ {
//List all availability group items and whether selected or not (all selected by default unless >= 1 availability group is in use for this case //List all availability group items and whether selected or not (all selected by default unless >= 1 availability group is in use for this case
@@ -502,7 +500,7 @@ if ($case_id != false)
//Display all availability groups as checkboxes //Display all availability groups as checkboxes
print "<form action='?' method='get' class='form-horizontal '>"; print "<form action='?' method='get' class='form-horizontal '>";
print "<h5 class=''>" . T_("Select groups to limit availability (Selecting none means always available)") . "</h5><div class='col-sm-8'>"; print "<h5 class=''>" . T_("Select groups to limit availability (Selecting none means always available)") . "</h5><div class='col-sm-6'>";
foreach ($rs as $r) foreach ($rs as $r)
{ {
$checked = ""; $checked = "";
@@ -549,7 +547,7 @@ if ($case_id != false)
?> ?>
<form method="get" action="?"> <form method="get" action="?">
<input type="hidden" name="case_id" value="<?php echo $case_id;?>"/> <input type="hidden" name="case_id" value="<?php echo $case_id;?>"/>
<button class=" btn btn-danger" name="deidentify" id="deidentify"><i class="fa fa-trash fa-lg"></i>&emsp;<?php echo T_("Deidentify");?></button> <button class=" btn btn-danger" name="deidentify" id="deidentify" data-toggle="confirmation" ><i class="fa fa-trash fa-lg"></i>&emsp;<?php echo T_("Deidentify");?></button>
</form></div> </form></div>
<?php } <?php }
} }
@@ -561,9 +559,8 @@ if ($case_id != false)
xhtml_foot($js_foot);// deidentify data-toggle="modal" type="submit"submitclass xhtml_foot($js_foot);// deidentify data-toggle="modal" type="submit"submitclass
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$('[data-toggle="confirmation"]').confirmation() $('[data-toggle="confirmation"]').confirmation();
$("#deidentify").click(function(){ $("#deidentify").click(function(){
$("#deidentify-confirm").modal('show');}); $("#deidentify-confirm").modal('show');});
</script> </script>

2
css/custom.css
View File

@@ -2,7 +2,7 @@
body { body {
/* /*
font-size: 1.5em; font-size: 1.5em;
line-height: 1.5em;*/ line-height: 1.3em;*/
/* color: #515a63; or #666 */ /* color: #515a63; or #666 */
/*padding-top: 0px;*/ /*padding-top: 0px;*/
background:#EEEFF2; background:#EEEFF2;

12
include/limesurvey/admin/styles/default/adminstyle.css
View File

@@ -1107,7 +1107,7 @@ textarea.updater-changelog {
#importquestion li label:first-child, #importquestion li label:first-child,
#bouncesettings li label:first-child, #bouncesettings li label:first-child,
#importquestion li label:first-child { #importquestion li label:first-child {
width: 44%; width: 50%;
text-align: right; text-align: right;
margin-right: 0.5em; margin-right: 0.5em;
float: left; float: left;
@@ -1331,7 +1331,7 @@ padding:10px;
} }
#statistics_general_filter { #statistics_general_filter {
width:650px; width:950px;
margin:0 auto; margin:0 auto;
} }
@@ -1341,15 +1341,15 @@ clear:both;
#statistics_general_filter #left { #statistics_general_filter #left {
width:270px; width:47%;
height:125px; height:131px;
float:left; float:left;
clear:left; clear:left;
} }
#statistics_general_filter #right { #statistics_general_filter #right {
width:330px; width:47%;
height:125px; /* height:125px; */
float:right; float:right;
clear:none; clear:none;
} }

10
status_interface2.php
View File

@@ -67,7 +67,7 @@ if (AUTO_LOGOUT_MINUTES !== false)
$js[] = "js/childnap.js"; $js[] = "js/childnap.js";
} }
xhtml_head(T_("Status"),true,array("css/status_interface2.css"),$js); xhtml_head(T_("Status"),false,array("css/status_interface2.css"),$js);
$ca = get_call_attempt($operator_id,false); $ca = get_call_attempt($operator_id,false);
if ($ca) if ($ca)
@@ -76,7 +76,7 @@ if ($ca)
$case_id = get_case_id($operator_id); $case_id = get_case_id($operator_id);
$fname = get_respondent_variable("firstName",$respondent_id); $fname = get_respondent_variable("firstName",$respondent_id);
$lname = get_respondent_variable("lastName",$respondent_id); $lname = get_respondent_variable("lastName",$respondent_id);
print "<p class='text'>" . T_("Name") . ": $fname $lname</p>"; print "<h4>" . T_("Name") . ": $fname $lname</h4>";
$appointment = is_on_appointment($ca); $appointment = is_on_appointment($ca);
@@ -173,7 +173,7 @@ if ($ca)
$apdate = $rs['time']; $apdate = $rs['time'];
print "<div class='tobecoded statusbox'>" . T_("Appointment") . ": " . $apdate . "</div><div style='clear: both;'/>"; print "<div class='tobecoded statusbox form-group'>" . T_("Appointment") . ": " . $apdate . "</div><div style='clear: both;'/>";
//if (missed_appointment($ca)) print "<div class='tobecoded statusbutton'>" . T_("MISSED") . "</div>"; //if (missed_appointment($ca)) print "<div class='tobecoded statusbutton'>" . T_("MISSED") . "</div>";
} }
@@ -212,13 +212,13 @@ if ($ca)
print "<div>"; print "<div>";
foreach($rs as $r) foreach($rs as $r)
{ {
print "<form method='post' action='?'><div class='text'>"; print "<form method='post' action='?'><div class='text form-group'>";
print "<input onclick='this.form.submit();' type='radio' name='contactphone' value='{$r['contact_phone_id']}' id='contactphone{$r['contact_phone_id']}' {$r['checked']}/>"; print "<input onclick='this.form.submit();' type='radio' name='contactphone' value='{$r['contact_phone_id']}' id='contactphone{$r['contact_phone_id']}' {$r['checked']}/>";
print "<label for='contactphone{$r['contact_phone_id']}'>{$r['phone']}"; print "<label for='contactphone{$r['contact_phone_id']}'>{$r['phone']}";
if ($r['checked']) print "&emsp;<a href='callto:{$r['phone']}'>" . T_('Dial') . "</a>"; if ($r['checked']) print "&emsp;<a href='callto:{$r['phone']}'>" . T_('Dial') . "</a>";
if (!empty($r['description'])) print " - " . $r['description']; if (!empty($r['description'])) print " - " . $r['description'];
print "</label>"; print "</label>";
print "</div></form></br>"; print "</div></form><br/><br/>";
} }
print "</div>"; print "</div>";
} }