From 5970e1eacef13337648f57a4a013382d4ac7fddf Mon Sep 17 00:00:00 2001 From: jcleeland Date: Fri, 20 Jul 2012 22:41:00 +1000 Subject: [PATCH 01/71] Fixed issue #6355 - Change graph type in statistics view not working --- application/controllers/admin/statistics.php | 9 +- .../helpers/admin/statistics_helper.php | 6 +- .../views/admin/export/statistics_view.php | 4 +- scripts/admin/statistics.js | 152 +++++++++--------- 4 files changed, 87 insertions(+), 84 deletions(-) diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 3c881cb4f66..6d8bbec58da 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -559,7 +559,7 @@ public function run($surveyid, $subaction = null) function graph() { - Yii::app()->loadHelper('admin/statistics_helper'); + Yii::app()->loadHelper('admin/statistics'); Yii::app()->loadHelper("surveytranslator"); // Initialise PCHART @@ -571,8 +571,8 @@ function graph() $aData['success'] = 1; - if (isset($_POST['cmd']) || !isset($_POST['id'])) { - list($qsid, $qgid, $qqid) = explode("X", substr($_POST['id'], 1), 3); + if (isset($_POST['cmd']) && isset($_POST['id'])) { + list($qsid, $qgid, $qqid) = explode("X", substr($_POST['id'], 0), 3); $qtype = substr($_POST['id'], 0, 1); $aattr = getQuestionAttributeValues($qqid, substr($_POST['id'], 0, 1)); $field = substr($_POST['id'], 1); @@ -655,7 +655,8 @@ function graph() $aData['success'] = 0; } - $this->_renderWrappedTemplate('export', 'statistics_graph_view', $aData); + //$this->_renderWrappedTemplate('export', 'statistics_graph_view', $aData); + $this->getController()->render('export/statistics_graph_view', $aData); } /** diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index c5a840b5d5e..b15e79f74f4 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -156,11 +156,11 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache) else { // this block is to remove the items with value == 0 - // and an unelegant way to remove comments from List with Comments questions + // and an inelegant way to remove comments from List with Comments questions $i = 0; while (isset ($gdata[$i])) { - if ($gdata[$i] == 0 || ($qtype == "O" && substr($lbl[$i],0,strlen($statlang->gT("Comments")))==$statlang->gT("Comments"))) + if ($gdata[$i] == 0 || ($type == "O" && substr($lbl[$i],0,strlen($statlang->gT("Comments")))==$statlang->gT("Comments"))) { array_splice ($gdata, $i, 1); array_splice ($lbl, $i, 1); @@ -3418,7 +3418,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, break; case 'html': - $statisticsoutput .= "" + $statisticsoutput .= "\n" .""; return $statisticsoutput; diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index d149495a83e..35afdc4bc30 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -6,7 +6,9 @@ exit; } ?> - +
eT("General filters"); ?>
diff --git a/scripts/admin/statistics.js b/scripts/admin/statistics.js index 4ea8634a654..dd278e75c35 100644 --- a/scripts/admin/statistics.js +++ b/scripts/admin/statistics.js @@ -1,71 +1,71 @@ $(document).ready(function(){ $('#usegraph').click( function(){ if ($('#grapherror').length>0) - { + { $('#grapherror').show(); $('#usegraph').attr('checked',false); } }) $('#viewsummaryall').click( function(){ if ($('#viewsummaryall').attr('checked')==true) - { + { $('#filterchoices input[type=checkbox]').attr('checked', true); } else { $('#filterchoices input[type=checkbox]').attr('checked', false); - + } }) $('#hidefilter').click( function(){ $('#filterchoices').hide(); $('#filterchoice_state').val('1'); - $('#vertical_slide2').hide(); + $('#vertical_slide2').hide(); }) $('#showfilter').click( function(){ $('#filterchoices').show(); $('#filterchoice_state').val(''); - $('#vertical_slide2').show(); + $('#vertical_slide2').show(); }) - + if (typeof aGMapData == "object") { for (var i in aGMapData) { gMapInit("statisticsmap_" + i, aGMapData[i]); - } + } } - + if (typeof aStatData == "object") { for (var i in aStatData) { statInit(aStatData[i]); } } - + $(".stats-hidegraph").click (function () { - + var id = statGetId(this.parentNode); if (!id) { return; } - - $("#statzone_" + id).html(getWaiter()); + + $("#statzone_" + id).html(getWaiter()); graphQuery(id, 'hidegraph', function (res) { if (!res) { ajaxError(); return; } - + data = JSON.parse(res); - + if (!data || !data.ok) { ajaxError(); return; } - + isWaiting[id] = false; aStatData[id].sg = false; statInit(aStatData[id]); -}); + }); }); $(".stats-showgraph").click(function () @@ -74,7 +74,7 @@ $(document).ready(function(){ if (!id) { return; } - + $("#statzone_" + id).html(getWaiter()).show(); graphQuery(id, 'showgraph', function (res) { if (!res) { @@ -82,101 +82,101 @@ $(document).ready(function(){ return; } data = JSON.parse(res); - + if (!data || !data.ok || !data.chartdata) { ajaxError(); return; } - + isWaiting[id] = false; aStatData[id].sg = true; statInit(aStatData[id]); - + $("#statzone_" + id).append(""); - + if (aStatData[id].sm) { if (!data.mapdata) { ajaxError(); return; } - - $("#statzone_" + id).append("
"); + + $("#statzone_" + id).append("
"); gMapInit('statisticsmap_' + id, data.mapdata); } - + $("#statzone_" + id + " .wait").remove(); - + }); }); - + $(".stats-hidemap").click (function () { var id = statGetId(this.parentNode); if (!id) { return; } - + $("#statzone_" + id + ">div").replaceWith(getWaiter()); - + graphQuery(id, 'hidemap', function (res) { if (!res) { ajaxError(); return; } - + data = JSON.parse(res); - + if (!data || !data.ok) { ajaxError(); return; } - + isWaiting[id] = false; aStatData[id].sm = false; statInit(aStatData[id]); - + $("#statzone_" + id + " .wait").remove(); }); }); - + $(".stats-showmap").click(function () { var id = statGetId(this.parentNode); if (!id) { return; } - + $("#statzone_" + id).append(getWaiter()); - + graphQuery(id, 'showmap', function (res) { if (!res) { ajaxError(); return; } - + data = JSON.parse(res); - + if (!data || !data.ok || !data.mapdata) { ajaxError(); return; } - + isWaiting[id] = false; aStatData[id].sm = true; statInit(aStatData[id]); - + $("#statzone_" + id + " .wait").remove(); $("#statzone_" + id).append("
"); - + gMapInit('statisticsmap_' + id, data.mapdata); }); }); - + $(".stats-showbar").click(function () { changeGraphType('showbar', this.parentNode); }); - + $(".stats-showpie").click(function () { changeGraphType('showpie', this.parentNode); @@ -193,13 +193,13 @@ function getWaiter() function graphQuery (id, cmd, success) { $.ajax({ type: "POST", - url: site_url + '/admin/statistics/graph', + url: graphUrl, data: { 'id': id, - 'cmd': cmd, + 'cmd': cmd, }, success: success, - error: function (res) + error: function (res) { ajaxError(); } @@ -220,12 +220,12 @@ function showhidefilters(value) { } function selectCheckboxes(Div, CheckBoxName, Button) -{ +{ var aDiv = document.getElementById(Div); var nInput = aDiv.getElementsByTagName("input"); var Value = document.getElementById(Button).checked; //alert(Value); - + for(var i = 0; i < nInput.length; i++) { if(nInput[i].getAttribute("name")==CheckBoxName) @@ -238,54 +238,54 @@ function nographs() } function gMapInit(id, data) -{ - if (!data || !data["coord"] || !data["zoom"] || +{ + if (!data || !data["coord"] || !data["zoom"] || !data.width || !data.height || typeof google == "undefined") { return; } - + $("#" + id).width(data.width); $("#" + id).height(data.height); - + var latlng; if (data["coord"].length > 0) { var c = data["coord"][0].split(" "); latlng = new google.maps.LatLng(parseFloat(c[0]), parseFloat(c[1])); - } else { - latlng = new google.maps.LatLng(0.1, 0.1); + } else { + latlng = new google.maps.LatLng(0.1, 0.1); } - + var myOptions = { zoom: parseFloat(data["zoom"]), center: latlng, mapTypeId: google.maps.MapTypeId.ROADMAP }; - + var map = new google.maps.Map(document.getElementById(id), myOptions); for (var i = 0; i < data["coord"].length; ++i) { var c = data["coord"][i].split(" "); - - var marker = new google.maps.Marker({ - position: new google.maps.LatLng(parseFloat(c[0]), parseFloat(c[1])), - map: map - }); + + var marker = new google.maps.Marker({ + position: new google.maps.LatLng(parseFloat(c[0]), parseFloat(c[1])), + map: map + }); } } function statGetId(elem) { var id = $(elem).attr("id"); - + if (id.substr(0, 6) == "stats_") { return id.substr(6, id.length); } - - if (id == '' || isWaiting[id]) { + + if (id == '' || isWaiting[id]) { return false; - } - + } + isWaiting[id] = true; return id; } @@ -293,17 +293,17 @@ function statGetId(elem) function statInit(data) { var elem = $("#stats_" + data.id); - + elem.children().hide(); - + if (data.sg) { $("#statzone_" + data.id).show(); $(".stats-hidegraph", elem).show(); - + if (data.ap) { $(".stats-" + (data.sp ? "showbar" : "showpie"), elem).show(); } - + if (data.am) { $(".stats-" + (data.sm ? "hidemap" : "showmap"), elem).show(); } @@ -320,30 +320,30 @@ function changeGraphType (cmd, id) { if (!id) { return; } - + if (!aStatData[id].ap) { return; } - + $("#statzone_" + id).append(getWaiter()); - + graphQuery(id, cmd, function (res) { if (!res) { ajaxError(); return; } - + data = JSON.parse(res); - + if (!data || !data.ok || !data.chartdata) { ajaxError(); return; } - + isWaiting[id] = false; aStatData[id].sp = (cmd == 'showpie'); statInit(aStatData[id]); - + $("#statzone_" + id + " .wait").remove(); $("#statzone_" + id + ">img:first").attr("src", temppath +"/"+data.chartdata); }); From 2ba0b519de929fcba4e3bd8c4c2f98d90469db08 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Fri, 20 Jul 2012 22:44:38 +1000 Subject: [PATCH 02/71] Fixed issue #6354 - typo. De-typo-ified (thx sammousa :-)) --- application/controllers/admin/participantsaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php index ce1135117aa..13021e348f1 100644 --- a/application/controllers/admin/participantsaction.php +++ b/application/controllers/admin/participantsaction.php @@ -521,7 +521,7 @@ function exporttocsvcount() else // If no search criteria it will simply return the number of participants { $iUserID = Yii::app()->session['loginID']; - $query = Particiapnts::getParticipantsOwner($iUserID); + $query = Participants::getParticipantsOwner($iUserID); } echo sprintf($clang->gT("Export %s participant(s) to CSV"), count($query)); From fc8e2a399b0f7086698e63c3301ac35977e516b4 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Fri, 20 Jul 2012 23:17:33 +1000 Subject: [PATCH 03/71] Fixed issue: statistics script not able to build query selector for array(column) question type --- application/views/admin/export/statistics_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index 35afdc4bc30..98607dab8b2 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -899,7 +899,7 @@ * - sortorder * - language */ - $fresult = $fresults[$key1][$key]; + $fresult = $fresults[$key1]; //for debugging only: //echo $fquery; From 3244e3810e8e3c988e9080c3c6c6e9666b6f7a88 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Fri, 20 Jul 2012 23:35:40 +1000 Subject: [PATCH 04/71] Fixed issue: numerical calculations in statistics were not working --- application/helpers/admin/statistics_helper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index b15e79f74f4..2416ebd94fb 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -1369,10 +1369,10 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, if ($sql != "NULL") {$query .= " AND $sql";} //execute query - $result=Yii::app()->db->createCommand($query)->query(); + $result=Yii::app()->db->createCommand($query)->queryAll(); //get calculated data - foreach ($nresult->readAll() as $row) + foreach ($result as $row) { //put translation of mean and calculated data into $showem array $showem[]=array($statlang->gT("Sum"), $row['sum']); @@ -1540,7 +1540,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1"; $result = Yii::app()->db->createCommand($query)->limit(1, $q3c); - foreach ($result->readAll() as $row) + foreach ($result->queryAll() as $row) { $showem[]=array($statlang->gT("3rd quartile (Q3)"), $row[$fieldname]); } From d1a5d5255163914ad2d1b802a15f660bc3e6395d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 20 Jul 2012 16:11:41 -0400 Subject: [PATCH 05/71] Fixed issue #06349: condition does not work while using slider with stars Dev this fixes bug from 1.92, but stars do not display at all in 2.0, so there is an additional bug there. --- application/helpers/qanda_helper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php index b1cbd363000..01c6643bc80 100644 --- a/application/helpers/qanda_helper.php +++ b/application/helpers/qanda_helper.php @@ -1015,6 +1015,7 @@ function do_5pointchoice($ia) $('#$id input').each(function(){ $(this).removeAttr('checked');}); $('#answer$ia[1]'+value).attr('checked','checked'); } + checkconditions(value,'$ia[1]','radio'); } }); From 22d3f57064981238a07fc4ee7ddbb5c540dcd1ab Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Sat, 21 Jul 2012 14:05:29 +0200 Subject: [PATCH 06/71] Fixed issue : 5 point star rating breaked in Yii Dev: move js and css in good directory --- application/helpers/qanda_helper.php | 4 +- scripts/admin/rating/delete.gif | Bin 752 -> 0 bytes scripts/admin/rating/documentation.css | 80 - scripts/admin/rating/documentation.html | 1169 ---- scripts/admin/rating/documentation.js | 15 - scripts/admin/rating/index.html | 19 - scripts/admin/rating/jquery.MetaData.js | 121 - scripts/admin/rating/jquery.js | 6001 ----------------- scripts/admin/rating/jquery.rating.pack.js | 11 - scripts/{admin/rating => }/jquery.rating.js | 0 .../jquery.rating.css | 12 +- .../rating-img}/star.gif | Bin .../rating-img}/star1.gif | Bin .../rating-img}/star2.gif | Bin .../rating-img}/star3.gif | Bin .../rating-img}/star4.gif | Bin .../rating-img}/star5.gif | Bin 17 files changed, 8 insertions(+), 7424 deletions(-) delete mode 100644 scripts/admin/rating/delete.gif delete mode 100644 scripts/admin/rating/documentation.css delete mode 100644 scripts/admin/rating/documentation.html delete mode 100644 scripts/admin/rating/documentation.js delete mode 100644 scripts/admin/rating/index.html delete mode 100644 scripts/admin/rating/jquery.MetaData.js delete mode 100644 scripts/admin/rating/jquery.js delete mode 100644 scripts/admin/rating/jquery.rating.pack.js rename scripts/{admin/rating => }/jquery.rating.js (100%) rename {scripts/admin/rating => styles-public}/jquery.rating.css (68%) rename {scripts/admin/rating => styles-public/rating-img}/star.gif (100%) rename {scripts/admin/rating => styles-public/rating-img}/star1.gif (100%) rename {scripts/admin/rating => styles-public/rating-img}/star2.gif (100%) rename {scripts/admin/rating => styles-public/rating-img}/star3.gif (100%) rename {scripts/admin/rating => styles-public/rating-img}/star4.gif (100%) rename {scripts/admin/rating => styles-public/rating-img}/star5.gif (100%) diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php index 01c6643bc80..36df63dab78 100644 --- a/application/helpers/qanda_helper.php +++ b/application/helpers/qanda_helper.php @@ -989,8 +989,8 @@ function do_5pointchoice($ia) $answer .= "\ngetConfig('surveyID')][$ia[1]]."\" />\n"; $inputnames[]=$ia[1]; if($aQuestionAttributes['slider_rating']==1){ - header_includes('/admin/scripts/rating/jquery.rating.css','css'); - header_includes('/admin/scripts/rating/jquery.rating.js','js'); + header_includes('jquery.rating.css','css'); + header_includes('jquery.rating.js','js'); $answer.=" - - - - - - - - - - - - - -
-
- jQuery Plugins: - Multiple File Upload, - Star Rating, - NEW: - CKEditor - (old: FCKEditor), - Codepress, - XML to JSON - - - - - - -
- -
- - - -
- - - - - - - -
-

What is this?

-

- The Star Rating Plugin is a plugin - for the jQuery Javascript library that creates a non-obstrusive - star rating control based on a set of radio input boxes. -

- -

What does it do?

-
    -
  • - It turns a collection of radio boxes into a neat star-rating control. -
    • -
  • - It creates the interface based on standard form elements, which means the - basic functionality will still be available even if Javascript is disabled. -
    • -
  • - NEW (12-Mar-08): - In read only mode (using the 'readOnly' option or disabled property), the plugin is a neat way of - displaying star-like values without any additional code -
    • -
- -

How do I use it?

-

- Just add the star class to your radio boxes -

- - - - - - -
- 
<input name="star1" type="radio" class="star"/>
-<input name="star1" type="radio" class="star"/>
-<input name="star1" type="radio" class="star"/>
-<input name="star1" type="radio" class="star"/>
-<input name="star1" type="radio" class="star"/>
- 		» - - - - - -
- -

- Use the checked property to specify the initial/default value of the control -

- - - - - - -
- 
<input name="star2" type="radio" class="star"/>
-<input name="star2" type="radio" class="star"/>
-<input name="star2" type="radio" class="star" checked="checked"/>
-<input name="star2" type="radio" class="star"/>
-<input name="star2" type="radio" class="star"/>
- 		» - - - - - -
- -

- Use the disabled property to use a control for display purposes only -

- - - - - - -
- 
<input name="star3" type="radio" class="star" disabled="disabled"/>
-<input name="star3" type="radio" class="star" disabled="disabled"/>
-<input name="star3" type="radio" class="star" disabled="disabled" checked="checked"/>
-<input name="star3" type="radio" class="star" disabled="disabled"/>
-<input name="star3" type="radio" class="star" disabled="disabled"/>
- 		» - - - - - -
- -

What about split stars and 'half ratings'???

-

- Use metadata plugin to pass advanced settings to the plugin via the class property. -

- - - - - - -
- 
<input name="adv1" type="radio" class="star {split:4}"/>
-<input name="adv1" type="radio" class="star {split:4}"/>
-<input name="adv1" type="radio" class="star {split:4}"/>
-<input name="adv1" type="radio" class="star {split:4}"/>
-<input name="adv1" type="radio" class="star {split:4}" checked="checked"/>
-<input name="adv1" type="radio" class="star {split:4}"/>
-<input name="adv1" type="radio" class="star {split:4}"/>
-<input name="adv1" type="radio" class="star {split:4}"/>
- 		» - - - - - - - - -
- -

- Use custom selector -

- - - - - - -
- - 
$(function(){ // wait for document to load
- $('input.wow').rating();
-});
- 
<input name="adv2" type="radio" class="wow {split:4}"/>
-<input name="adv2" type="radio" class="wow {split:4}"/>
-<input name="adv2" type="radio" class="wow {split:4}"/>
-<input name="adv2" type="radio" class="wow {split:4}"/>
-<input name="adv2" type="radio" class="wow {split:4}" checked="checked"/>
-<input name="adv2" type="radio" class="wow {split:4}"/>
-<input name="adv2" type="radio" class="wow {split:4}"/>
-<input name="adv2" type="radio" class="wow {split:4}"/>
- 		» - - - - - - - - -
-
- -
-

Test Suite

- - - -
 
-
-Test 1 - A blank form - - - - - -
- - - - - -
-
- Rating 1: - (N/M/Y) - - - -
-
-
- Rating 2: - (10 - 50) - - - - - -
-
-
- Rating 3: - (1 - 7) - - - - - - - -
- 		-
- Rating 4: - (1 - 5) - - - - - -
-
-
- Rating 5: - (1 - 5) - - - - - -
-
-
- Rating 6 (readonly): - (1 - 5) - - - - - -
-
- 		  -   - Test results:

-
- Results will be displayed here -
-
-
- -
 
 
- -
-Test 2 - With defaults ('checked') - - - - - -
- - - - - -
-
- Rating 1: - (N/M/Y, default M) -
-
- - - -
-
- Rating 2: - (10 - 50, default 30) -
-
- - - - - -
-
- Rating 3: - (1 - 7, default 4) -
-
- - - - - - - -
- 		-
- Rating 4: - (1 - 5, default 1) -
-
- - - - - -
-
- Rating 5: - (1 - 5, default 5) -
-
- - - - - -
-
- Rating 6 (readonly): - (1 - 5, default 3) -
-
- - - - - -
-
- 		  -   - Test results:

-
- Results will be displayed here -
-
-
- -
 
 
- -
- -Test 3-A - With callback - - - - - -
-
- Rating 1: - (1 - 3, default 2) - - - -
-
- 
$('.auto-submit-star').rating({
-  callback: function(value, link){
-    alert(value);
-  }
-});
-
- 		  -   - Test results:

-
- Results will be displayed here -
-
-
- -
 
 
- - -
-Test 3-B - With hover effects - - - - - -
-
- Rating 1: - (1 - 3, default 2) -
- - - - - - Hover tips will appear in here -
-
-
- 
$('.hover-star').rating({
-  focus: function(value, link){
-    var tip = $('#hover-test');
-    tip[0].data = tip[0].data || tip.html();
-    tip.html(link.title || 'value: '+value);
-  },
-  blur: function(value, link){
-    var tip = $('#hover-test');
-    $('#hover-test').html(tip[0].data || '');
-  }
-});
-
- 		  -   - Test results:

-
- Results will be displayed here -
-
-
- -
 
 
- -
-Test 4 - Half Stars and Split Stars - - - - - -
- - - - - -
-
- Rating 1: - (N/M/Y/?) - 
<input class="star {half:true}"
- - - - -
-
-
- Rating 2: - (10 - 60) - 
<input class="star {split:3}"
- - - - - - -
-
-
- Rating 3: - (0-5.0, default 3.5) - 
<input class="star {split:2}"
- - - - - - - - - - -
- 		-
- Rating 4: - (1-6, default 5) - 
<input class="star {split:2}"
- - - - - - -
-
-
- Rating 5: - (1-20, default 11) - 
<input class="star {split:4}"
- - - - - - - - - - - - - - - - - - - - -
-
-
- Rating 6 (readonly): - (1-20, default 13) - 
<input class="star {split:4}"
- - - - - - - - - - - - - - - - - - - - -
-
- 		  -   - Test results:

-
- Results will be displayed here -
-
-
-
- -
-

API

-

NEW to v3

- -

API methods can be invoked this this:

- 
$(selector).rating(
- 'method', // method name
- [] // method arguments (not required)
-);
- -


- -

$().rating('select', index / value)

-

- Use this method to set the value (and display) of the star rating control - via javascript. It accepts the index of the star you want to select (0 based) - or its value (which must be passed as a string. -

-

- Example: (values A/B/C/D/E) -

-
- - - - - - - -
- By index: - - - - - - eg.: $('input').rating('select',3) -
- By value: - - - - - - eg.: $('input').rating('select','C') -
- -


- -

$().rating('readOnly', true / false)

-

- Use this method to set the value (and display) of the star rating control - via javascript. It accepts the index of the star you want to select (0 based) - or its value (which must be passed as a string. -

-

- Example: (values 1,2,3...10) -

-
- - - - - - - - - - - - -
- - eg.: $('input').rating('readOnly',true) -
- - eg.: $('input').rating('readOnly',false) or simply $('input').rating('readOnly'); -
- -


- -

$().rating('disable') / $().rating('enable')

-

- These methods bahve almost exactly as the readOnly method, however - they also control whether or not the select value is submitted with - the form. -

-

- Example: (values 1,2,3...10) -

-
- - - - - - - - - - - - -
- - eg.: $('input').rating('disable') -
- - eg.: $('input').rating('enable'); -
-
- -
-

Database Integration

-

- I'm sorry to say that for the time being, it is up to you - to create the server-side code that will - process the form submission, store it somewhere (like a database) and do stuff with it - - such as displaying averages and stop users from voting more than once. -

-

- However, here are a few alternatives if you don't feel - like getting down and dirty with some good old coding: -
http://www.yvoschaap.com/index.php/weblog/css_star_rater_ajax_version/ -
-
and -
part 1: http://www.komodomedia.com/blog/2005/08/creating-a-star-rater-using-css/ -
part 2: http://slim.climaxdesigns.com/tutorial.php?section=slim&id=2 -
part 3: http://slim.climaxdesigns.com/tutorial.php?section=slim&id=3 -
part 4: http://slim.climaxdesigns.com/tutorial.php?section=slim&id=9 -

-
- -
-

Background Information

-

As far as I know, this is how it goes...

-
    -
  • It all started with Will Stuckey's jQuery Star Rating Super Interface!
    • -
  • The original then became the inspiration for Ritesh Agrawal's Simple Star Rating System, - which allows for a GMail like star/un-star toggle.
    • -
  • This was followed by several spin-offs... (one of which is the Half-star rating plugin)
    • -
  • Then someone at PHPLetter.com modified the plugin to overcome the issues - then plugin was now based on standard form elements, meaning - the interface would still work with Javascript disabled making it beautifully downgradable.
    • -
  • Then I came along and noticed a fundamental flaw with the latter: there could only - be one star rating control per page. The rest of the story is what you will see below...
    • -
  • NEW (12-Mar-08): Then Keith Wood added some very nice functionality to the plugin: - option to disable the cancel button, option to make the plugin readOnly and ability to accept any value (other than whole numbers)
    • -
  • NEW (20-Mar-08): Now supports half-star, third-star, quater-star, etc... Not additional code required. No additional images required.
    • -
  • NEW (31-Mar-08): Two new events, hover/blur (arguments: [value, linkElement])
    • -
-
- -
-

Download

-

- This project (and all related files) can also be accessed via its - Google Code Project Page. -

- - - - - - - - - - - - - - - - - -
Full Package: - - - v3.13 - star-rating.zip - -
-
- Stay up-to-date! - - Major updates will be announced on - Twitter: - @fyneworks - -
-
Core Files: - These are the individual required files (already included in the zip package above) - -
jQuery: - jquery-latest.js (see jQuery.com) -
- -

Related Downloads

- - - - - -
Related: - Metadata plugin - Used to retrieve inline configuration from class variable -
- Form plugin - Used to submit forms via ajax -
- -

SVN Repository

-

- If you're a major geek or if you really really want to stay up-to-date with - with future updates of this plugin, go ahead and plug yourself to the - SVN Repository - on the official - Google Code Project Page. -

- - - - - - - - - -
SVN Checkout: - - SVN Checkout Instructions -
Browse Online: - - Browse Source -
- -

Alternative Download - From this website

-

- Just in case it's the end of the world and the Google Code site becomes unavailable, - the project files can also be downloaded form this site. -
- However, please note that this site is updated periodically whereas the Google Code - project is kept up-to-date almost instantaneously. If you'd like the very latest - version of this plugin - you are advised to use the links above and download the files from Google Code - - this will ensure the files you download have the very latest features and bug fixes. -

- - - - - - - - - - - - - - - - - -
Full Package: - - v3.13 - star-rating.zip -
-
- Stay up-to-date! - - Major updates will be announced on - Twitter: - @fyneworks - -
-
Core Files: - These are the individual required files (already included in the zip package above) - -
jQuery: - jquery-latest.js (see jQuery.com) -
- -
- -
- -

Support

-

- Quick Support Links: Help me! - | Report a bug - | Suggest new feature - -

-

- Support for this plugin is available through the jQuery Mailing List. - This is a very active list to which many jQuery developers and users subscribe. -
- Access to the jQuery Mailing List is also available through - Nabble Forums - and the - jQuery Google Group. -

-

- WARNING: - Support will not be provided via the jQuery Plugins - website. - If you need help, please direct your questions to the - jQuery Mailing List - or - report an issue - on the official - Google Code Project Page. -

- -

Official Links

- - -

Credit

-
    -
  • Diego A. - Author, London SEO Consultant
    • -
  • Keith Wood - The brain behind v2.1
    • -
  • Dean Edwards - Author of JS Packer used to compress the plugin
    • -
  • Will Stuckey, Ritesh Agrawal and everyone else who worked in the previous versions of the plugin - I'm not so good with research...
    • -
-
- - - - - - - -
-

Attribute this work

-
- - - - - - - - - -
Attribution link:© Fyneworks.com
HTML Code: - -
-
-

License Info

-
- - - - - - - - -
- Star Rating Plugin - by Fyneworks.com - is licensed under the - MIT License and the - GPL License. - Creative Commons License
- 
Copyright © 2008 Fyneworks.com
- 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
- 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-
- -
-
-
- - - - - - - - - diff --git a/scripts/admin/rating/documentation.js b/scripts/admin/rating/documentation.js deleted file mode 100644 index 7d6fb907f16..00000000000 --- a/scripts/admin/rating/documentation.js +++ /dev/null @@ -1,15 +0,0 @@ -// chili-1.7.packed.ks -eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1;};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p;}('8={3b:"1.6",2o:"1B.1Y,1B.23,1B.2e",2i:"",2H:1a,12:"",2C:1a,Z:"",2a:\'$$\',R:"&#F;",1j:"&#F;&#F;&#F;&#F;",1f:"&#F;<1W/>",3c:5(){9 $(y).39("1k")[0]},I:{},N:{}};(5($){$(5(){5 1J(l,a){5 2I(A,h){4 3=(1v h.3=="1h")?h.3:h.3.1w;k.1m({A:A,3:"("+3+")",u:1+(3.c(/\\\\./g,"%").c(/\\[.*?\\]/g,"%").3a(/\\((?!\\?)/g)||[]).u,z:(h.z)?h.z:8.2a})}5 2z(){4 1E=0;4 1x=x 2A;Q(4 i=0;i\';8.N[X]=1H;7($.31.34){4 W=J.1L(Y);4 $W=$(W);$("2d").1O($W)}v{$("2d").1O(Y)}}}5 1q(e,a){4 l=e&&e.1g&&e.1g[0]&&e.1g[0].37;7(!l)l="";l=l.c(/\\r\\n?/g,"\\n");4 C=1J(l,a);7(8.1j){C=C.c(/\\t/g,8.1j)}7(8.1f){C=C.c(/\\n/g,8.1f)}$(e).38(c)}5 1o(q,13){4 1l={12:8.12,2x:q+".1d",Z:8.Z,2w:q+".2u"};4 B;7(13&&1v 13=="2l")B=$.35(1l,13);v B=1l;9{a:B.12+B.2x,1p:B.Z+B.2w}}7($.2q)$.2q({36:"2l.15"});4 2n=x 1u("\\\\b"+8.2i+"\\\\b","2j");4 1e=[];$(8.2o).2D(5(){4 e=y;4 1n=$(e).3i("V");7(!1n){9}4 q=$.3u(1n.c(2n,""));7(\'\'!=q){1e.1m(e);4 f=1o(q,e.15);7(8.2H||e.15){7(!8.N[f.a]){1D{8.N[f.a]=1H;$.3v(f.a,5(M){M.f=f.a;8.I[f.a]=M;7(8.2C){2B(f.1p)}$("."+q).2D(5(){4 f=1o(q,y.15);7(M.f==f.a){1q(y,M)}})})}1I(3s){3t("a 3w Q: "+q+\'@\'+3z)}}}v{4 a=8.I[f.a];7(a){1q(e,a)}}}});7(J.1i&&J.1i.29){5 22(p){7(\'\'==p){9""}1z{4 16=(x 3A()).2k()}19(p.3x(16)>-1);p=p.c(/\\<1W[^>]*?\\>/3y,16);4 e=J.1L(\'<1k>\');e.3l=p;p=e.3m.c(x 1u(16,"g"),\'\\r\\n\');9 p}4 T="";4 18=1G;$(1e).3j().G("1k").U("2c",5(){18=y}).U("1M",5(){7(18==y)T=J.1i.29().3k});$("3n").U("3q",5(){7(\'\'!=T){2p.3r.3o(\'3p\',22(T));2V.2R=1a}}).U("2c",5(){T=""}).U("1M",5(){18=1G})}})})(1Z);8.I["1Y.1d"]={k:{2M:{3:/\\/\\*[^*]*\\*+(?:[^\\/][^*]*\\*+)*\\//},25:{3:/\\ + +   + + +   +


+
+
eT("Attribute management"); ?>

diff --git a/scripts/admin/attributeControl.js b/scripts/admin/attributeControl.js index 861887eb070..36ab0f31bf5 100644 --- a/scripts/admin/attributeControl.js +++ b/scripts/admin/attributeControl.js @@ -76,5 +76,16 @@ function ajaxSave(rowid) { { state = "FALSE"; } - $.post(editAttributeUrl, { id: rowid, visible: state, oper : 'edit' } ); + $.post(editAttributeUrl, { + id: rowid, + visible: state, + oper : 'edit' + }, + function (data) { + $("p#flashmessagetext").html(data); + $("#flashinfo").css("display", ""); + $("#flashinfo").css("opacity", 0); + $("#flashinfo").animate({opacity: 1.0}, 1500).fadeOut("slow"); + } + ); } \ No newline at end of file From 7b775f8408f3f76d249ca938c17f1ac79886c649 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Sun, 22 Jul 2012 11:51:04 +1000 Subject: [PATCH 08/71] Fixed issue #6363 Statistics repsonse filters don't display speaker icon, show question text twice New feature Statistics output screen cleaned up, placed inside collapsible divs --- .../views/admin/export/statistics_view.php | 263 ++++++++++-------- scripts/admin/statistics.js | 15 +- styles/gringegreen/adminstyle.css | 13 +- 3 files changed, 168 insertions(+), 123 deletions(-) diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index 98607dab8b2..b22252b6c82 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -10,131 +10,138 @@ var graphUrl="getController()->createUrl("admin/statistics/graph"); ?>";
-
eT("General filters"); ?>
-
- '.$clang->gT('You do not have the GD Library installed. Showing charts requires the GD library to function properly.'); - $error .= '
'.$clang->gT('visit http://us2.php.net/manual/en/ref.image.php for more information').'
'; - } - else if (!function_exists("imageftbbox")) { - $error .= '
'.$clang->gT('You do not have the Freetype Library installed. Showing charts requires the Freetype library to function properly.'); +
+
<?php $clang->eT("Maximize"); ?><?php $clang->eT("Minimize"); ?>
+ eT("General filters"); ?> +
+ + - -

- - ', '_top')" /> -

- +
<?php $clang->eT("Maximize"); ?><?php $clang->eT("Minimize"); ?>
eT("Response filters"); ?>
- + + - +
@@ -183,7 +190,8 @@ + || $flt[2]=='G' || $flt[2]=='I' || $flt[2]=='O' || $flt[2]=='Y' || $flt[2]=='!') + { ?> /> +
@@ -1251,22 +1260,36 @@

-
+
+ +
+
+
<?php $clang->eT("Maximize"); ?><?php $clang->eT("Minimize"); ?>
+ eT("Statistics"); ?> +
+ +
+
lang; - $sImageURL = Yii::app()->getConfig("imageurl"); + $sImageURL = Yii::app()->getConfig('adminimageurl'); if(!isset($maxchars)) { $maxchars = 100; } $htmlhinttext=str_replace("'",''',$hinttext); //the string is already HTML except for single quotes so we just replace these only - $jshinttext=javascriptEscape($hinttext,true,true); + $jshinttext=javascriptEscape($hinttext,true,true); //Build a javascript safe version of the string if(strlen($hinttext) > ($maxchars)) { @@ -1275,15 +1298,15 @@ function _showSpeaker($hinttext) $shortstring = htmlspecialchars(mb_strcut(html_entity_decode($shortstring,ENT_QUOTES,'UTF-8'), 0, $maxchars, 'UTF-8')); //output with hoover effect - $reshtml= "gT("Question","js").": $jshinttext')\">" ." \"$shortstring...\" " - ."$htmlhinttextgT("Question","js").": $jshinttext')\" />"; } else { - $reshtml= " \"$htmlhinttext\""; + $reshtml= " \"$htmlhinttext\""; } return $reshtml; } diff --git a/scripts/admin/statistics.js b/scripts/admin/statistics.js index dd278e75c35..76692f3ea5b 100644 --- a/scripts/admin/statistics.js +++ b/scripts/admin/statistics.js @@ -18,16 +18,29 @@ $(document).ready(function(){ } }) $('#hidefilter').click( function(){ + $('#statisticsresponsefilters').hide(1000); $('#filterchoices').hide(); $('#filterchoice_state').val('1'); $('#vertical_slide2').hide(); }) $('#showfilter').click( function(){ + $('#statisticsresponsefilters').show(1000); $('#filterchoices').show(); $('#filterchoice_state').val(''); $('#vertical_slide2').show(); }) - + $('#hidegfilter').click( function(){ + $('#statisticsgeneralfilters').hide(1000); + }) + $('#showgfilter').click( function(){ + $('#statisticsgeneralfilters').show(1000); + }) + $('#hidesfilter').click( function(){ + $('#statisticsoutput').hide(1000); + }) + $('#showsfilter').click( function(){ + $('#statisticsoutput').show(1000); + }) if (typeof aGMapData == "object") { for (var i in aGMapData) { gMapInit("statisticsmap_" + i, aGMapData[i]); diff --git a/styles/gringegreen/adminstyle.css b/styles/gringegreen/adminstyle.css index 6555d1261d3..df68966b0f2 100644 --- a/styles/gringegreen/adminstyle.css +++ b/styles/gringegreen/adminstyle.css @@ -493,8 +493,17 @@ th.admincell { .header_statistics { height:21px; - padding:1px; - padding-left:42px; + padding:1px 8px 1px 15px; + margin-bottom: 0; +} +.statisticsfilters { + width: 99%; + border: 1px solid #85BD00; + margin-bottom: 20px; +} +.scrollheight_400 { + height: 400px; + overflow: auto; } .btnaddanswer, From 619c400aa9cd30542aaecc10cb09d0d1ef8262b6 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Sun, 22 Jul 2012 11:57:07 +1000 Subject: [PATCH 09/71] Fixed issue #6363 updated blobblueish style for earlier fix --- styles/blobblueish/adminstyle.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/styles/blobblueish/adminstyle.css b/styles/blobblueish/adminstyle.css index f7447867208..cc42b035e98 100644 --- a/styles/blobblueish/adminstyle.css +++ b/styles/blobblueish/adminstyle.css @@ -487,8 +487,17 @@ th.admincell { .header_statistics { height:21px; - padding:1px; - padding-left:42px; + padding:1px 8px 1px 15px; + margin-bottom: 0; +} +.statisticsfilters { + width: 99%; + border: 1px solid #C0FFC0; + margin-bottom: 20px; +} +.scrollheight_400 { + height: 400px; + overflow: auto; } .btnaddanswer, From fbc70dc99c5664710c7189110c2141ad1222a948 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Sun, 22 Jul 2012 12:11:07 +1000 Subject: [PATCH 10/71] Fixed issue #6359 - installations with postgres as database fail because of syntax error --- installer/sql/create-pgsql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/sql/create-pgsql.sql b/installer/sql/create-pgsql.sql index c10563f5e3c..6a35ce9fd6b 100644 --- a/installer/sql/create-pgsql.sql +++ b/installer/sql/create-pgsql.sql @@ -339,7 +339,7 @@ CREATE TABLE prefix_survey_links ( "survey_id" integer NOT NULL, "date_created" timestamp, "date_invited" timestamp, - "date_completed" timestamp + "date_completed" timestamp, CONSTRAINT prefix_survey_links_pkey PRIMARY KEY (participant_id,token_id,survey_id) ); From 3e0482123f112391acd66e4fda61ccfd676e1484 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Sun, 22 Jul 2012 14:56:06 +1000 Subject: [PATCH 11/71] New feature: question save/save and close options - instead of just updating and closing, now choice is to save and keep editing, or to save and return to question view. My wife made me do it. --- application/controllers/admin/database.php | 6 +++++- .../survey/Question/editQuestion_view.php | 12 +++++++++--- scripts/admin/surveytoolbar.js | 19 ++++++++++++------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php index 6f6507c5e42..df97a11c9ce 100644 --- a/application/controllers/admin/database.php +++ b/application/controllers/admin/database.php @@ -851,7 +851,11 @@ function index($sa = null) } else { - $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid)); + if(Yii::app()->request->getPost('newpage') == "return") { + $this->getController()->redirect($this->getController()->createUrl('admin/question/editquestion/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid)); + } else { + $this->getController()->redirect($this->getController()->createUrl('admin/survey/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid)); + } } } diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php index ad22ee4e7a3..be1481ffddc 100644 --- a/application/views/admin/survey/Question/editQuestion_view.php +++ b/application/views/admin/survey/Question/editQuestion_view.php @@ -14,6 +14,7 @@ eT("Edit question"); ?> +
@@ -32,7 +33,11 @@ ?>
');"> -
+
+

+ +

+
  • eT("Note: You MUST enter a new question code!"); ?> @@ -227,7 +232,6 @@

- @@ -244,8 +248,10 @@ else { ?> + -

+

+


diff --git a/scripts/admin/surveytoolbar.js b/scripts/admin/surveytoolbar.js index d19a699530b..405ad9ba84a 100644 --- a/scripts/admin/surveytoolbar.js +++ b/scripts/admin/surveytoolbar.js @@ -2,7 +2,7 @@ // based on TTabs from http://interface.eyecon.ro/ $(document).ready(function(){ - // Load the superfish menu + // Load the superfish menu $('ul.sf-menu').superfish({ speed:'fast' }); @@ -12,18 +12,18 @@ $(document).ready(function(){ { $(this).qtip({ style: { name: 'cream', - tip:true, - color:'#1D2D45', + tip:true, + color:'#1D2D45', border: { width: 1, radius: 5, color: '#EADF95'} - }, - position: { adjust: { + }, + position: { adjust: { screen: true, scroll:true }, corner: { target: 'topRight', - tooltip: 'bottomLeft'} + tooltip: 'bottomLeft'} }, show: {effect: { length:50}, delay:1000 @@ -33,5 +33,10 @@ $(document).ready(function(){ }); } - }); + }); + $(".saveandreturn").click(function() { + var form=$(this).parents('form:first'); //Get the parent form info + $("#newpage").val('return'); + form.submit(); + }); }); From 2b16a42be189559448769e8205c546f81d8b657e Mon Sep 17 00:00:00 2001 From: jcleeland Date: Sun, 22 Jul 2012 21:29:49 +1000 Subject: [PATCH 12/71] Fixed issue #6367 Participants database not importing from CSV even though CSV file in correct format --- application/controllers/admin/participantsaction.php | 4 +++- scripts/admin/displayParticipant.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php index 3c87014f038..61b7ba1ecbd 100644 --- a/application/controllers/admin/participantsaction.php +++ b/application/controllers/admin/participantsaction.php @@ -1417,6 +1417,7 @@ function uploadCSV() $imported = 0; $dupcount = 0; $overwritten = 0; + $dupreason="nameemail"; $duplicatelist = array(); $invalidemaillist = array(); $invalidformatlist = array(); @@ -1499,7 +1500,7 @@ function uploadCSV() $ignoredcolumns[] = $fieldname; } } - if ((!in_array('firstname', $firstline) || !in_array('lastname', $firstline) || !in_array('email', $firstline)) || !in_array('participant_id', $firstline)) + if ((!in_array('firstname', $firstline) && !in_array('lastname', $firstline) && !in_array('email', $firstline)) && !in_array('participant_id', $firstline)) { $recordcount = count($tokenlistarray); break; @@ -1507,6 +1508,7 @@ function uploadCSV() } else { // After looking at the first line, we now import the actual values $line = convertCSVRowToArray($buffer, $separator, '"'); + if (count($firstline) != count($line)) { $invalidformatlist[] = $recordcount; diff --git a/scripts/admin/displayParticipant.js b/scripts/admin/displayParticipant.js index 2c3edae279d..ad2af270d2c 100644 --- a/scripts/admin/displayParticipant.js +++ b/scripts/admin/displayParticipant.js @@ -109,6 +109,7 @@ $(document).ready(function() { /* The main jqGrid, displaying Participants */ jQuery("#displayparticipants").jqGrid({ align:"center", + headertitles: true, url: jsonUrl, editurl: editUrl, datatype: "json", From 383e06f6060795538665d7eb9abd26b160df40c8 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Sun, 22 Jul 2012 21:38:28 +1000 Subject: [PATCH 13/71] Fixed issue #6368 Some older tokens tables don't have all required fields - lists, exports & searches fail - system checks for existence of fields and creates them if needed (would love confirmation from postgres db that this works ok for them) --- application/controllers/admin/tokens.php | 3 +++ application/models/Tokens_dynamic.php | 14 ++++++++++++++ scripts/admin/tokens.js | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php index ed0e269be9a..635c729d5ce 100644 --- a/application/controllers/admin/tokens.php +++ b/application/controllers/admin/tokens.php @@ -57,6 +57,9 @@ function index($iSurveyId) } else { + //Check that the tokens table has the required fields + Tokens_dynamic::model($iSurveyId)->checkColumns(); + $aData['thissurvey'] = $thissurvey; $aData['surveyid'] = $iSurveyId; $aData['queries'] = Tokens_dynamic::model($iSurveyId)->summary(); diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php index 96a39d6e75b..99b80085ca4 100644 --- a/application/models/Tokens_dynamic.php +++ b/application/models/Tokens_dynamic.php @@ -97,6 +97,20 @@ public function summary() return $data; } + /** + * Checks to make sure that all required columns exist in this tokens table + * (some older tokens tables dont' get udated properly) + * + */ + public function checkColumns() { + $sid = self::$sid; + $surveytable='{{tokens_'.$sid.'}}'; + $columns = Yii::app()->db->schema->getTable($surveytable)->getColumnNames(); + if(!in_array('participant_id', $columns)) Yii::app()->db->createCommand()->addColumn($surveytable, "participant_id", "text null"); + if(!in_array('validuntil', $columns)) Yii::app()->db->createCommand()->addColumn($surveytable, 'validuntil', 'date null'); + if(!in_array('validfrom', $columns)) Yii::app()->db->createCommand()->addColumn($surveytable, 'validfrom', 'date null'); + } + public function findUninvited($aTokenIds = false, $iMaxEmails = 0, $bEmail = true, $SQLemailstatuscondition = '', $SQLremindercountcondition = '', $SQLreminderdelaycondition = '') { $emquery = "SELECT * FROM {{tokens_" . self::$sid . "}} WHERE ((completed ='N') or (completed='')) AND token <> '' AND email <> ''"; diff --git a/scripts/admin/tokens.js b/scripts/admin/tokens.js index 9afcd64acc5..4930be2c684 100644 --- a/scripts/admin/tokens.js +++ b/scripts/admin/tokens.js @@ -110,13 +110,13 @@ $(document).ready(function() { var lastSel,lastSel2; jQuery("#displaytokens").jqGrid({ align:"center", + headertitles: true, url: jsonUrl, editurl: editUrl, datatype: "json", mtype: "post", colNames : colNames, colModel: colModels, - toppager: true, height: "100%", rowNum: 25, editable:true, From 15f0f60a27e8b15528d3a0c6d02bf030e7df559d Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Sun, 22 Jul 2012 13:40:04 +0200 Subject: [PATCH 14/71] Fixed issue : Link for next/previous breaked --- .../views/admin/responses/browseallheader_view.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/admin/responses/browseallheader_view.php b/application/views/admin/responses/browseallheader_view.php index 1aff50fbefd..987fd368122 100644 --- a/application/views/admin/responses/browseallheader_view.php +++ b/application/views/admin/responses/browseallheader_view.php @@ -11,15 +11,15 @@
- + <?php $clang->eT("Show start..."); ?> - + <?php $clang->eT("Show previous.."); ?> - + <?php $clang->eT("Show next.."); ?> - + <?php $clang->eT("Show last.."); ?> -
+ eT("Records displayed:"); ?>    eT("Starting from:"); ?> @@ -63,7 +63,7 @@
- + From 54251ad2b4ab57c1b3d4377386327c8221d90d37 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Sun, 22 Jul 2012 22:21:33 +1000 Subject: [PATCH 15/71] New feature: dropdown inline search options for jqGrid survey list (useful for active/expired/inactive) --- .../views/admin/survey/listSurveys_view.php | 11 +++++++++ scripts/admin/listsurvey.js | 24 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/application/views/admin/survey/listSurveys_view.php b/application/views/admin/survey/listSurveys_view.php index c2d6fd10284..5a54e5accac 100644 --- a/application/views/admin/survey/listSurveys_view.php +++ b/application/views/admin/survey/listSurveys_view.php @@ -24,4 +24,15 @@
+ +
diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js index 5d75659841c..c2fe212a73e 100644 --- a/scripts/admin/listsurvey.js +++ b/scripts/admin/listsurvey.js @@ -148,4 +148,28 @@ $(document).ready(function(){ $('.wrapper').width($('#displaysurveys').width()*1.006); $('.footer').width(($('#displaysurveys').width()*1.006)-10); + /* Trigger the inline search when the status list changes */ + $('#gs_status_select').change(function() { + $("#gs_status").val($('#gs_status_select').val()); + var e = jQuery.Event("keydown"); + $("#gs_status").trigger(e); + }); + /* Trigger the inline search when the access list changes */ + $('#gs_access_select').change(function() { + $("#gs_access").val($('#gs_access_select').val()); + var e = jQuery.Event("keydown"); + $("#gs_access").trigger(e); + }); + /* Change the text search above "Status" icons to a dropdown */ + var parentDiv=$('#gs_status').parent(); + parentDiv.prepend($('#gs_status_select')); + $('#gs_status_select').css("display", ""); + $('#gs_status').css("display", "none"); + /* Change the text search above "Access" to a dropdown */ + var parentADiv=$('#gs_access').parent(); + parentADiv.prepend($('#gs_access_select')); + $('#gs_access_select').css("display", ""); + $('#gs_access').css("display", "none"); + + }); From 8972c76e6254ff51c67fa69445c883f86cd4e0c3 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Mon, 23 Jul 2012 08:55:38 +1000 Subject: [PATCH 16/71] Fixed issue #6354 (another typo found by SamMousa :-)) --- application/helpers/admin/import_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php index f636550f6af..6af1b61484d 100644 --- a/application/helpers/admin/import_helper.php +++ b/application/helpers/admin/import_helper.php @@ -3169,7 +3169,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= $asrowdata["sid"]=$iNewSID; unset($asrowdata["id"]); - $result=Assesments::model()->insertRecords($asrowdata) or safeDie("Couldn't insert assessment
"); + $result=Assessments::model()->insertRecords($asrowdata) or safeDie("Couldn't insert assessment
"); unset($newgid); } From 1edd37e3ebd03183151fa25e3506111d058de8f5 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Mon, 23 Jul 2012 13:30:24 +1000 Subject: [PATCH 17/71] Fixed issue #6371 Statistics not checking selected checkboxes in response filter section after displaying stats --- application/controllers/admin/statistics.php | 4 +- .../helpers/admin/statistics_helper.php | 10 +- .../views/admin/export/statistics_view.php | 107 +++++++++++------- .../survey/Question/editQuestion_view.php | 29 ++--- 4 files changed, 88 insertions(+), 62 deletions(-) diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 6d8bbec58da..dcb0083c704 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -527,10 +527,11 @@ public function run($surveyid, $subaction = null) { $usegraph = 0; } + $aData['usegraph'] = $usegraph; $outputType = $_POST['outputtype']; - switch($outputType){ + switch($outputType){ case 'html': $statisticsoutput .= generate_statistics($surveyid,$summary,$summary,$usegraph,$outputType,'DD',$statlang); break; @@ -552,6 +553,7 @@ public function run($surveyid, $subaction = null) $aData['sStatisticsLanguage']=$statlang; $aData['output'] = $statisticsoutput; + $aData['summary'] = $summary; $this->_renderWrappedTemplate('export', 'statistics_view', $aData); diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 2416ebd94fb..7a144c2219b 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -1834,8 +1834,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, { $qrow=array_values($qrow); $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND code = '{$licode}' AND language='{$language}'ORDER BY sortorder, code"; - $fresult = dbExecuteAssoc($fquery); - foreach ($result->readAll() as $frow) + $fresult = Yii::app()->db->createCommand($fquery)->query(); + foreach ($fresult->readAll() as $frow) { $alist[]=array($frow['code'], $frow['answer']); $ltext=$frow['answer']; @@ -1895,13 +1895,13 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $qresult=Yii::app()->db->createCommand($qquery)->query(); //loop through answers - foreach ($result->readAll() as $qrow) + foreach ($qresult->readAll() as $qrow) { $qrow=array_values($qrow); //this question type uses its own labels $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND language='{$language}'ORDER BY sortorder, code"; - $fresult = dbExecuteAssoc($fquery); + $fresult = Yii::app()->db->createCommand($fquery)->query(); //add code and title to results for outputting them later foreach ($fresult->readAll() as $frow) @@ -3351,7 +3351,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, //close table/output if($outputType=='html') { - if ($usegraph) { + if ($usegraph==1) { $sImgUrl = Yii::app()->getConfig('adminimageurl'); $statisticsoutput .= "
" diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index b22252b6c82..2b3798f64a5 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -25,9 +25,9 @@ $error .= '
'.$clang->gT('visit http://us2.php.net/manual/en/ref.image.php for more information').'
'; } else if (!function_exists("imageftbbox")) { - $error .= '
'.$clang->gT('You do not have the Freetype Library installed. Showing charts requires the Freetype library to function properly.'); - $error .= '
'.$clang->gT('visit http://us2.php.net/manual/en/ref.image.php for more information').'
'; - } + $error .= '
'.$clang->gT('You do not have the Freetype Library installed. Showing charts requires the Freetype library to function properly.'); + $error .= '
'.$clang->gT('visit http://us2.php.net/manual/en/ref.image.php for more information').'
'; + } ?>
eT("Data selection"); ?> @@ -145,32 +145,44 @@ > - - $flt): ?> - - - + $flt) { + if (!isset($previousquestiontype)) {$previousquestiontype="";} + if ($flt[1] != $currentgroup) { + if ($currentgroup!='') { ?>
- +
- - (gT("Question group").$flt[1]; ?>) + + + + + + (gT("Question group").$flt[1]; ?>) +
-
- - - - - '> +
+ + + $previousquestiontype == ";")) { ?> - - - - + { ?>
- - + /> + || array_search("N{$surveyid}X{$flt[1]}X{$flt[0]}", $summary) !== FALSE)) { echo " checked='checked'"; } + ?> />
- multiple='multiple'> + "; echo " - +
diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php index be1481ffddc..5aaf9a64b59 100644 --- a/application/views/admin/survey/Question/editQuestion_view.php +++ b/application/views/admin/survey/Question/editQuestion_view.php @@ -33,25 +33,26 @@ ?> ');"> -
+

+
-
  • - eT("Note: You MUST enter a new question code!"); ?> -
  • - - - gT("Question:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?> -
  • - - - gT("Help:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?> -
    • -
-
+
  • + eT("Note: You MUST enter a new question code!"); ?> +
  • + + + gT("Question:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?> +
  • + + + gT("Help:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?> +
    • +
+
Date: Mon, 23 Jul 2012 09:16:27 +0200 Subject: [PATCH 18/71] Fixed issue #6350: Error html_entity_decode(): charset `ANSI_X3.4-1968' not supported, assuming iso-8859-1 on survey save when sending confirmation email --- application/helpers/frontend_helper.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php index a7088c2795c..f79e4c46462 100644 --- a/application/helpers/frontend_helper.php +++ b/application/helpers/frontend_helper.php @@ -9,9 +9,8 @@ * is derivative of works licensed under the GNU General Public License or * other free or open source software licenses. * See COPYRIGHT.php for copyright notices and details. - * - * $Id$ */ + function loadanswers() { global $surveyid; @@ -1020,13 +1019,13 @@ function remove_nulls_from_array($array) */ function submittokens($quotaexit=false) { - global $thissurvey, $timeadjust, $emailcharset ; + global $thissurvey; global $surveyid; global $thistpl, $clienttoken; $clang = Yii::app()->lang; $sitename = Yii::app()->getConfig("sitename"); - + $emailcharset = Yii::app()->getConfig("emailcharset"); // Shift the date due to global timeadjust setting $today = dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i", Yii::app()->getConfig("timeadjust")); @@ -1163,7 +1162,6 @@ function submittokens($quotaexit=false) function sendSubmitNotifications($surveyid) { global $thissurvey, $debug; - global $emailcharset; global $homeurl, $maildebug, $tokensexist; $clang = Yii::app()->lang; From 5013658875c2433aef4440314696ad267ee0b616 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Mon, 23 Jul 2012 09:54:17 +0200 Subject: [PATCH 19/71] Fixed issue #6347: display of question text different in 1.92+ and 2.0 when view question in admin mode Dev Partial fix --- application/core/Survey_Common_Action.php | 1 - .../views/admin/survey/Question/questionbar_view.php | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php index 1fc861e70e9..1480b31a3a8 100644 --- a/application/core/Survey_Common_Action.php +++ b/application/core/Survey_Common_Action.php @@ -352,7 +352,6 @@ function _questionbar($iSurveyId, $gid, $qid, $action = null) foreach ($qrresult as $qrrow) { $qrrow = $qrrow->attributes; - $qrrow = array_map('flattenText', $qrrow); if (hasSurveyPermission($iSurveyId, 'surveycontent', 'read')) { if (count(Survey::model()->findByPk($iSurveyId)->additionalLanguages) != 0) diff --git a/application/views/admin/survey/Question/questionbar_view.php b/application/views/admin/survey/Question/questionbar_view.php index cb969b139f9..571f563af81 100644 --- a/application/views/admin/survey/Question/questionbar_view.php +++ b/application/views/admin/survey/Question/questionbar_view.php @@ -166,20 +166,20 @@ eT("Question:"); ?> eT("Help:"); ?> - eT("Validation:"); ?> + eT("Validation:"); ?> @@ -252,7 +252,7 @@ : + if ($aAdvancedSetting['i18n']==false) echo htmlspecialchars($aAdvancedSetting['value']); else echo htmlspecialchars($aAdvancedSetting[$baselang]['value'])?> From 8eec5761a017e6e93ce6cb1cab77b566eee15aba Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Mon, 23 Jul 2012 10:01:55 +0200 Subject: [PATCH 20/71] Fixed issue #6360: No Server time displayed in global settings --- application/views/admin/globalSettings_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/admin/globalSettings_view.php b/application/views/admin/globalSettings_view.php index 477c43da1e9..aa152e4ca28 100644 --- a/application/views/admin/globalSettings_view.php +++ b/application/views/admin/globalSettings_view.php @@ -178,7 +178,7 @@ session['dateformat']); ?>
  • - eT("Server time:").' '.convertDateTimeFormat(date('Y-m-d H:i:s'),'Y-m-d H:i:s',$dateformatdata['phpdate'].' H:i')." - ". $clang->gT("Corrected time :").' '.convertDateTimeFormat(dateShift(date("Y-m-d H:i:s"), 'Y-m-d H:i:s', getGlobalSetting('timeadjust')),'Y-m-d H:i:s',$dateformatdata['phpdate'].' H:i'); ?> + gT("Server time:").' '.convertDateTimeFormat(date('Y-m-d H:i:s'),'Y-m-d H:i:s',$dateformatdata['phpdate'].' H:i')." - ". $clang->gT("Corrected time :").' '.convertDateTimeFormat(dateShift(date("Y-m-d H:i:s"), 'Y-m-d H:i:s', getGlobalSetting('timeadjust')),'Y-m-d H:i:s',$dateformatdata['phpdate'].' H:i'); ?>
  • From 1ed2940a6644fda66b110b279e1d15c8159fc5bb Mon Sep 17 00:00:00 2001 From: jcleeland Date: Mon, 23 Jul 2012 22:34:39 +1000 Subject: [PATCH 21/71] Fixed issue #6372 Browse text responses does not work --- application/controllers/admin/statistics.php | 20 + .../helpers/admin/statistics_helper.php | 795 +++++++++--------- .../views/admin/export/statistics_view.php | 6 +- scripts/admin/statistics.js | 11 + styles/blobblueish/adminstyle.css | 15 + styles/gartergrey/adminstyle.css | 14 + styles/gringegreen/adminstyle.css | 16 + 7 files changed, 500 insertions(+), 377 deletions(-) diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index dcb0083c704..25d07bf1731 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -531,6 +531,9 @@ public function run($surveyid, $subaction = null) $aData['usegraph'] = $usegraph; $outputType = $_POST['outputtype']; + $selects=buildSelects($summary, $surveyid, $statlang); + $aData['sql']=implode(" AND ", $selects); + switch($outputType){ case 'html': $statisticsoutput .= generate_statistics($surveyid,$summary,$summary,$usegraph,$outputType,'DD',$statlang); @@ -559,6 +562,23 @@ public function run($surveyid, $subaction = null) } + /* Returns a simple list of values in a particular column, that meet the + * requirements of the SQL + * + * */ + function listcolumn($surveyid, $column, $sql) + { + $results=Survey_dynamic::model($surveyid)->findAll($column." != ''"); + foreach($results as $row) { + ?>
    + ' target='_blank'> +
    +
    + +
    +
    loadHelper('admin/statistics'); diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 7a144c2219b..9bf1da3a205 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -256,6 +256,232 @@ function getQuestionMapData($sField, $qsid) return $d; } +/** Builds the list of addon SQL select statements +* that builds the query result set +* +* @param $allfields +* @param $fieldmap +* @param $language +* +* @return array $selects array of individual select statements that can be added/appended to +* the 'where' portion of a SQL statement to restrict the result set +* ie: array("`FIELDNAME`='Y'", "`FIELDNAME2`='Hello'"); +* +*/ +function buildSelects($allfields, $surveyid, $language) { + + $selects=array(); + + $fieldmap=createFieldMap($surveyid, "full", false, false, $language); + + $aQuestionMap=array(); + + foreach ($fieldmap as $field) + { + if(isset($field['qid']) && $field['qid']!='') + $aQuestionMap[]=$field['sid'].'X'.$field['gid'].'X'.$field['qid']; + } + // creates array of post variable names + for (reset($_POST); $key=key($_POST); next($_POST)) { $postvars[]=$key;} + /* + * Iterate through postvars to create "nice" data for SQL later. + * + * Remember there might be some filters applied which have to be put into an SQL statement + * + * This foreach iterates through the name ($key) of each post value and builds a SELECT + * statement out of it. It returns an array called $selects[] which will have a select query + * for each filter chosen. ie: $select[0]="`74X71X428EXP` ='Y'"; + * + * This array is used later to build the overall query used to limit the number of responses + * + */ + if(isset($postvars)) + foreach ($postvars as $pv) + { + //Only do this if there is actually a value for the $pv + if (in_array($pv, $allfields) || in_array(substr($pv,1),$aQuestionMap) || in_array($pv,$aQuestionMap) || (($pv[0]=='D' || $pv[0]=='N' || $pv[0]=='K') && in_array(substr($pv,1,strlen($pv)-2),$aQuestionMap))) + { + $firstletter=substr($pv,0,1); + /* + * these question types WON'T be handled here: + * M = Multiple choice + * T - Long Free Text + * Q - Multiple Short Text + * D - Date + * N - Numerical Input + * | - File Upload + * K - Multiple Numerical Input + */ + if ($pv != "sid" && $pv != "display" && $firstletter != "M" && $firstletter != "P" && $firstletter != "T" && + $firstletter != "Q" && $firstletter != "D" && $firstletter != "N" && $firstletter != "K" && $firstletter != "|" && + $pv != "summary" && substr($pv, 0, 2) != "id" && substr($pv, 0, 9) != "datestamp") //pull out just the fieldnames + { + //put together some SQL here + $thisquestion = Yii::app()->db->quoteColumnName($pv)." IN ("; + + foreach ($_POST[$pv] as $condition) + { + $thisquestion .= "'$condition', "; + } + + $thisquestion = substr($thisquestion, 0, -2) + . ")"; + + //we collect all the to be selected data in this array + $selects[]=$thisquestion; + } + + //M - Multiple choice + //P - Multiple choice with comments + elseif ($firstletter == "M" || $firstletter == "P") + { + $mselects=array(); + //create a list out of the $pv array + list($lsid, $lgid, $lqid) = explode("X", $pv); + + $aquery="SELECT title FROM {{questions}} WHERE parent_qid=$lqid AND language='{$language}' and scale_id=0 ORDER BY question_order"; + $aresult=Yii::app()->db->createCommand($aquery)->query(); + + // go through every possible answer + foreach ($aresult->readAll() as $arow) + { + $arow=array_values($arow); + // only add condition if answer has been chosen + if (in_array($arow[0], $_POST[$pv])) + { + $mselects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)).$arow[0])." = 'Y'"; + } + } + if ($mselects) + { + $thismulti=implode(" OR ", $mselects); + $selects[]="($thismulti)"; + $mselects = ""; + } + } + + + //N - Numerical Input + //K - Multiple Numerical Input + elseif ($firstletter == "N" || $firstletter == "K") + { + //value greater than + if (substr($pv, strlen($pv)-1, 1) == "G" && $_POST[$pv] != "") + { + $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1))." > ".sanitize_int($_POST[$pv]); + } + + //value less than + if (substr($pv, strlen($pv)-1, 1) == "L" && $_POST[$pv] != "") + { + $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1))." < ".sanitize_int($_POST[$pv]); + } + } + + //| - File Upload Question Type + else if ($firstletter == "|") + { + // no. of files greater than + if (substr($pv, strlen($pv)-1, 1) == "G" && $_POST[$pv] != "") + $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1)."_filecount")." > ".sanitize_int($_POST[$pv]); + + // no. of files less than + if (substr($pv, strlen($pv)-1, 1) == "L" && $_POST[$pv] != "") + $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1)."_filecount")." < ".sanitize_int($_POST[$pv]); + } + + //"id" is a built in field, the unique database id key of each response row + elseif (substr($pv, 0, 2) == "id") + { + if (substr($pv, strlen($pv)-1, 1) == "G" && $_POST[$pv] != "") + { + $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 0, -1))." > '".$_POST[$pv]."'"; + } + if (substr($pv, strlen($pv)-1, 1) == "L" && $_POST[$pv] != "") + { + $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 0, -1))." < '".$_POST[$pv]."'"; + } + } + + //T - Long Free Text + //Q - Multiple Short Text + elseif (($firstletter == "T" || $firstletter == "Q" ) && $_POST[$pv] != "") + { + $selectSubs = array(); + //We intepret and * and % as wildcard matches, and use ' OR ' and , as the seperators + $pvParts = explode(",",str_replace('*','%', str_replace(' OR ',',',$_POST[$pv]))); + if(is_array($pvParts) AND count($pvParts)){ + foreach($pvParts AS $pvPart){ + $selectSubs[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)))." LIKE '".trim($pvPart)."'"; + } + if(count($selectSubs)){ + $selects[] = ' ('.implode(' OR ',$selectSubs).') '; + } + } + } + + //D - Date + elseif ($firstletter == "D" && $_POST[$pv] != "") + { + //Date equals + if (substr($pv, -1, 1) == "eq") + { + $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)-2))." = '".$_POST[$pv]."'"; + } + else + { + //date less than + if (substr($pv, -1, 1) == "less") + { + $selects[]= Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)-2)) . " >= '".$_POST[$pv]."'"; + } + + //date greater than + if (substr($pv, -1, 1) == "more") + { + $selects[]= Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)-2)) . " <= '".$_POST[$pv]."'"; + } + } + } + + //check for datestamp of given answer + elseif (substr($pv, 0, 9) == "datestamp") + { + //timestamp equals + $formatdata=getDateFormatData(Yii::app()->session['dateformat']); + if (substr($pv, -1, 1) == "E" && !empty($_POST[$pv])) + { + $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i'); + $_POST[$pv]=$datetimeobj->convert("Y-m-d"); + + $selects[] = Yii::app()->db->quoteColumnName('datestamp')." >= '".$_POST[$pv]." 00:00:00' and ".Yii::app()->db->quoteColumnName('datestamp')." <= '".$_POST[$pv]." 23:59:59'"; + } + else + { + //timestamp less than + if (substr($pv, -1, 1) == "L" && !empty($_POST[$pv])) + { + $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i'); + $_POST[$pv]=$datetimeobj->convert("Y-m-d H:i:s"); + $selects[]= Yii::app()->db->quoteColumnName('datestamp')." < '".$_POST[$pv]."'"; + } + + //timestamp greater than + if (substr($pv, -1, 1) == "G" && !empty($_POST[$pv])) + { + $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i'); + $_POST[$pv]=$datetimeobj->convert("Y-m-d H:i:s"); + $selects[]= Yii::app()->db->quoteColumnName('datestamp')." > '".$_POST[$pv]."'"; + } + } + } + } + + } //end foreach -> loop through filter options to create SQL + + return $selects; + +} /** * Generates statistics @@ -301,8 +527,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $statlang = new Limesurvey_lang($statlangcode); } - $fieldmap=createFieldMap($surveyid, "full", false, false, $statlang->getlangcode()); - /* * this variable is used in the function shortencode() which cuts off a question/answer title * after $maxchars and shows the rest as tooltip (in html mode) @@ -324,6 +548,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $surveylanguagecodes = Survey::model()->findByPk($surveyid)->additionalLanguages; $surveylanguagecodes[] = Survey::model()->findByPk($surveyid)->language; + $fieldmap=createFieldMap($surveyid, "full", false, false, $statlang->getlangcode()); + // Set language for questions and answers to base language of this survey $language=$statlangcode; @@ -452,254 +678,54 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, // set default monospaced font $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED); - //set margins - $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT); - $pdf->SetHeaderMargin(PDF_MARGIN_HEADER); - $pdf->SetFooterMargin(PDF_MARGIN_FOOTER); - - //set auto page breaks - $pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM); - - //set image scale factor - $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); - - //set some language-dependent strings - $pdf->setLanguageArray($l); - } - if($outputType=='xls') - { - /** - * Initiate the Spreadsheet_Excel_Writer - */ - Yii::import('application.libraries.admin.pear.Spreadsheet.Excel.Xlswriter', true); - if($pdfOutput=='F') - $workbook = new Xlswriter($tempdir.'/statistic-survey'.$surveyid.'.xls'); - else - $workbook = new Xlswriter(); - - $workbook->setVersion(8); - // Inform the module that our data will arrive as UTF-8. - // Set the temporary directory to avoid PHP error messages due to open_basedir restrictions and calls to tempnam("", ...) - if (!empty($tempdir)) { - $workbook->setTempDir($tempdir); - } - if ($pdfOutput!='F') - $workbook->send('statistic-survey'.$surveyid.'.xls'); - - // Creating the first worksheet - $sheet =& $workbook->addWorksheet(utf8_decode('results-survey'.$surveyid)); - $sheet->setInputEncoding('utf-8'); - $sheet->setColumn(0,20,20); - $separator="~|"; - /**XXX*/ - } - /** - * Start generating - */ - - // creates array of post variable names - for (reset($_POST); $key=key($_POST); next($_POST)) { $postvars[]=$key;} - - $aQuestionMap=array(); - foreach ($fieldmap as $field) - { - if(isset($field['qid']) && $field['qid']!='') - $aQuestionMap[]=$field['sid'].'X'.$field['gid'].'X'.$field['qid']; - } - - /* - * Iterate through postvars to create "nice" data for SQL later. - * - * Remember there might be some filters applied which have to be put into an SQL statement - */ - if(isset($postvars)) - - foreach ($postvars as $pv) - { - //Only do this if there is actually a value for the $pv - if (in_array($pv, $allfields) || in_array(substr($pv,1),$aQuestionMap) || in_array($pv,$aQuestionMap) || (($pv[0]=='D' || $pv[0]=='N' || $pv[0]=='K') && in_array(substr($pv,1,strlen($pv)-2),$aQuestionMap))) - { - $firstletter=substr($pv,0,1); - /* - * these question types WON'T be handled here: - * M = Multiple choice - * T - Long Free Text - * Q - Multiple Short Text - * D - Date - * N - Numerical Input - * | - File Upload - * K - Multiple Numerical Input - */ - if ($pv != "sid" && $pv != "display" && $firstletter != "M" && $firstletter != "P" && $firstletter != "T" && - $firstletter != "Q" && $firstletter != "D" && $firstletter != "N" && $firstletter != "K" && $firstletter != "|" && - $pv != "summary" && substr($pv, 0, 2) != "id" && substr($pv, 0, 9) != "datestamp") //pull out just the fieldnames - { - //put together some SQL here - $thisquestion = Yii::app()->db->quoteColumnName($pv)." IN ("; - - foreach ($_POST[$pv] as $condition) - { - $thisquestion .= "'$condition', "; - } - - $thisquestion = substr($thisquestion, 0, -2) - . ")"; - - //we collect all the to be selected data in this array - $selects[]=$thisquestion; - } - - //M - Multiple choice - //P - Multiple choice with comments - elseif ($firstletter == "M" || $firstletter == "P") - { - $mselects=array(); - //create a list out of the $pv array - list($lsid, $lgid, $lqid) = explode("X", $pv); - - $aquery="SELECT title FROM {{questions}} WHERE parent_qid=$lqid AND language='{$language}' and scale_id=0 ORDER BY question_order"; - $aresult=Yii::app()->db->createCommand($aquery)->query(); - - // go through every possible answer - foreach ($aresult->readAll() as $arow) - { - $arow=array_values($arow); - // only add condition if answer has been chosen - if (in_array($arow[0], $_POST[$pv])) - { - $mselects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)).$arow[0])." = 'Y'"; - } - } - if ($mselects) - { - $thismulti=implode(" OR ", $mselects); - $selects[]="($thismulti)"; - $mselects = ""; - } - } - - - //N - Numerical Input - //K - Multiple Numerical Input - elseif ($firstletter == "N" || $firstletter == "K") - { - //value greater than - if (substr($pv, strlen($pv)-1, 1) == "G" && $_POST[$pv] != "") - { - $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1))." > ".sanitize_int($_POST[$pv]); - } - - //value less than - if (substr($pv, strlen($pv)-1, 1) == "L" && $_POST[$pv] != "") - { - $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1))." < ".sanitize_int($_POST[$pv]); - } - } - - //| - File Upload Question Type - else if ($firstletter == "|") - { - // no. of files greater than - if (substr($pv, strlen($pv)-1, 1) == "G" && $_POST[$pv] != "") - $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1)."_filecount")." > ".sanitize_int($_POST[$pv]); - - // no. of files less than - if (substr($pv, strlen($pv)-1, 1) == "L" && $_POST[$pv] != "") - $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1)."_filecount")." < ".sanitize_int($_POST[$pv]); - } + //set margins + $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT); + $pdf->SetHeaderMargin(PDF_MARGIN_HEADER); + $pdf->SetFooterMargin(PDF_MARGIN_FOOTER); - //"id" is a built in field, the unique database id key of each response row - elseif (substr($pv, 0, 2) == "id") - { - if (substr($pv, strlen($pv)-1, 1) == "G" && $_POST[$pv] != "") - { - $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 0, -1))." > '".$_POST[$pv]."'"; - } - if (substr($pv, strlen($pv)-1, 1) == "L" && $_POST[$pv] != "") - { - $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 0, -1))." < '".$_POST[$pv]."'"; - } - } + //set auto page breaks + $pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM); - //T - Long Free Text - //Q - Multiple Short Text - elseif (($firstletter == "T" || $firstletter == "Q" ) && $_POST[$pv] != "") - { - $selectSubs = array(); - //We intepret and * and % as wildcard matches, and use ' OR ' and , as the seperators - $pvParts = explode(",",str_replace('*','%', str_replace(' OR ',',',$_POST[$pv]))); - if(is_array($pvParts) AND count($pvParts)){ - foreach($pvParts AS $pvPart){ - $selectSubs[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)))." LIKE '".trim($pvPart)."'"; - } - if(count($selectSubs)){ - $selects[] = ' ('.implode(' OR ',$selectSubs).') '; - } - } - } + //set image scale factor + $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); - //D - Date - elseif ($firstletter == "D" && $_POST[$pv] != "") - { - //Date equals - if (substr($pv, -1, 1) == "eq") - { - $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)-2))." = '".$_POST[$pv]."'"; - } - else - { - //date less than - if (substr($pv, -1, 1) == "less") - { - $selects[]= Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)-2)) . " >= '".$_POST[$pv]."'"; - } + //set some language-dependent strings + $pdf->setLanguageArray($l); + } + if($outputType=='xls') + { + /** + * Initiate the Spreadsheet_Excel_Writer + */ + Yii::import('application.libraries.admin.pear.Spreadsheet.Excel.Xlswriter', true); + if($pdfOutput=='F') + $workbook = new Xlswriter($tempdir.'/statistic-survey'.$surveyid.'.xls'); + else + $workbook = new Xlswriter(); - //date greater than - if (substr($pv, -1, 1) == "more") - { - $selects[]= Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)-2)) . " <= '".$_POST[$pv]."'"; - } - } - } + $workbook->setVersion(8); + // Inform the module that our data will arrive as UTF-8. + // Set the temporary directory to avoid PHP error messages due to open_basedir restrictions and calls to tempnam("", ...) + if (!empty($tempdir)) { + $workbook->setTempDir($tempdir); + } + if ($pdfOutput!='F') + $workbook->send('statistic-survey'.$surveyid.'.xls'); - //check for datestamp of given answer - elseif (substr($pv, 0, 9) == "datestamp") - { - //timestamp equals - $formatdata=getDateFormatData(Yii::app()->session['dateformat']); - if (substr($pv, -1, 1) == "E" && !empty($_POST[$pv])) - { - $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i'); - $_POST[$pv]=$datetimeobj->convert("Y-m-d"); + // Creating the first worksheet + $sheet =& $workbook->addWorksheet(utf8_decode('results-survey'.$surveyid)); + $sheet->setInputEncoding('utf-8'); + $sheet->setColumn(0,20,20); + $separator="~|"; + /**XXX*/ + } + /** + * Start generating + */ - $selects[] = Yii::app()->db->quoteColumnName('datestamp')." >= '".$_POST[$pv]." 00:00:00' and ".Yii::app()->db->quoteColumnName('datestamp')." <= '".$_POST[$pv]." 23:59:59'"; - } - else - { - //timestamp less than - if (substr($pv, -1, 1) == "L" && !empty($_POST[$pv])) - { - $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i'); - $_POST[$pv]=$datetimeobj->convert("Y-m-d H:i:s"); - $selects[]= Yii::app()->db->quoteColumnName('datestamp')." < '".$_POST[$pv]."'"; - } - //timestamp greater than - if (substr($pv, -1, 1) == "G" && !empty($_POST[$pv])) - { - $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i'); - $_POST[$pv]=$datetimeobj->convert("Y-m-d H:i:s"); - $selects[]= Yii::app()->db->quoteColumnName('datestamp')." > '".$_POST[$pv]."'"; - } - } - } - } - else - { - $statisticsoutput .= ""; - } - } //end foreach -> loop through filter options to create SQL + $selects=buildSelects($allfields, $surveyid, $language); //count number of answers $query = "SELECT count(*) FROM {{survey_$surveyid}}"; @@ -800,6 +826,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, } //put everything from $selects array into a string connected by AND + //This string ($sql) can then be passed on to other functions so you can + //browse these results if (isset ($selects) && $selects) {$sql=implode(" AND ", $selects);} elseif (!empty($newsql)) {$sql = $newsql;} @@ -823,7 +851,11 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, } } //end if (results > 0) - //Show Summary results + /* Show Summary results + * The $summary array contains each fieldname that we want to display statistics for + * + * */ + if (isset($summary) && $summary) { //let's run through the survey @@ -842,7 +874,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $legitqids[] = $lw['qid']; } - //loop through all selected questions foreach ($runthrough as $rt) { @@ -1001,7 +1032,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, } - //RANKING OPTION THEREFORE CONFUSING + //RANKING OPTION elseif ($firstletter == "R") { //getting the needed IDs somehow @@ -1036,165 +1067,165 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, } else if ($firstletter == "|") // File UPload - { + { - //get SGQ data - list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); + //get SGQ data + list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - //select details for this question - $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + //select details for this question + $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); - //loop through question data - foreach ($nresult->readAll() as $nrow) - { - $nrow=array_values($nrow); - $qtitle=$nrow[0]; - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $qlid=$nrow[3]; - $qother=$nrow[4]; - } + //loop through question data + foreach ($nresult->readAll() as $nrow) + { + $nrow=array_values($nrow); + $qtitle=$nrow[0]; + $qtype=$nrow[1]; + $qquestion=flattenText($nrow[2]); + $qlid=$nrow[3]; + $qother=$nrow[4]; + } - /* - 4) Average size of file per respondent - 5) Average no. of files - 5) Summary/count of file types (ie: 37 jpg, 65 gif, 12 png) - 6) Total size of all files (useful if you re about to download them all) - 7) You could also add things like smallest file size, largest file size, median file size - 8) no. of files corresponding to each extension - 9) max file size - 10) min file size - */ + /* + 4) Average size of file per respondent + 5) Average no. of files + 5) Summary/count of file types (ie: 37 jpg, 65 gif, 12 png) + 6) Total size of all files (useful if you re about to download them all) + 7) You could also add things like smallest file size, largest file size, median file size + 8) no. of files corresponding to each extension + 9) max file size + 10) min file size + */ - // 1) Total number of files uploaded - // 2) Number of respondents who uploaded at least one file (with the inverse being the number of respondents who didn t upload any) - $fieldname=substr($rt, 1, strlen($rt)); - $query = "SELECT SUM(".Yii::app()->db->quoteColumnName($fieldname.'_filecount').") as sum, AVG(".Yii::app()->db->quoteColumnName($fieldname.'_filecount').") as avg FROM {{survey_$surveyid}}"; - $result=Yii::app()->db->createCommand($query)->query(); + // 1) Total number of files uploaded + // 2) Number of respondents who uploaded at least one file (with the inverse being the number of respondents who didn t upload any) + $fieldname=substr($rt, 1, strlen($rt)); + $query = "SELECT SUM(".Yii::app()->db->quoteColumnName($fieldname.'_filecount').") as sum, AVG(".Yii::app()->db->quoteColumnName($fieldname.'_filecount').") as avg FROM {{survey_$surveyid}}"; + $result=Yii::app()->db->createCommand($query)->query(); - $showem = array(); + $showem = array(); - foreach ($result->readAll() as $row) - { - $showem[]=array($statlang->gT("Total number of files"), $row['sum']); - $showem[]=array($statlang->gT("Average no. of files per respondent"), $row['avg']); - } + foreach ($result->readAll() as $row) + { + $showem[]=array($statlang->gT("Total number of files"), $row['sum']); + $showem[]=array($statlang->gT("Average no. of files per respondent"), $row['avg']); + } - $query = "SELECT ". $fieldname ." as json FROM {{survey_$surveyid}}"; - $result=Yii::app()->db->createCommand($query)->query(); + $query = "SELECT ". $fieldname ." as json FROM {{survey_$surveyid}}"; + $result=Yii::app()->db->createCommand($query)->query(); - $responsecount = 0; - $filecount = 0; - $size = 0; + $responsecount = 0; + $filecount = 0; + $size = 0; - foreach ($result->readAll() as $row) - { + foreach ($result->readAll() as $row) + { - $json = $row['json']; - $phparray = json_decode($json); + $json = $row['json']; + $phparray = json_decode($json); - foreach ($phparray as $metadata) - { - $size += (int) $metadata->size; - $filecount++; - } - $responsecount++; + foreach ($phparray as $metadata) + { + $size += (int) $metadata->size; + $filecount++; } - $showem[] = array($statlang->gT("Total size of files"), $size." KB"); - $showem[] = array($statlang->gT("Average file size"), $size/$filecount . " KB"); - $showem[] = array($statlang->gT("Average size per respondent"), $size/$responsecount . " KB"); - - /* $query="SELECT title, question FROM {{questions}} WHERE parent_qid='$qqid' AND language='{$language}' ORDER BY question_order"; - $result=db_execute_num($query) or safeDie("Couldn't get list of subquestions for multitype
    $query
    "); + $responsecount++; + } + $showem[] = array($statlang->gT("Total size of files"), $size." KB"); + $showem[] = array($statlang->gT("Average file size"), $size/$filecount . " KB"); + $showem[] = array($statlang->gT("Average size per respondent"), $size/$responsecount . " KB"); - //loop through multiple answers - while ($row=$result->FetchRow()) - { - $mfield=substr($rt, 1, strlen($rt))."$row[0]"; + /* $query="SELECT title, question FROM {{questions}} WHERE parent_qid='$qqid' AND language='{$language}' ORDER BY question_order"; + $result=db_execute_num($query) or safeDie("Couldn't get list of subquestions for multitype
    $query
    "); - //create an array containing answer code, answer and fieldname(??) - $alist[]=array("$row[0]", flattenText($row[1]), $mfield); - } + //loop through multiple answers + while ($row=$result->FetchRow()) + { + $mfield=substr($rt, 1, strlen($rt))."$row[0]"; - */ - //outputting - switch($outputType) - { - case 'xls': + //create an array containing answer code, answer and fieldname(??) + $alist[]=array("$row[0]", flattenText($row[1]), $mfield); + } - $headXLS = array(); - $tableXLS = array(); - $footXLS = array(); + */ + //outputting + switch($outputType) + { + case 'xls': - $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); - $xlsDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); - ++$xlsRow; - ++$xlsRow; + $headXLS = array(); + $tableXLS = array(); + $footXLS = array(); - ++$xlsRow; - $sheet->write($xlsRow, 0,$xlsTitle); - ++$xlsRow; - $sheet->write($xlsRow, 0,$xlsDesc); + $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); + $xlsDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); + ++$xlsRow; + ++$xlsRow; - $headXLS[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); - ++$xlsRow; - $sheet->write($xlsRow, 0,$statlang->gT("Calculation")); - $sheet->write($xlsRow, 1,$statlang->gT("Result")); + ++$xlsRow; + $sheet->write($xlsRow, 0,$xlsTitle); + ++$xlsRow; + $sheet->write($xlsRow, 0,$xlsDesc); - break; - case 'pdf': + $headXLS[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); + ++$xlsRow; + $sheet->write($xlsRow, 0,$statlang->gT("Calculation")); + $sheet->write($xlsRow, 1,$statlang->gT("Result")); - $headPDF = array(); - $tablePDF = array(); - $footPDF = array(); + break; + case 'pdf': - $pdfTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); - $titleDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); + $headPDF = array(); + $tablePDF = array(); + $footPDF = array(); - $headPDF[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); + $pdfTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); + $titleDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); - break; + $headPDF[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); - case 'html': + break; - $statisticsoutput .= "\n\n" - ."\t\n" - ."\t\n" - ."\t\n\t\t\n" - ."\t\t\n" - ."\t\n"; + case 'html': - foreach ($showem as $res) - $statisticsoutput .= ""; - break; + $statisticsoutput .= "\n
    ".sprintf($statlang->gT("Field summary for %s"),$qtitle).":" - ."
    $qquestion
    " - .$statlang->gT("Calculation")."" - .$statlang->gT("Result")."
    ".$res[0]."".$res[1]."
    \n" + ."\t\n" + ."\t\n" + ."\t\n\t\t\n" + ."\t\t\n" + ."\t\n"; + + foreach ($showem as $res) + $statisticsoutput .= ""; + break; - default: - break; - } + default: + break; } + } - //N = numerical input - //K = multiple numerical input - elseif ($firstletter == "N" || $firstletter == "K") //NUMERICAL TYPE + //N = numerical input + //K = multiple numerical input + elseif ($firstletter == "N" || $firstletter == "K") //NUMERICAL TYPE + { + //Zero handling + if (!isset($excludezeros)) //If this hasn't been set, set it to on as default: { - //Zero handling - if (!isset($excludezeros)) //If this hasn't been set, set it to on as default: - { - $excludezeros=1; - } - //check last character, greater/less/equals don't need special treatment - if (substr($rt, -1) == "G" || substr($rt, -1) == "L" || substr($rt, -1) == "=") + $excludezeros=1; + } + //check last character, greater/less/equals don't need special treatment + if (substr($rt, -1) == "G" || substr($rt, -1) == "L" || substr($rt, -1) == "=") { //DO NOTHING } else { - $showem = array(); + $showem = array(); //create SGQ identifier list($qsid, $qgid, $qqid) = explode("X", $rt, 3); @@ -1694,7 +1725,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, */ } - // NICE SIMPLE SINGLE OPTION ANSWERS else { @@ -2122,7 +2152,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, //loop thorugh the array which contains all answer data foreach ($alist as $al) { - //picks out alist that come from the multiple list above + //picks out answer list ($alist/$al)) that come from the multiple list above if (isset($al[2]) && $al[2]) { //handling for "other" option @@ -2271,7 +2301,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $TotalCompleted -=$row[0]; } $fname="$al[1]"; - if ($browse===true) $fname .= " "; + if ($browse===true) $fname .= " "; } /* @@ -2291,9 +2322,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, if ($al[0] == "Answers") { $fname= "$al[1]"; - if ($browse===true) $fname .= " "; + if ($browse===true) $fname .= " "; } elseif ($al[0] == "NoAnswer") { @@ -2669,10 +2699,19 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, * 3 (25%) = percentage */ $statisticsoutput .= "\t\n\t\t\n" + ."\t\t\n"; + /* + * If there is a "browse" button in this label, let's make sure there's an extra row afterwards + * to store the columnlist + * + * */ + if(strpos($label[$i], "class='statisticsbrowsebutton'")) + { + $extraline="\n"; + } //output absolute number of records - ."\t\t"; + $statisticsoutput .= "\t\t"; //no data @@ -2711,8 +2750,10 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, } elseif ($qtype == "S" || $qtype == "U" || $qtype == "T" || $qtype == "Q") { - $statisticsoutput .= "\n\t\n"; + $statisticsoutput .= "\n\t"; } + $statisticsoutput .= "\n"; //Close the row + if(isset($extraline)) {$statisticsoutput .= $extraline;} break; default: @@ -3110,6 +3151,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $statisticsoutput .= "\t\t"; //end output per line. there has to be a whitespace within the table cell to display correctly $statisticsoutput .= "\t\t \n\t\n"; + if(isset($extraline)) {$statisticsoutput .= $extraline;} break; default: @@ -3128,6 +3170,9 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $itemcounter++; + //Clear extraline + unset($extraline); + } //end while //only show additional values when this setting is enabled diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index 2b3798f64a5..752f6b6b527 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -8,6 +8,8 @@ ?>
    @@ -15,7 +17,7 @@ eT("General filters"); ?>
    -
    ".sprintf($statlang->gT("Field summary for %s"),$qtitle).":" + ."
    $qquestion
    " + .$statlang->gT("Calculation")."" + .$statlang->gT("Result")."
    ".$res[0]."".$res[1]."
    " . $label[$i] ."\n" - ."\t\t
    " . $grawdata[$i] . "\n" . $grawdata[$i] . "\n
    > diff --git a/scripts/admin/statistics.js b/scripts/admin/statistics.js index 76692f3ea5b..9df9b863b25 100644 --- a/scripts/admin/statistics.js +++ b/scripts/admin/statistics.js @@ -1,4 +1,14 @@ $(document).ready(function(){ + $('.statisticsbrowsebutton').click( function(){ + var destinationdiv=$('#columnlist_'+this.id); + destinationdiv.parents("td:first").toggle(); + if(destinationdiv.parents("td:first").css("display") != "none") { + $.post(listColumnUrl+'/'+this.id+'/sql/'+sql, function(data) { + destinationdiv.html(data); + }); + } + + }); $('#usegraph').click( function(){ if ($('#grapherror').length>0) { @@ -360,4 +370,5 @@ function changeGraphType (cmd, id) { $("#statzone_" + id + " .wait").remove(); $("#statzone_" + id + ">img:first").attr("src", temppath +"/"+data.chartdata); }); + } diff --git a/styles/blobblueish/adminstyle.css b/styles/blobblueish/adminstyle.css index cc42b035e98..efc0d525327 100644 --- a/styles/blobblueish/adminstyle.css +++ b/styles/blobblueish/adminstyle.css @@ -961,6 +961,21 @@ table.statisticstable, table.statisticssummary { text-align:center; } +.statisticsbrowsecolumn { + text-align: left; + width: 100%; +} +.statisticscolumnid { + float: left; + text-align: center; + width: 9%; + padding-right: 4px; +} +.statisticscolumndata { + float: left; + width: 89%; +} + div.messagebox { width: 550px; margin:10px auto; diff --git a/styles/gartergrey/adminstyle.css b/styles/gartergrey/adminstyle.css index 8f60568810c..04ff0ce262e 100644 --- a/styles/gartergrey/adminstyle.css +++ b/styles/gartergrey/adminstyle.css @@ -665,6 +665,20 @@ div.messagebox .warningheader { padding:3px 10px; } +.statisticsbrowsecolumn { + text-align: left; + width: 100%; +} +.statisticscolumnid { + float: left; + text-align: center; + width: 9%; + padding-right: 4px; +} +.statisticscolumndata { + float: left; + width: 89%; +} .conditionlist, .conditionlist table, diff --git a/styles/gringegreen/adminstyle.css b/styles/gringegreen/adminstyle.css index df68966b0f2..6061782336c 100644 --- a/styles/gringegreen/adminstyle.css +++ b/styles/gringegreen/adminstyle.css @@ -986,6 +986,22 @@ table.statisticstable, table.statisticssummary { text-align:center; } +.statisticsbrowsecolumn { + text-align: left; + width: 100%; + background-color: #EFFBDB; +} +.statisticscolumnid { + float: left; + text-align: center; + width: 9%; + padding-right: 4px; +} +.statisticscolumndata { + float: left; + width: 89%; +} + div.messagebox { width: 550px; margin:10px auto; From 1b837e94e66b42bc553d88fb84f2ec51eb887c41 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Mon, 23 Jul 2012 15:22:32 +0200 Subject: [PATCH 22/71] Fixed issue #6348: Bar chart not translated in statistics when changing statistics language --- .../helpers/admin/statistics_helper.php | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 9bf1da3a205..a74242d9e77 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -17,8 +17,8 @@ /** * * Generate a chart for a question -* @param mixed $qid ID of the question -* @param mixed $sid ID of the survey +* @param mixed $iQuestionID ID of the question +* @param mixed $iSurveyID ID of the survey * @param mixed $type Type of the chart to be created * @param mixed $cache * @param mixed $lbl @@ -27,7 +27,7 @@ * @param mixed $cache * @return Name */ -function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache) +function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $cache) { $rootdir = Yii::app()->getConfig("rootdir"); $homedir = Yii::app()->getConfig("homedir"); @@ -36,7 +36,7 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache) $scriptname = Yii::app()->getConfig("scriptname"); $chartfontfile = Yii::app()->getConfig("chartfontfile"); $chartfontsize = Yii::app()->getConfig("chartfontsize"); - $language = Survey::model()->findByPk($sid)->language; + $language = Survey::model()->findByPk($iSurveyID)->language; if ($chartfontfile=='auto') { @@ -114,9 +114,9 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache) $counter++; } - if ($cache->IsInCache("graph".$sid,$DataSet->GetData())) + if ($cache->IsInCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())) { - $cachefilename=basename($cache->GetFileFromCache("graph".$sid,$DataSet->GetData())); + $cachefilename=basename($cache->GetFileFromCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())); } else { @@ -146,8 +146,8 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache) $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile, $chartfontsize); $graph->drawLegend(510,30,$DataSet->GetDataDescription(),255,255,255); - $cache->WriteToCache("graph".$sid,$DataSet->GetData(),$graph); - $cachefilename=basename($cache->GetFileFromCache("graph".$sid,$DataSet->GetData())); + $cache->WriteToCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData(),$graph); + $cachefilename=basename($cache->GetFileFromCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())); unset($graph); } } //end if (bar chart) @@ -203,9 +203,9 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache) $DataSet->AddAllSeries(); $DataSet->SetAbsciseLabelSerie("Serie2"); - if ($cache->IsInCache("graph".$sid, $DataSet->GetData())) + if ($cache->IsInCache("graph".$statlang->langcode.$iSurveyID, $DataSet->GetData())) { - $cachefilename=basename($cache->GetFileFromCache("graph".$sid,$DataSet->GetData())); + $cachefilename=basename($cache->GetFileFromCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())); } else { @@ -221,8 +221,8 @@ function createChart($qid, $sid, $type, $lbl, $gdata, $grawdata, $cache) $graph->drawPieGraph($DataSet->GetData(),$DataSet->GetDataDescription(),225,round($gheight/2),170,PIE_PERCENTAGE,TRUE,50,20,5); $graph->setFontProperties($rootdir."/fonts/".$chartfontfile,$chartfontsize); $graph->drawPieLegend(430,12,$DataSet->GetData(),$DataSet->GetDataDescription(),250,250,250); - $cache->WriteToCache("graph".$sid,$DataSet->GetData(),$graph); - $cachefilename=basename($cache->GetFileFromCache("graph".$sid,$DataSet->GetData())); + $cache->WriteToCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData(),$graph); + $cachefilename=basename($cache->GetFileFromCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())); unset($graph); } } //end else -> pie charts @@ -984,13 +984,13 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, while (!in_array ($tmpqid,$legitqids)) $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1); //length of QID - $qidlength=strlen($tmpqid); + $iQuestionIDlength=strlen($tmpqid); //we somehow get the answer code (see SQL later) from the $qqid - $qaid=substr($qqid, $qidlength, strlen($qqid)-$qidlength); + $qaid=substr($qqid, $iQuestionIDlength, strlen($qqid)-$iQuestionIDlength); //get some question data - $nquery = "SELECT title, type, question, other FROM {{questions}} WHERE qid='".substr($qqid, 0, $qidlength)."' AND parent_qid=0 AND language='{$language}'"; + $nquery = "SELECT title, type, question, other FROM {{questions}} WHERE qid='".substr($qqid, 0, $iQuestionIDlength)."' AND parent_qid=0 AND language='{$language}'"; $nresult = Yii::app()->db->createCommand($nquery)->query(); //more substrings @@ -1006,7 +1006,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, } //get answers - $qquery = "SELECT title as code, question as answer FROM {{questions}} WHERE parent_qid='".substr($qqid, 0, $qidlength)."' AND title='$qaid' AND language='{$language}' ORDER BY question_order"; + $qquery = "SELECT title as code, question as answer FROM {{questions}} WHERE parent_qid='".substr($qqid, 0, $iQuestionIDlength)."' AND title='$qaid' AND language='{$language}' ORDER BY question_order"; $qresult=Yii::app()->db->createCommand($qquery)->query(); //loop through answer data @@ -1240,15 +1240,15 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1); //check lenght of ID - $qidlength=strlen($tmpqid); + $iQuestionIDlength=strlen($tmpqid); //get answer ID from qid - $qaid=substr($qqid, $qidlength, strlen($qqid)-$qidlength); + $qaid=substr($qqid, $iQuestionIDlength, strlen($qqid)-$iQuestionIDlength); //get question details from DB $nquery = "SELECT title, type, question, qid, parent_qid FROM {{questions}} - WHERE parent_qid=0 AND qid='".substr($qqid, 0, $qidlength)."' + WHERE parent_qid=0 AND qid='".substr($qqid, 0, $iQuestionIDlength)."' AND language='{$language}'"; $nresult = Yii::app()->db->createCommand($nquery)->query(); } @@ -1879,31 +1879,31 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, case ":": //Array (Multiple Flexi) (Numbers) - $qidattributes=getQuestionAttributeValues($qiqid); - if (trim($qidattributes['multiflexible_max'])!='') { - $maxvalue=$qidattributes['multiflexible_max']; + $aQuestionAttributes=getQuestionAttributeValues($qiqid); + if (trim($aQuestionAttributes['multiflexible_max'])!='') { + $maxvalue=$aQuestionAttributes['multiflexible_max']; } else { $maxvalue=10; } - if (trim($qidattributes['multiflexible_min'])!='') + if (trim($aQuestionAttributes['multiflexible_min'])!='') { - $minvalue=$qidattributes['multiflexible_min']; + $minvalue=$aQuestionAttributes['multiflexible_min']; } else { $minvalue=1; } - if (trim($qidattributes['multiflexible_step'])!='') + if (trim($aQuestionAttributes['multiflexible_step'])!='') { - $stepvalue=$qidattributes['multiflexible_step']; + $stepvalue=$aQuestionAttributes['multiflexible_step']; } else { $stepvalue=1; } - if ($qidattributes['multiflexible_checkbox']!=0) { + if ($aQuestionAttributes['multiflexible_checkbox']!=0) { $minvalue=0; $maxvalue=1; $stepvalue=1; @@ -1988,7 +1988,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $sSubquestion = flattenText($questionDesc["question"]); //get question attributes - $qidattributes=getQuestionAttributeValues($qqid); + $aQuestionAttributes=getQuestionAttributeValues($qqid); //check last character -> label 1 if (substr($rt,-1,1) == 0) @@ -1997,9 +1997,9 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qqid}' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, code"; //header available? - if (trim($qidattributes['dualscale_headerA'][$language])!='') { + if (trim($aQuestionAttributes['dualscale_headerA'][$language])!='') { //output - $labelheader= "[".$qidattributes['dualscale_headerA'][$language]."]"; + $labelheader= "[".$aQuestionAttributes['dualscale_headerA'][$language]."]"; } //no header @@ -2019,9 +2019,9 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qqid}' AND scale_id=1 AND language='{$language}' ORDER BY sortorder, code"; //header available? - if (trim($qidattributes['dualscale_headerB'][$language])!='') { + if (trim($aQuestionAttributes['dualscale_headerB'][$language])!='') { //output - $labelheader= "[".$qidattributes['dualscale_headerB'][$language]."]"; + $labelheader= "[".$aQuestionAttributes['dualscale_headerB'][$language]."]"; } //no header From e2aca66c357190841c1617252ec0ac74a5609bc8 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Mon, 23 Jul 2012 15:28:31 +0200 Subject: [PATCH 23/71] Fixed issue #6348: Bar chart not translated in statistics when changing statistics language --- application/helpers/admin/statistics_helper.php | 16 ++++++++-------- .../views/admin/export/statistics_view.php | 2 +- tmp/.gitignore | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index a74242d9e77..659f0ff34d7 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -114,9 +114,9 @@ function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $ $counter++; } - if ($cache->IsInCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())) + if ($cache->IsInCache("graph".$language.$iSurveyID,$DataSet->GetData())) { - $cachefilename=basename($cache->GetFileFromCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())); + $cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData())); } else { @@ -146,8 +146,8 @@ function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $ $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile, $chartfontsize); $graph->drawLegend(510,30,$DataSet->GetDataDescription(),255,255,255); - $cache->WriteToCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData(),$graph); - $cachefilename=basename($cache->GetFileFromCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())); + $cache->WriteToCache("graph".$language.$iSurveyID,$DataSet->GetData(),$graph); + $cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData())); unset($graph); } } //end if (bar chart) @@ -203,9 +203,9 @@ function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $ $DataSet->AddAllSeries(); $DataSet->SetAbsciseLabelSerie("Serie2"); - if ($cache->IsInCache("graph".$statlang->langcode.$iSurveyID, $DataSet->GetData())) + if ($cache->IsInCache("graph".$language.$iSurveyID, $DataSet->GetData())) { - $cachefilename=basename($cache->GetFileFromCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())); + $cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData())); } else { @@ -221,8 +221,8 @@ function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $ $graph->drawPieGraph($DataSet->GetData(),$DataSet->GetDataDescription(),225,round($gheight/2),170,PIE_PERCENTAGE,TRUE,50,20,5); $graph->setFontProperties($rootdir."/fonts/".$chartfontfile,$chartfontsize); $graph->drawPieLegend(430,12,$DataSet->GetData(),$DataSet->GetDataDescription(),250,250,250); - $cache->WriteToCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData(),$graph); - $cachefilename=basename($cache->GetFileFromCache("graph".$statlang->langcode.$iSurveyID,$DataSet->GetData())); + $cache->WriteToCache("graph".$language.$iSurveyID,$DataSet->GetData(),$graph); + $cachefilename=basename($cache->GetFileFromCache("graph".$language.$iSurveyID,$DataSet->GetData())); unset($graph); } } //end else -> pie charts diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index 752f6b6b527..97861b2f8c1 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -9,7 +9,7 @@
    diff --git a/tmp/.gitignore b/tmp/.gitignore index c09eefefa1f..9d875d2e4ef 100644 --- a/tmp/.gitignore +++ b/tmp/.gitignore @@ -1,3 +1,4 @@ *.html /*.lss +/*.png From 5ff46ab813a851efb0328322e6312bbc1835e086 Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Mon, 23 Jul 2012 17:55:55 +0200 Subject: [PATCH 24/71] Dev fixed issue : Bad HTML for statistics with Ranking with HTML Dev: replace htmlspecialchars by flattenText : is this good ? --- application/helpers/qanda_helper.php | 2 +- application/views/admin/export/statistics_view.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php index 36df63dab78..ee93be325c7 100644 --- a/application/helpers/qanda_helper.php +++ b/application/helpers/qanda_helper.php @@ -2112,7 +2112,7 @@ function do_ranking($ia) $answer .= SELECTED; $thisvalue=$_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]; } - $answer .=">".htmlspecialchars($ansrow['answer'], ENT_QUOTES)."\n"; + $answer .=">".flattenText($ansrow['answer'])."\n"; } $answer .=""; // Hidden form: maybe can be replaced with ranking.js diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index 97861b2f8c1..cd32c96ed2a 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -1017,7 +1017,7 @@ //pre-select if (isset($_POST[$myfield3]) && is_array($_POST[$myfield3]) && in_array("$ans[0]", $_POST[$myfield3])) {echo " selected";} - echo ">$ans[1]\n"; + echo ">".flattenText($ans[1])."\n"; } echo "\t\n\t\n"; From ad34a775ee539c5fe38c00d8908db9e758151e4f Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Mon, 23 Jul 2012 18:21:42 +0200 Subject: [PATCH 25/71] Dev: flateText an some option answer in quanda to have clean HTML --- application/helpers/qanda_helper.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php index ee93be325c7..ab9217dffb2 100644 --- a/application/helpers/qanda_helper.php +++ b/application/helpers/qanda_helper.php @@ -1427,7 +1427,7 @@ function do_list_dropdown($ia) if ($prefixStyle == 1) { $_prefix = ++$_rowNum . ') '; } - $answer .= "\n"; + $answer .= "\n"; } } else @@ -1451,7 +1451,7 @@ function do_list_dropdown($ia) foreach ($optgroups as $categoryname => $optionlistarray) { - $answer .= ' + $answer .= ' '; foreach ($optionlistarray as $optionarray) @@ -1465,7 +1465,7 @@ function do_list_dropdown($ia) $opt_select = ''; } - $answer .= ' + $answer .= ' '; } @@ -1483,7 +1483,7 @@ function do_list_dropdown($ia) $opt_select = ''; } - $answer .= ' + $answer .= ' '; } } @@ -1506,7 +1506,7 @@ function do_list_dropdown($ia) if ($prefixStyle == 1) { $_prefix = ++$_rowNum . ') '; } - $answer .= ' \n"; + $answer .= ' \n"; } if (($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] != '') && $ia[6] != 'Y' && $ia[6] != 'Y' && SHOW_NO_ANSWER == 1) @@ -5071,7 +5071,7 @@ function do_array($ia) { $answer .= SELECTED; } - $answer .= '>'.$lrow['answer']."\n"; + $answer .= '>'.flattenText($lrow['answer'])."\n"; } // If not mandatory and showanswer, show no ans if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) @@ -6517,7 +6517,7 @@ function do_array_dual($ia) { $answer .= SELECTED; } - $answer .= '>'.$lrow['title']."\n"; + $answer .= '>'.flattenText($lrow['title'])."\n"; } // If not mandatory and showanswer, show no ans if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) @@ -6571,7 +6571,7 @@ function do_array_dual($ia) { $answer .= SELECTED; } - $answer .= '>'.$lrow1['title']."\n"; + $answer .= '>'.flattenText($lrow1['title'])."\n"; } // If not mandatory and showanswer, show no ans if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) From ffd139de85d2bb1d8579f61373ee19aa88157142 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Mon, 23 Jul 2012 20:52:51 +0200 Subject: [PATCH 26/71] Fixed issue #6374: Cannot delete survey response --- application/controllers/admin/dataentry.php | 10 +- application/controllers/admin/responses.php | 54 ++-- .../admin/responses/browseallrow_view.php | 4 +- scripts/admin/browse.js | 293 +++++++++--------- 4 files changed, 187 insertions(+), 174 deletions(-) diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php index b195338626b..37aebe75fdd 100644 --- a/application/controllers/admin/dataentry.php +++ b/application/controllers/admin/dataentry.php @@ -1445,19 +1445,21 @@ public function editdata($subaction, $id, $surveyid, $language='') */ public function delete() { - $subaction = Yii::app()->request->getPost('subaction'); - $surveyid = $_REQUEST['surveyid']; + if (isset($_REQUEST['surveyid']) && !empty($_REQUEST['surveyid'])) + { + $surveyid = $_REQUEST['surveyid']; + } if (!empty($_REQUEST['sid'])) $surveyid = (int)$_REQUEST['sid']; $surveyid = sanitize_int($surveyid); - $id = Yii::app()->request->getPost('id'); + $id = $_REQUEST['id']; $aData = array( 'surveyid' => $surveyid, 'id' => $id ); - if (hasSurveyPermission($surveyid, 'responses','read') && $subaction == "delete" && hasSurveyPermission($surveyid, 'responses', 'delete')) + if (hasSurveyPermission($surveyid, 'responses','read') && hasSurveyPermission($surveyid, 'responses', 'delete')) { $surveytable = "{{survey_".$surveyid.'}}'; $aData['thissurvey'] = getSurveyInfo($surveyid); diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php index f27a1edfb77..947490eb0c7 100644 --- a/application/controllers/admin/responses.php +++ b/application/controllers/admin/responses.php @@ -294,13 +294,36 @@ public function index($iSurveyId) $aViewUrls[] = 'browseallfiltered_view'; } + $clang = $aData['clang']; + $aData['num_total_answers'] = Survey_dynamic::model($iSurveyId)->count(); + $aData['num_completed_answers'] = Survey_dynamic::model($iSurveyId)->count('submitdate IS NOT NULL'); + $aData['with_token']= Yii::app()->db->schema->getTable('{{tokens_' . $iSurveyId . '}}'); + if($aData['with_token']) + { + $aData['tokeninfo'] = Tokens_dynamic::model($iSurveyId)->summary(); + } + + $aViewUrls[] = 'browseindex_view'; + $this->_renderWrappedTemplate('',$aViewUrls, $aData); + } + + + function browse($iSurveyId) + { + $aData = $this->_getData($iSurveyId); + extract($aData); + $aViewUrls = array(); + $oBrowseLanguage = new Limesurvey_lang($aData['language']); + + + //Delete Individual answer using inrow delete buttons/links - checked if (Yii::app()->request->getPost('deleteanswer') && Yii::app()->request->getPost('deleteanswer') != '' && Yii::app()->request->getPost('deleteanswer') != 'marked' && hasSurveyPermission($iSurveyId, 'responses', 'delete')) { - $_POST['deleteanswer'] = (int) Yii::app()->request->getPost('deleteanswer'); // sanitize the value + $iResponseID = (int) Yii::app()->request->getPost('deleteanswer'); // sanitize the value // delete the files as well if its a fuqt - $fieldmap = createFieldMap($iSurveyId,'full',false,false,Yii::app()->session['browselang']); + $fieldmap = createFieldMap($iSurveyId,'full',false,false,$oBrowseLanguage->langcode); $fuqtquestions = array(); // find all fuqt questions foreach ($fieldmap as $field) @@ -329,7 +352,9 @@ public function index($iSurveyId) } // delete the row - Survey_dynamic::model($iSurveyId)->deleteAllByAttributes(array('id' => mysql_real_escape_string(Yii::app()->request->getPost('deleteanswer')))); + Survey_dynamic::model($iSurveyId)->deleteAllByAttributes(array('id' => $iResponseID)); + Yii::app()->session['flashmessage'] = sprintf($clang->gT("Response ID %s was successfully deleted."),$iResponseID); + } // Marked responses -> deal with the whole batch of marked responses if (Yii::app()->request->getPost('markedresponses') && count(Yii::app()->request->getPost('markedresponses')) > 0 && hasSurveyPermission($iSurveyId, 'responses', 'delete')) @@ -337,7 +362,7 @@ public function index($iSurveyId) // Delete the marked responses - checked if (Yii::app()->request->getPost('deleteanswer') && Yii::app()->request->getPost('deleteanswer') === 'marked') { - $fieldmap = createFieldMap($iSurveyId,'full',false,false,Yii::app()->session['browselang']); + $fieldmap = createFieldMap($iSurveyId,'full',false,false,$oBrowseLanguage->langcode); $fuqtquestions = array(); // find all fuqt questions foreach ($fieldmap as $field) @@ -371,6 +396,8 @@ public function index($iSurveyId) Survey_dynamic::model($iSurveyId)->deleteAllByAttributes(array('id' => $iResponseID)); } + Yii::app()->session['flashmessage'] = sprintf($clang->ngT("%s response was successfully deleted.","%s responses were successfully deleted.",count(Yii::app()->request->getPost('markedresponses'))),count(Yii::app()->request->getPost('markedresponses'))); + } // Download all files for all marked responses - checked else if (Yii::app()->request->getPost('downloadfile') && Yii::app()->request->getPost('downloadfile') === 'marked') @@ -422,25 +449,6 @@ public function index($iSurveyId) } } - $clang = $aData['clang']; - $aData['num_total_answers'] = Survey_dynamic::model($iSurveyId)->count(); - $aData['num_completed_answers'] = Survey_dynamic::model($iSurveyId)->count('submitdate IS NOT NULL'); - $aData['with_token']= Yii::app()->db->schema->getTable('{{tokens_' . $iSurveyId . '}}'); - if($aData['with_token']) - { - $aData['tokeninfo'] = Tokens_dynamic::model($iSurveyId)->summary(); - } - - $aViewUrls[] = 'browseindex_view'; - $this->_renderWrappedTemplate('',$aViewUrls, $aData); - } - function browse($iSurveyId) - { - $aData = $this->_getData($iSurveyId); - extract($aData); - $aViewUrls = array(); - $oBrowseLanguage = new Limesurvey_lang($aData['language']); - /** * fnames is used as informational array * it containts diff --git a/application/views/admin/responses/browseallrow_view.php b/application/views/admin/responses/browseallrow_view.php index 2b920719bb6..d3487b37eb8 100644 --- a/application/views/admin/responses/browseallrow_view.php +++ b/application/views/admin/responses/browseallrow_view.php @@ -8,11 +8,11 @@ - ' src='/down.png' alt='eT('Download all files in this response as a zip file'); ?>' class='downloadfile'/> + ' src='down.png' alt='eT('Download all files in this response as a zip file'); ?>' class='downloadfile'/> - ' src='/token_delete.png' alt='eT('Delete this response'); ?>' class='deleteresponse'/> + ' src='token_delete.png' alt='eT('Delete this response'); ?>' class='deleteresponse'/> 0) - { - thisid=removechars($(this).attr('id')); - answer = confirm(strDeleteAllConfirm); - if (answer==true) - { - $('#deleteanswer').val('marked'); - $('#resulttableform').submit(); - } - } - else - alert(noFilesSelectedForDeletion) - }); - // Download individual file bundle - $(".downloadfile").click(function() { - thisid = removechars($(this).attr('id')); - $('#downloadfile').val(thisid); - $('.cbResponseMarker').attr('checked', false); - $('#resulttableform').submit(); - }); - // Download all marked files - $("#imgDownloadMarkedFiles").click(function() { - if ($('.cbResponseMarker:checked').size() > 0) - { - $('#downloadfile').val('marked'); - $('#resulttableform').submit(); - } - else - alert(noFilesSelectedForDnld) - }); $("#selectall").click(function(){ $('.cbResponseMarker').attr('checked',$(this).attr('checked')); @@ -65,30 +21,30 @@ $(document).ready(function(){ $('#browseresponses').qtip({ content:{ - text:$('#browselangpopup') + text:$('#browselangpopup') }, style: { name: 'cream', - tip:true, - color:'#111111', - border: { - width: 1, - radius: 5, - color: '#EADF95'} - }, + tip:true, + color:'#111111', + border: { + width: 1, + radius: 5, + color: '#EADF95'} + }, position: { adjust: { screen: true, scroll:true }, - corner: { - target: 'bottomMiddle', - tooltip: 'topMiddle'} - }, + corner: { + target: 'bottomMiddle', + tooltip: 'topMiddle'} + }, show: {effect: { length:50}, - when: { - event:'click' - }}, + when: { + event:'click' + }}, hide: {fixed:true, - when: { - event:'unfocus' - }} + when: { + event:'unfocus' + }} }); // Fix the heigh of the cell @@ -102,7 +58,7 @@ $(document).ready(function(){ $(this).addClass("content"); $(this).attr("title",$(this).text()); } - }); + }); $('.browsetable td span.content').qtip({ hide: { @@ -128,121 +84,168 @@ $(document).ready(function(){ } } }); + // Delete individual file + $(".deleteresponse").click(function(){ + thisid=removechars($(this).attr('id')); + answer = confirm(strdeleteconfirm); + if (answer==true) + { + $('#deleteanswer').val(thisid); + $('.cbResponseMarker').attr('checked',false); + $('#resulttableform').submit(); + } + }); + // Delete all marked responses + $("#imgDeleteMarkedResponses").click(function(){ + if ($('.cbResponseMarker:checked').size()>0) + { + thisid=removechars($(this).attr('id')); + answer = confirm(strDeleteAllConfirm); + if (answer==true) + { + $('#deleteanswer').val('marked'); + $('#resulttableform').submit(); + } + } + else + alert(noFilesSelectedForDeletion) + }); + + // Download individual file bundle + $(".downloadfile").click(function() { + thisid = removechars($(this).attr('id')); + $('#downloadfile').val(thisid); + $('.cbResponseMarker').attr('checked', false); + $('#resulttableform').submit(); + }); + + // Download all marked files + $("#imgDownloadMarkedFiles").click(function() { + if ($('.cbResponseMarker:checked').size() > 0) + { + $('#downloadfile').val('marked'); + $('#resulttableform').submit(); + } + else + alert(noFilesSelectedForDnld) + }); + + }); /* $("#responseTable") - .jqGrid({ - url: siteURL + "/admin/responses/" + surveyID + "/grid", - editurl: siteURL + "/admin/responses/" + surveyID + "/grid", - datatype: "json", - mtype: "POST", - caption: "Responses", - width: "100%", - height: "100%", - rowNum: 25, - pager: "#responsePager", - editable: true, - colNames: colNames, - colModel: colModel, - sortname: 'id', - sortorder: 'asc', - viewrecords : true, - gridview: true, - multiselect: true, - loadonce: true, - rowList: [25,50,100,250,500,1000,5000,10000], - ondblClickRow: function(id) { - if (lastSel != id) { - $('#responseTable').saveRow(lastSel); - $('#responseTable').editRow(id, true); - lastSel=id; - } - }, - onSelectRow: function(id) { - $('#responseTable').saveRow(lastSel); - } - }) - .filterToolbar({ - 'autosearch': true, - 'searchOnEnter': false - }) - .navGrid("#responsePager", { - 'add': false, - 'refresh': false, - 'edit': false - }) - .navButtonAdd("#responsePager", { - 'caption': 'Download marked files', - 'onClickButton': function (rows) { - var rows = $("#responseTable").getGridParam('selarrrow'); - - if (rows.length <= 0) { - alert ("Please select some records first!"); - return; - } - - sendPost(siteURL + "/admin/responses/" + surveyID + "/grid", { - 'oper': 'downloadarchives', - 'ids': rows - }); - } - }) */ +.jqGrid({ +url: siteURL + "/admin/responses/" + surveyID + "/grid", +editurl: siteURL + "/admin/responses/" + surveyID + "/grid", +datatype: "json", +mtype: "POST", +caption: "Responses", +width: "100%", +height: "100%", +rowNum: 25, +pager: "#responsePager", +editable: true, +colNames: colNames, +colModel: colModel, +sortname: 'id', +sortorder: 'asc', +viewrecords : true, +gridview: true, +multiselect: true, +loadonce: true, +rowList: [25,50,100,250,500,1000,5000,10000], +ondblClickRow: function(id) { +if (lastSel != id) { +$('#responseTable').saveRow(lastSel); +$('#responseTable').editRow(id, true); +lastSel=id; +} +}, +onSelectRow: function(id) { +$('#responseTable').saveRow(lastSel); +} +}) +.filterToolbar({ +'autosearch': true, +'searchOnEnter': false +}) +.navGrid("#responsePager", { +'add': false, +'refresh': false, +'edit': false +}) +.navButtonAdd("#responsePager", { +'caption': 'Download marked files', +'onClickButton': function (rows) { +var rows = $("#responseTable").getGridParam('selarrrow'); + +if (rows.length <= 0) { +alert ("Please select some records first!"); +return; +} + +sendPost(siteURL + "/admin/responses/" + surveyID + "/grid", { +'oper': 'downloadarchives', +'ids': rows +}); +} +}) */ /** - Send a post request to the server to download a file +Send a post request to the server to download a file - @param myaction post action - @param data parameters for $_POST +@param myaction post action +@param data parameters for $_POST */ function sendPost(myaction, data) { - var myform = document.createElement('form'); - document.body.appendChild(myform); - myform.action = myaction; - myform.method = 'POST'; + var myform = document.createElement('form'); + document.body.appendChild(myform); + myform.action = myaction; + myform.method = 'POST'; - for (var key in data) { + for (var key in data) { var myel = document.createElement('input'); myel.type = 'hidden'; myel.name = key; myform.appendChild(myel); myel.value = data[key]; - } + } - myform.submit(); + myform.submit(); } /** - Dowload a file from a response - @param id ID of the response - @param column Field of the text upload question - @param filename Name of the file +Dowload a file from a response +@param id ID of the response +@param column Field of the text upload question +@param filename Name of the file */ function getFile(id, field, filename) { - sendPost(siteURL + "/admin/responses/" + surveyID + "/grid", { - 'id': id, - 'fieldname': field, - 'oper': 'downloadfile', - 'filename': filename - }); + sendPost(siteURL + "/admin/responses/" + surveyID + "/grid", { + 'id': id, + 'fieldname': field, + 'oper': 'downloadfile', + 'filename': filename + }); } /** - Get an archive containing all the file from a response - @param id ID of the response +Get an archive containing all the file from a response +@param id ID of the response */ function getArchive(id) { - sendPost(siteURL + "/admin/responses/" + surveyID + "/grid", { - 'oper': 'downloadarchive', - 'id': id - }); + sendPost(siteURL + "/admin/responses/" + surveyID + "/grid", { + 'oper': 'downloadarchive', + 'id': id + }); } From eddd048f4d7ae3ac926ce7d2284302f62870effb Mon Sep 17 00:00:00 2001 From: jcleeland Date: Tue, 24 Jul 2012 16:36:49 +1000 Subject: [PATCH 27/71] Fixed issue #6372 Browse text responses doesn't work. Also reworked much of the stats function a lot of which is still spaghetti code. Fixed issue: statistics pdf header was referring to old /image directory - updated to default to admin style image directory --- application/config/tcpdf.php | 4 +- application/controllers/admin/statistics.php | 1 + .../helpers/admin/statistics_helper.php | 4897 +++++++++-------- 3 files changed, 2467 insertions(+), 2435 deletions(-) diff --git a/application/config/tcpdf.php b/application/config/tcpdf.php index 4d5844462a9..2154ffe687f 100644 --- a/application/config/tcpdf.php +++ b/application/config/tcpdf.php @@ -75,8 +75,8 @@ * ADD TRAILING SLASH! ***********************************************************/ - $tcpdf['image_directory'] = Yii::app()->getConfig('imagedir').DIRECTORY_SEPARATOR; - + //$tcpdf['image_directory'] = Yii::app()->getConfig('imagedir').DIRECTORY_SEPARATOR; + $tcpdf['image_directory'] = Yii::app()->getConfig('rootdir').DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.Yii::app()->getConfig('admintheme').DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR; /************************************************************ * TCPDF default (blank) image diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 25d07bf1731..10dc7b2e41b 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -42,6 +42,7 @@ public function run($surveyid, $subaction = null) $imageurl = Yii::app()->getConfig("imageurl"); $aData = array('clang' => $clang, 'imageurl' => $imageurl); + $aData['sql']=''; /* * We need this later: diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 9bf1da3a205..742d6610aff 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -484,851 +484,772 @@ function buildSelects($allfields, $surveyid, $language) { } /** -* Generates statistics +* Builds an array containing information about this particular question/answer combination * -* @param int $surveyid The survey id -* @param mixed $allfields -* @param mixed $q2show -* @param mixed $usegraph -* @param string $outputType Optional - Can be xls, html or pdf - Defaults to pdf -* @param string $pdfOutput Sets the target for the PDF output: DD=File download , F=Save file to local disk -* @param string $statlangcode Lamguage for statistics -* @param mixed $browse Show browse buttons -* @return buffer +* @param string $rt The code passed from the statistics form listing the field/answer (SGQA) combination to be displayed +* @param mixed $language The language to present output in +* @param mixed $surveyid The survey id +* @param string $outputType +* +* @output array $output An array containing "alist"=>A list of answers to the question, "qtitle"=>The title of the question, +* "qquestion"=>The description of the question, "qtype"=>The question type code */ -function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $outputType='pdf', $pdfOutput='I',$statlangcode=null, $browse = true) -{ - //$allfields =""; - - global $rooturl, $rootdir, $homedir, $homeurl, $scriptname, - $chartfontfile, $chartfontsize, $admintheme, $pdfdefaultfont, $pdffontsize; - - //load surveytranslator helper - Yii::import('application.helpers.surveytranslator_helper', true); - - $imagedir = Yii::app()->getConfig("imagedir"); - $tempdir = Yii::app()->getConfig("tempdir"); - $tempurl = Yii::app()->getConfig("tempurl"); - $clang = Yii::app()->lang; - - - $astatdata = array(); +function buildOutputList($rt, $language, $surveyid, $outputType) { + + //Set up required variables + $alist=array(); + $qtitle=""; + $qquestion=""; + $qtype=""; + $statlangcode = getBaseLanguageFromSurveyID($surveyid); + $statlang = new Limesurvey_lang($statlangcode); + $firstletter = substr($rt, 0, 1); + $fieldmap=createFieldMap($surveyid, "full", false, false, $language); + $sDatabaseType = Yii::app()->db->getDriverName(); - // Used for getting coordinates for google maps - $agmapdata = array(); - //pick the best font file if font setting is 'auto' - if (is_null($statlangcode)) + /* Some variable depend on output type, actually : only line feed */ + switch($outputType) { - $statlang = getBaseLanguageFromSurveyID($surveyid); + case 'xls': + $linefeed = "\n"; + break; + case 'pdf': + $linefeed = "\n"; + break; + case 'html': + $linefeed = "
    \n"; + break; + default: + break; } - else + + // 1. Get answers for question ############################################################## + //M - Multiple choice, therefore multiple fields + if ($firstletter == "M" || $firstletter == "P") { - $statlang = new Limesurvey_lang($statlangcode); - } + //get SGQ data + list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - /* - * this variable is used in the function shortencode() which cuts off a question/answer title - * after $maxchars and shows the rest as tooltip (in html mode) - */ - $maxchars = 13; - //we collect all the html-output within this variable - $statisticsoutput =''; - /** - * $outputType: html || pdf || - */ - /** - * get/set Survey Details - */ + //select details for this question + $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); - //no survey ID? -> come and get one - if (!isset($surveyid)) {$surveyid=returnGlobal('sid');} + //loop through question data + foreach ($nresult->readAll() as $nrow) + { + $nrow=array_values($nrow); + $qtitle=$nrow[0]; + $qtype=$nrow[1]; + $qquestion=flattenText($nrow[2]); + $qlid=$nrow[3]; + $qother=$nrow[4]; + } - //Get an array of codes of all available languages in this survey - $surveylanguagecodes = Survey::model()->findByPk($surveyid)->additionalLanguages; - $surveylanguagecodes[] = Survey::model()->findByPk($surveyid)->language; + //1. Get list of answers + $query="SELECT title, question FROM {{questions}} WHERE parent_qid='$qqid' AND language='{$language}' and scale_id=0 ORDER BY question_order"; + $result=Yii::app()->db->createCommand($query)->query(); - $fieldmap=createFieldMap($surveyid, "full", false, false, $statlang->getlangcode()); + //loop through multiple answers + foreach ($result->readAll() as $row) + { + $row=array_values($row); + $mfield=substr($rt, 1, strlen($rt))."$row[0]"; - // Set language for questions and answers to base language of this survey - $language=$statlangcode; + //create an array containing answer code, answer and fieldname(??) + $alist[]=array("$row[0]", flattenText($row[1]), $mfield); + } - if ($usegraph==1) - { - //for creating graphs we need some more scripts which are included here - require_once(APPPATH.'/third_party/pchart/pchart/pChart.class'); - require_once(APPPATH.'/third_party/pchart/pchart/pData.class'); - require_once(APPPATH.'/third_party/pchart/pchart/pCache.class'); - $MyCache = new pCache($tempdir.'/'); + //check "other" field. is it set? + if ($qother == "Y") + { + $mfield=substr($rt, 1, strlen($rt))."other"; + + //create an array containing answer code, answer and fieldname(??) + $alist[]=array($statlang->gT("Other"), $statlang->gT("Other"), $mfield); + } } - if($q2show=='all' ) + + //S - Short Free Text + //T - Long Free Text + elseif ($firstletter == "T" || $firstletter == "S") //Short and long text { - $summarySql=" SELECT gid, parent_qid, qid, type " - ." FROM {{questions}} WHERE parent_qid=0" - ." AND sid=$surveyid "; - $summaryRs = Yii::app()->db->createCommand($summarySql)->query()->readAll(); + //search for key + $fld = substr($rt, 1, strlen($rt)); + $fielddata=$fieldmap[$fld]; - foreach($summaryRs as $field) - { - $myField = $surveyid."X".$field['gid']."X".$field['qid']; + //get SGQA IDs + $qsid=$fielddata['sid']; + $qgid=$fielddata['gid']; + $qqid=$fielddata['qid']; - // Multiple choice get special treatment - if ($field['type'] == "M") {$myField = "M$myField";} - if ($field['type'] == "P") {$myField = "P$myField";} - //numerical input will get special treatment (arihtmetic mean, standard derivation, ...) - if ($field['type'] == "N") {$myField = "N$myField";} - if ($field['type'] == "|") {$myField = "|$myField";} + list($qanswer, $qlid)=!empty($fielddata['aid']) ? explode("_", $fielddata['aid']) : array("", ""); + //get SGQ data + //list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - if ($field['type'] == "Q") {$myField = "Q$myField";} - // textfields get special treatment - if ($field['type'] == "S" || $field['type'] == "T" || $field['type'] == "U"){$myField = "T$myField";} - //statistics for Date questions are not implemented yet. - if ($field['type'] == "D") {$myField = "D$myField";} - if ($field['type'] == "F" || $field['type'] == "H") - { - //Get answers. We always use the answer code because the label might be too long elsewise - $query = "SELECT code, answer FROM {{answers}} WHERE qid='".$field['qid']."' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, answer"; - $result = Yii::app()->db->createCommand($query)->query(); - $counter2=0; - //check all the answers - foreach ($result->readAll() as $row) - { - $row=array_values($row); - $myField = "$myField{$row[0]}"; - } - //$myField = "{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]"; + //get question data + $nquery = "SELECT title, type, question, other, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); + //loop through question data + foreach ($nresult->readAll() as $nrow) + { + $nrow=array_values($nrow); + $qtitle=flattenText($nrow[0]); + $qtype=$nrow[1]; + $qquestion=flattenText($nrow[2]); + $nlid=$nrow[4]; + } - } - if($q2show=='all') - $summary[]=$myField; + $mfield=substr($rt, 1, strlen($rt)); - //$allfields[]=$myField; - } + //Text questions either have an answer, or they don't. There's no other way of quantising the results. + // So, instead of building an array of predefined answers like we do with lists & other types, + // we instead create two "types" of possible answer - either there is a response.. or there isn't. + // This question type then can provide a % of the question answered in the summary. + $alist[]=array("Answers", $statlang->gT("Answer"), $mfield); + $alist[]=array("NoAnswer", $statlang->gT("No answer"), $mfield); } - else - { - // This gets all the 'to be shown questions' from the POST and puts these into an array - if (!is_array($q2show)) - $summary=returnGlobal('summary'); - else - $summary = $q2show; - //print_r($_POST); - //if $summary isn't an array we create one - if (isset($summary) && !is_array($summary)) - { - $summary = explode("+", $summary); - } - } - /* Some variable depend on output type, actually : only line feed */ - switch($outputType) + //Multiple short text + elseif ($firstletter == "Q") { - case 'xls': - $linefeed = "\n"; - break; - case 'pdf': - $linefeed = "\n"; - break; - case 'html': - $linefeed = "
    \n"; - break; - default: + //get SGQ data + list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - break; - } + //separating another ID + $tmpqid=substr($qqid, 0, strlen($qqid)-1); - /** - * pdf Config - */ - if($outputType=='pdf') - { - //require_once('classes/tcpdf/config/lang/eng.php'); - global $l; - $l['w_page'] = $statlang->gT("Page",'unescaped'); - //require_once('classes/tcpdf/mypdf.php'); - Yii::import('application.libraries.admin.pdf', true); - // create new PDF document - $pdf = new Pdf(); - $pdf->SetFont($pdfdefaultfont,'',$pdffontsize); + //check if we have legid QIDs. if not create them by substringing + while (!in_array ($tmpqid,$legitqids)) $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1); - $surveyInfo = getSurveyInfo($surveyid,$language); + //length of QID + $qidlength=strlen($tmpqid); - // set document information - $pdf->SetCreator(PDF_CREATOR); - $pdf->SetAuthor('LimeSurvey'); - $pdf->SetTitle('Statistic survey '.$surveyid); - $pdf->SetSubject($surveyInfo['surveyls_title']); - $pdf->SetKeywords('LimeSurvey, Statistics, Survey '.$surveyid.''); - $pdf->SetDisplayMode('fullpage', 'two'); + //we somehow get the answer code (see SQL later) from the $qqid + $qaid=substr($qqid, $qidlength, strlen($qqid)-$qidlength); - // set header and footer fonts - $pdf->setHeaderFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_MAIN)); - $pdf->setFooterFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_DATA)); + //get some question data + $nquery = "SELECT title, type, question, other FROM {{questions}} WHERE qid='".substr($qqid, 0, $qidlength)."' AND parent_qid=0 AND language='{$language}'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); - // set default header data - $pdf->SetHeaderData("statistics.png", 10, $statlang->gT("Quick statistics",'unescaped') , $statlang->gT("Survey")." ".$surveyid." '".flattenText($surveyInfo['surveyls_title'],false,true,'UTF-8')."'"); + //more substrings + $count = substr($qqid, strlen($qqid)-1); + //loop through question data + foreach ($nresult->readAll() as $nrow) + { + $nrow=array_values($nrow); + $qtitle=flattenText($nrow[0]).'-'.$count; + $qtype=$nrow[1]; + $qquestion=flattenText($nrow[2]); + } - // set default monospaced font - $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED); + //get answers + $qquery = "SELECT title as code, question as answer FROM {{questions}} WHERE parent_qid='".substr($qqid, 0, $qidlength)."' AND title='$qaid' AND language='{$language}' ORDER BY question_order"; + $qresult=Yii::app()->db->createCommand($qquery)->query(); - //set margins - $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT); - $pdf->SetHeaderMargin(PDF_MARGIN_HEADER); - $pdf->SetFooterMargin(PDF_MARGIN_FOOTER); + //loop through answer data + foreach ($qresult->readAll() as $qrow) + { + $qrow=array_values($qrow); + //store each answer here + $atext=flattenText($qrow[1]); + } - //set auto page breaks - $pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM); + //add this to the question title + $qtitle .= " [$atext]"; - //set image scale factor - $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); + //even more substrings... + $mfield=substr($rt, 1, strlen($rt)); - //set some language-dependent strings - $pdf->setLanguageArray($l); + //Text questions either have an answer, or they don't. There's no other way of quantising the results. + // So, instead of building an array of predefined answers like we do with lists & other types, + // we instead create two "types" of possible answer - either there is a response.. or there isn't. + // This question type then can provide a % of the question answered in the summary. + $alist[]=array("Answers", $statlang->gT("Answer"), $mfield); + $alist[]=array("NoAnswer", $statlang->gT("No answer"), $mfield); } - if($outputType=='xls') + + + //RANKING OPTION + elseif ($firstletter == "R") { - /** - * Initiate the Spreadsheet_Excel_Writer - */ - Yii::import('application.libraries.admin.pear.Spreadsheet.Excel.Xlswriter', true); - if($pdfOutput=='F') - $workbook = new Xlswriter($tempdir.'/statistic-survey'.$surveyid.'.xls'); - else - $workbook = new Xlswriter(); + //getting the needed IDs somehow + $lengthofnumeral=substr($rt, strpos($rt, "-")+1, 1); + list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strpos($rt, "-")-($lengthofnumeral+1)), 3); - $workbook->setVersion(8); - // Inform the module that our data will arrive as UTF-8. - // Set the temporary directory to avoid PHP error messages due to open_basedir restrictions and calls to tempnam("", ...) - if (!empty($tempdir)) { - $workbook->setTempDir($tempdir); + //get question data + $nquery = "SELECT title, type, question FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); + + //loop through question data + foreach ($nresult->readAll() as $nrow) + { + $nrow=array_values($nrow); + $qtitle=flattenText($nrow[0]). " [".substr($rt, strpos($rt, "-")-($lengthofnumeral), $lengthofnumeral)."]"; + $qtype=$nrow[1]; + $qquestion=flattenText($nrow[2]). "[".$statlang->gT("Ranking")." ".substr($rt, strpos($rt, "-")-($lengthofnumeral), $lengthofnumeral)."]"; } - if ($pdfOutput!='F') - $workbook->send('statistic-survey'.$surveyid.'.xls'); - // Creating the first worksheet - $sheet =& $workbook->addWorksheet(utf8_decode('results-survey'.$surveyid)); - $sheet->setInputEncoding('utf-8'); - $sheet->setColumn(0,20,20); - $separator="~|"; - /**XXX*/ + //get answers + $query="SELECT code, answer FROM {{answers}} WHERE qid='$qqid' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, answer"; + $result=Yii::app()->db->createCommand($query)->query(); + + //loop through answers + foreach ($result->readAll() as $row) + { + $row=array_values($row); + //create an array containing answer code, answer and fieldname(??) + $mfield=substr($rt, 1, strpos($rt, "-")-1); + $alist[]=array("$row[0]", flattenText($row[1]), $mfield); + } } - /** - * Start generating - */ + else if ($firstletter == "|") // File UPload + { + //get SGQ data + list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - $selects=buildSelects($allfields, $surveyid, $language); + //select details for this question + $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); - //count number of answers - $query = "SELECT count(*) FROM {{survey_$surveyid}}"; + //loop through question data + foreach ($nresult->readAll() as $nrow) + { + $nrow=array_values($nrow); + $qtitle=$nrow[0]; + $qtype=$nrow[1]; + $qquestion=flattenText($nrow[2]); + $qlid=$nrow[3]; + $qother=$nrow[4]; + } - //if incompleted answers should be filtert submitdate has to be not null - if (incompleteAnsFilterState() == "inc") {$query .= " WHERE submitdate is null";} - elseif (incompleteAnsFilterState() == "filter") {$query .= " WHERE submitdate is not null";} - $result = Yii::app()->db->createCommand($query)->query(); + /* + 4) Average size of file per respondent + 5) Average no. of files + 5) Summary/count of file types (ie: 37 jpg, 65 gif, 12 png) + 6) Total size of all files (useful if you re about to download them all) + 7) You could also add things like smallest file size, largest file size, median file size + 8) no. of files corresponding to each extension + 9) max file size + 10) min file size + */ - //$total = total number of answers - $row=$result->read(); $total=reset($row); + // 1) Total number of files uploaded + // 2) Number of respondents who uploaded at least one file (with the inverse being the number of respondents who didn t upload any) + $fieldname=substr($rt, 1, strlen($rt)); + $query = "SELECT SUM(".Yii::app()->db->quoteColumnName($fieldname.'_filecount').") as sum, AVG(".Yii::app()->db->quoteColumnName($fieldname.'_filecount').") as avg FROM {{survey_$surveyid}}"; + $result=Yii::app()->db->createCommand($query)->query(); - //are there any filters that have to be taken care of? - if (isset($selects) && $selects) - { - //filter incomplete answers? - if (incompleteAnsFilterState() == "filter" || incompleteAnsFilterState() == "inc") {$query .= " AND ";} + $showem = array(); - else {$query .= " WHERE ";} + foreach ($result->readAll() as $row) + { + $showem[]=array($statlang->gT("Total number of files"), $row['sum']); + $showem[]=array($statlang->gT("Average no. of files per respondent"), $row['avg']); + } - //add filter criteria to SQL - $query .= implode(" AND ", $selects); - } + $query = "SELECT ". $fieldname ." as json FROM {{survey_$surveyid}}"; + $result=Yii::app()->db->createCommand($query)->query(); - //get me some data Scotty - $result=Yii::app()->db->createCommand($query)->query(); + $responsecount = 0; + $filecount = 0; + $size = 0; - //put all results into $results - $row=$result->read(); $results=reset($row); + foreach ($result->readAll() as $row) + { - if ($total) - { - $percent=sprintf("%01.2f", ($results/$total)*100); - - } - switch($outputType) - { - case "xls": - $xlsRow = 0; - $sheet->write($xlsRow,0,$statlang->gT("Number of records in this query:",'unescaped')); - $sheet->write($xlsRow,1,$results); - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Total records in survey:",'unescaped')); - $sheet->write($xlsRow,1,$total); + $json = $row['json']; + $phparray = json_decode($json); - if($total) + foreach ($phparray as $metadata) { - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Percentage of total:",'unescaped')); - $sheet->write($xlsRow,1,$percent."%"); + $size += (int) $metadata->size; + $filecount++; } + $responsecount++; + } + $showem[] = array($statlang->gT("Total size of files"), $size." KB"); + $showem[] = array($statlang->gT("Average file size"), $size/$filecount . " KB"); + $showem[] = array($statlang->gT("Average size per respondent"), $size/$responsecount . " KB"); - break; - case 'pdf': + /* $query="SELECT title, question FROM {{questions}} WHERE parent_qid='$qqid' AND language='{$language}' ORDER BY question_order"; + $result=db_execute_num($query) or safeDie("Couldn't get list of subquestions for multitype
    $query
    "); - // add summary to pdf - $array = array(); - //$array[] = array($statlang->gT("Results"),""); - $array[] = array($statlang->gT("Number of records in this query:",'unescaped'), $results); - $array[] = array($statlang->gT("Total records in survey:",'unescaped'), $total); + //loop through multiple answers + while ($row=$result->FetchRow()) + { + $mfield=substr($rt, 1, strlen($rt))."$row[0]"; - if($total) - $array[] = array($statlang->gT("Percentage of total:",'unescaped'), $percent."%"); + //create an array containing answer code, answer and fieldname(??) + $alist[]=array("$row[0]", flattenText($row[1]), $mfield); + } - $pdf->addPage('P','A4'); + */ + //outputting + switch($outputType) + { + case 'xls': - $pdf->Bookmark($pdf->delete_html($statlang->gT("Results",'unescaped')), 0, 0); - $pdf->titleintopdf($statlang->gT("Results",'unescaped'),$statlang->gT("Survey",'unescaped')." ".$surveyid); - $pdf->tableintopdf($array); + $headXLS = array(); + $tableXLS = array(); + $footXLS = array(); - $pdf->addPage('P','A4'); + $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); + $xlsDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); + ++$xlsRow; + ++$xlsRow; - break; - case 'html': + ++$xlsRow; + $sheet->write($xlsRow, 0,$xlsTitle); + ++$xlsRow; + $sheet->write($xlsRow, 0,$xlsDesc); - $statisticsoutput .= "
    \n
    \n" - ."\t\n" - ."\t' - ."\n" - ."\t' - ."\n"; + $headXLS[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); + ++$xlsRow; + $sheet->write($xlsRow, 0,$statlang->gT("Calculation")); + $sheet->write($xlsRow, 1,$statlang->gT("Result")); - //only calculate percentage if $total is set - if ($total) - { - $percent=sprintf("%01.2f", ($results/$total)*100); - $statisticsoutput .= "\t' - ."\n"; - } - $statisticsoutput .="
    ".$statlang->gT("Results")."
    ".$statlang->gT("Number of records in this query:").'$results
    ".$statlang->gT("Total records in survey:").'$total
    ".$statlang->gT("Percentage of total:").'$percent%
    \n"; + break; + case 'pdf': + $headPDF = array(); + $tablePDF = array(); + $footPDF = array(); - break; - default: + $pdfTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); + $titleDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); + $headPDF[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); - break; - } + break; - //put everything from $selects array into a string connected by AND - //This string ($sql) can then be passed on to other functions so you can - //browse these results - if (isset ($selects) && $selects) {$sql=implode(" AND ", $selects);} + case 'html': - elseif (!empty($newsql)) {$sql = $newsql;} + $statisticsoutput .= "\n\n" + ."\t\n" + ."\t\n" + ."\t\n\t\t\n" + ."\t\t\n" + ."\t\n"; - if (!isset($sql) || !$sql) {$sql="NULL";} + foreach ($showem as $res) + $statisticsoutput .= ""; + break; - //only continue if we have something to output - if ($results > 0) - { - if($outputType=='html' && $browse === true) - { - //add a buttons to browse results - $statisticsoutput .= "\n" - ."\t\t

    " - ."\t\t\t\n" - ."\t\t\t\n" - ."\t\t\t\n" - ."\t\t\t\n" - ."\t\t

    " - ."\t\t\n"; + default: + break; } - } //end if (results > 0) - - /* Show Summary results - * The $summary array contains each fieldname that we want to display statistics for - * - * */ + } - if (isset($summary) && $summary) + //N = numerical input + //K = multiple numerical input + elseif ($firstletter == "N" || $firstletter == "K") //NUMERICAL TYPE { - //let's run through the survey - $runthrough=$summary; - - //START Chop up fieldname and find matching questions - - //GET LIST OF LEGIT QIDs FOR TESTING LATER - $lq = "SELECT DISTINCT qid FROM {{questions}} WHERE sid=$surveyid and parent_qid=0"; - $lr = Yii::app()->db->createCommand($lq)->query(); - - //loop through the IDs - foreach ($lr->readAll() as $lw) + //Zero handling + if (!isset($excludezeros)) //If this hasn't been set, set it to on as default: { - //this creates an array of question id's' - $legitqids[] = $lw['qid']; + $excludezeros=1; } - - //loop through all selected questions - foreach ($runthrough as $rt) + //check last character, greater/less/equals don't need special treatment + if (substr($rt, -1) == "G" || substr($rt, -1) == "L" || substr($rt, -1) == "=") + { + //DO NOTHING + } + else { - $firstletter = substr($rt, 0, 1); - // 1. Get answers for question ############################################################## + $showem = array(); + //create SGQ identifier + list($qsid, $qgid, $qqid) = explode("X", $rt, 3); - //M - Multiple choice, therefore multiple fields - if ($firstletter == "M" || $firstletter == "P") + //multiple numerical input + if($firstletter == "K") { - //get SGQ data - list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - - //select details for this question - $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + // This is a multiple numerical question so we need to strip of the answer id to find the question title + $tmpqid=substr($qqid, 0, strlen($qqid)-1); - //loop through question data - foreach ($nresult->readAll() as $nrow) - { - $nrow=array_values($nrow); - $qtitle=$nrow[0]; - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $qlid=$nrow[3]; - $qother=$nrow[4]; - } + //did we get a valid ID? + while (!in_array ($tmpqid,$legitqids)) + $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1); - //1. Get list of answers - $query="SELECT title, question FROM {{questions}} WHERE parent_qid='$qqid' AND language='{$language}' and scale_id=0 ORDER BY question_order"; - $result=Yii::app()->db->createCommand($query)->query(); + //check lenght of ID + $qidlength=strlen($tmpqid); - //loop through multiple answers - foreach ($result->readAll() as $row) - { - $row=array_values($row); - $mfield=substr($rt, 1, strlen($rt))."$row[0]"; + //get answer ID from qid + $qaid=substr($qqid, $qidlength, strlen($qqid)-$qidlength); - //create an array containing answer code, answer and fieldname(??) - $alist[]=array("$row[0]", flattenText($row[1]), $mfield); - } + //get question details from DB + $nquery = "SELECT title, type, question, qid, parent_qid + FROM {{questions}} + WHERE parent_qid=0 AND qid='".substr($qqid, 0, $qidlength)."' + AND language='{$language}'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); + } - //check "other" field. is it set? - if ($qother == "Y") - { - $mfield=substr($rt, 1, strlen($rt))."other"; + //probably question type "N" = numerical input + else + { + //we can use the qqid without any editing + $nquery = "SELECT title, type, question, qid, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); + } - //create an array containing answer code, answer and fieldname(??) - $alist[]=array($statlang->gT("Other"), $statlang->gT("Other"), $mfield); - } + //loop through results + foreach ($nresult->readAll() as $nrow) + { + $nrow=array_values($nrow); + $qtitle=flattenText($nrow[0]); //clean up title + $qtype=$nrow[1]; + $qquestion=flattenText($nrow[2]); + $qiqid=$nrow[3]; + $qlid=$nrow[4]; } + //Get answer texts for multiple numerical + if(substr($rt, 0, 1) == "K") + { + //get answer data + $atext=Yii::app()->db->createCommand("SELECT question FROM {{questions}} WHERE parent_qid='{$qiqid}' AND scale_id=0 AND title='{$qaid}' AND language='{$language}'")->queryScalar(); + //put single items in brackets at output + $qtitle .= " [$atext]"; + } - //S - Short Free Text - //T - Long Free Text - elseif ($firstletter == "T" || $firstletter == "S") //Short and long text + //outputting + switch($outputType) { + case 'xls': - //search for key - $fld = substr($rt, 1, strlen($rt)); - $fielddata=$fieldmap[$fld]; + $headXLS = array(); + $tableXLS = array(); + $footXLS = array(); - //get SGQA IDs - $qsid=$fielddata['sid']; - $qgid=$fielddata['gid']; - $qqid=$fielddata['qid']; + $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); + $xlsDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); + ++$xlsRow; + ++$xlsRow; + ++$xlsRow; + $sheet->setCellValueByColumnAndRow(0,$xlsRow,$xlsTitle); + ++$xlsRow; + $sheet->setCellValueByColumnAndRow(0,$xlsRow,$xlsDesc); - list($qanswer, $qlid)=!empty($fielddata['aid']) ? explode("_", $fielddata['aid']) : array("", ""); - //get SGQ data - //list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); + $headXLS[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); + ++$xlsRow; + $sheet->setCellValueByColumnAndRow(0,$xlsRow,$statlang->gT("Calculation")); + $sheet->setCellValueByColumnAndRow(1,$xlsRow,$statlang->gT("Result")); + break; + case 'pdf': - //get question data - $nquery = "SELECT title, type, question, other, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + $headPDF = array(); + $tablePDF = array(); + $footPDF = array(); - //loop through question data - foreach ($nresult->readAll() as $nrow) - { - $nrow=array_values($nrow); - $qtitle=flattenText($nrow[0]); - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $nlid=$nrow[4]; - } + $pdfTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); + $titleDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); + + $headPDF[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); + + break; + case 'html': - $mfield=substr($rt, 1, strlen($rt)); + $statisticsoutput .= "\n
    ".sprintf($statlang->gT("Field summary for %s"),$qtitle).":" + ."
    $qquestion
    " + .$statlang->gT("Calculation")."" + .$statlang->gT("Result")."
    ".$res[0]."".$res[1]."
    \n" + ."\t\n" + ."\t\n" + ."\t\n\t\t\n" + ."\t\t\n" + ."\t\n"; - //Text questions either have an answer, or they don't. There's no other way of quantising the results. - // So, instead of building an array of predefined answers like we do with lists & other types, - // we instead create two "types" of possible answer - either there is a response.. or there isn't. - // This question type then can provide a % of the question answered in the summary. - $alist[]=array("Answers", $statlang->gT("Answer"), $mfield); - $alist[]=array("NoAnswer", $statlang->gT("No answer"), $mfield); + break; + default: + + + break; } + //this field is queried using mathematical functions + $fieldname=substr($rt, 1, strlen($rt)); - //Multiple short text - elseif ($firstletter == "Q") + //special treatment for MS SQL databases + if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv') { - //get SGQ data - list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - - //separating another ID - $tmpqid=substr($qqid, 0, strlen($qqid)-1); + //standard deviation + $query = "SELECT STDEVP(".Yii::app()->db->quoteColumnName($fieldname)."*1) as stdev"; + } - //check if we have legid QIDs. if not create them by substringing - while (!in_array ($tmpqid,$legitqids)) $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1); + //other databases (MySQL, Postgres) + else + { + //standard deviation + $query = "SELECT STDDEV(".Yii::app()->db->quoteColumnName($fieldname).") as stdev"; + } - //length of QID - $qidlength=strlen($tmpqid); + //sum + $query .= ", SUM(".Yii::app()->db->quoteColumnName($fieldname)."*1) as sum"; - //we somehow get the answer code (see SQL later) from the $qqid - $qaid=substr($qqid, $qidlength, strlen($qqid)-$qidlength); + //average + $query .= ", AVG(".Yii::app()->db->quoteColumnName($fieldname)."*1) as average"; - //get some question data - $nquery = "SELECT title, type, question, other FROM {{questions}} WHERE qid='".substr($qqid, 0, $qidlength)."' AND parent_qid=0 AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + //min + $query .= ", MIN(".Yii::app()->db->quoteColumnName($fieldname)."*1) as minimum"; - //more substrings - $count = substr($qqid, strlen($qqid)-1); + //max + $query .= ", MAX(".Yii::app()->db->quoteColumnName($fieldname)."*1) as maximum"; + //Only select responses where there is an actual number response, ignore nulls and empties (if these are included, they are treated as zeroes, and distort the deviation/mean calculations) - //loop through question data - foreach ($nresult->readAll() as $nrow) + //special treatment for MS SQL databases + if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv') + { + //no NULL/empty values please + $query .= " FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($fieldname)." IS NOT NULL"; + if(!$excludezeros) { - $nrow=array_values($nrow); - $qtitle=flattenText($nrow[0]).'-'.$count; - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); + //NO ZERO VALUES + $query .= " AND (".Yii::app()->db->quoteColumnName($fieldname)." <> 0)"; } + } - //get answers - $qquery = "SELECT title as code, question as answer FROM {{questions}} WHERE parent_qid='".substr($qqid, 0, $qidlength)."' AND title='$qaid' AND language='{$language}' ORDER BY question_order"; - $qresult=Yii::app()->db->createCommand($qquery)->query(); - - //loop through answer data - foreach ($qresult->readAll() as $qrow) + //other databases (MySQL, Postgres) + else + { + //no NULL/empty values please + $query .= " FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($fieldname)." IS NOT NULL"; + if(!$excludezeros) { - $qrow=array_values($qrow); - //store each answer here - $atext=flattenText($qrow[1]); + //NO ZERO VALUES + $query .= " AND (".Yii::app()->db->quoteColumnName($fieldname)." != 0)"; } + } - //add this to the question title - $qtitle .= " [$atext]"; - - //even more substrings... - $mfield=substr($rt, 1, strlen($rt)); + //filter incomplete answers if set + if (incompleteAnsFilterState() == "inc") {$query .= " AND submitdate is null";} + elseif (incompleteAnsFilterState() == "filter") {$query .= " AND submitdate is not null";} - //Text questions either have an answer, or they don't. There's no other way of quantising the results. - // So, instead of building an array of predefined answers like we do with lists & other types, - // we instead create two "types" of possible answer - either there is a response.. or there isn't. - // This question type then can provide a % of the question answered in the summary. - $alist[]=array("Answers", $statlang->gT("Answer"), $mfield); - $alist[]=array("NoAnswer", $statlang->gT("No answer"), $mfield); - } + //$sql was set somewhere before + if ($sql != "NULL") {$query .= " AND $sql";} + //execute query + $result=Yii::app()->db->createCommand($query)->queryAll(); - //RANKING OPTION - elseif ($firstletter == "R") + //get calculated data + foreach ($result as $row) { - //getting the needed IDs somehow - $lengthofnumeral=substr($rt, strpos($rt, "-")+1, 1); - list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strpos($rt, "-")-($lengthofnumeral+1)), 3); - - //get question data - $nquery = "SELECT title, type, question FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + //put translation of mean and calculated data into $showem array + $showem[]=array($statlang->gT("Sum"), $row['sum']); + $showem[]=array($statlang->gT("Standard deviation"), round($row['stdev'],2)); + $showem[]=array($statlang->gT("Average"), round($row['average'],2)); + $showem[]=array($statlang->gT("Minimum"), $row['minimum']); + + //Display the maximum and minimum figures after the quartiles for neatness + $maximum=$row['maximum']; + $minimum=$row['minimum']; + } - //loop through question data - foreach ($nresult->readAll() as $nrow) - { - $nrow=array_values($nrow); - $qtitle=flattenText($nrow[0]). " [".substr($rt, strpos($rt, "-")-($lengthofnumeral), $lengthofnumeral)."]"; - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]). "[".$statlang->gT("Ranking")." ".substr($rt, strpos($rt, "-")-($lengthofnumeral), $lengthofnumeral)."]"; - } - //get answers - $query="SELECT code, answer FROM {{answers}} WHERE qid='$qqid' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, answer"; - $result=Yii::app()->db->createCommand($query)->query(); - //loop through answers - foreach ($result->readAll() as $row) - { - $row=array_values($row); - //create an array containing answer code, answer and fieldname(??) - $mfield=substr($rt, 1, strpos($rt, "-")-1); - $alist[]=array("$row[0]", flattenText($row[1]), $mfield); - } - } + //CALCULATE QUARTILES - else if ($firstletter == "|") // File UPload + //get data + $query ="SELECT ".Yii::app()->db->quoteColumnName($fieldname)." FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($fieldname)." IS NOT null"; + //NO ZEROES + if(!$excludezeros) { + $query .= " AND ".Yii::app()->db->quoteColumnName($fieldname)." != 0"; + } - //get SGQ data - list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); + //filtering enabled? + if (incompleteAnsFilterState() == "inc") {$query .= " AND submitdate is null";} + elseif (incompleteAnsFilterState() == "filter") {$query .= " AND submitdate is not null";} - //select details for this question - $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + //if $sql values have been passed to the statistics script from another script, incorporate them + if ($sql != "NULL") {$query .= " AND $sql";} - //loop through question data - foreach ($nresult->readAll() as $nrow) - { - $nrow=array_values($nrow); - $qtitle=$nrow[0]; - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $qlid=$nrow[3]; - $qother=$nrow[4]; - } + //execute query + $result = Yii::app()->db->createCommand($query)->query(); + $querystarter="SELECT ".Yii::app()->db->quoteColumnName($fieldname)." FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($fieldname)." IS NOT null"; + //No Zeroes + if(!$excludezeros) + { + $querystart .= " AND ".Yii::app()->db->quoteColumnName($fieldname)." != 0"; + } + //filtering enabled? + if (incompleteAnsFilterState() == "inc") {$querystarter .= " AND submitdate is null";} + elseif (incompleteAnsFilterState() == "filter") {$querystarter .= " AND submitdate is not null";} - /* - 4) Average size of file per respondent - 5) Average no. of files - 5) Summary/count of file types (ie: 37 jpg, 65 gif, 12 png) - 6) Total size of all files (useful if you re about to download them all) - 7) You could also add things like smallest file size, largest file size, median file size - 8) no. of files corresponding to each extension - 9) max file size - 10) min file size - */ + //if $sql values have been passed to the statistics script from another script, incorporate them + if ($sql != "NULL") {$querystarter .= " AND $sql";} - // 1) Total number of files uploaded - // 2) Number of respondents who uploaded at least one file (with the inverse being the number of respondents who didn t upload any) - $fieldname=substr($rt, 1, strlen($rt)); - $query = "SELECT SUM(".Yii::app()->db->quoteColumnName($fieldname.'_filecount').") as sum, AVG(".Yii::app()->db->quoteColumnName($fieldname.'_filecount').") as avg FROM {{survey_$surveyid}}"; - $result=Yii::app()->db->createCommand($query)->query(); + //we just count the number of records returned + $medcount=$result->getRowCount(); - $showem = array(); + //put the total number of records at the beginning of this array + array_unshift($showem, array($statlang->gT("Count"), $medcount)); - foreach ($result->readAll() as $row) - { - $showem[]=array($statlang->gT("Total number of files"), $row['sum']); - $showem[]=array($statlang->gT("Average no. of files per respondent"), $row['avg']); - } + //no more comment from Mazi regarding the calculation - $query = "SELECT ". $fieldname ." as json FROM {{survey_$surveyid}}"; - $result=Yii::app()->db->createCommand($query)->query(); + // Calculating only makes sense with more than one result + if ($medcount>1) + { + //1ST QUARTILE (Q1) + $q1=(1/4)*($medcount+1); + $q1b=(int)((1/4)*($medcount+1)); + $q1c=$q1b-1; + $q1diff=$q1-$q1b; + $total=0; - $responsecount = 0; - $filecount = 0; - $size = 0; + // fix if there are too few values to evaluate. + if ($q1c<0) {$q1c=0;} - foreach ($result->readAll() as $row) + if ($q1 != $q1b) { + //ODD NUMBER + $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; + $result=Yii::app()->db->createCommand($query)->limit(2, $q1c)->query(); - $json = $row['json']; - $phparray = json_decode($json); - - foreach ($phparray as $metadata) + foreach ($result->readAll() as $row) { - $size += (int) $metadata->size; - $filecount++; + if ($total == 0) {$total=$total-$row[$fieldname];} + + else {$total=$total+$row[$fieldname];} + + $lastnumber=$row[$fieldname]; } - $responsecount++; - } - $showem[] = array($statlang->gT("Total size of files"), $size." KB"); - $showem[] = array($statlang->gT("Average file size"), $size/$filecount . " KB"); - $showem[] = array($statlang->gT("Average size per respondent"), $size/$responsecount . " KB"); - /* $query="SELECT title, question FROM {{questions}} WHERE parent_qid='$qqid' AND language='{$language}' ORDER BY question_order"; - $result=db_execute_num($query) or safeDie("Couldn't get list of subquestions for multitype
    $query
    "); + $q1total=$lastnumber-((1-$q1diff)*$total); - //loop through multiple answers - while ($row=$result->FetchRow()) - { - $mfield=substr($rt, 1, strlen($rt))."$row[0]"; + if ($q1total < $minimum) {$q1total=$minimum;} - //create an array containing answer code, answer and fieldname(??) - $alist[]=array("$row[0]", flattenText($row[1]), $mfield); + $showem[]=array($statlang->gT("1st quartile (Q1)"), $q1total); } - - */ - //outputting - switch($outputType) + else { - case 'xls': + //EVEN NUMBER + $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; + $result=Yii::app()->db->createCommand($query)->limit(1, $q1c)->query(); - $headXLS = array(); - $tableXLS = array(); - $footXLS = array(); + foreach ($result->readAll() as $row) + { + $showem[]=array($statlang->gT("1st quartile (Q1)"), $row[$fieldname]); + } + } - $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); - $xlsDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); - ++$xlsRow; - ++$xlsRow; + $total=0; - ++$xlsRow; - $sheet->write($xlsRow, 0,$xlsTitle); - ++$xlsRow; - $sheet->write($xlsRow, 0,$xlsDesc); - $headXLS[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); - ++$xlsRow; - $sheet->write($xlsRow, 0,$statlang->gT("Calculation")); - $sheet->write($xlsRow, 1,$statlang->gT("Result")); + //MEDIAN (Q2) + $median=(1/2)*($medcount+1); + $medianb=(int)((1/2)*($medcount+1)); + $medianc=$medianb-1; + $mediandiff=$median-$medianb; - break; - case 'pdf': + if ($median != $medianb) + { + //remainder + $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; + $result=Yii::app()->db->createCommand($query)->limit(2, $medianc)->query(); - $headPDF = array(); - $tablePDF = array(); - $footPDF = array(); + foreach ($result->readAll() as $row) {$total=$total+$row[$fieldname];} - $pdfTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); - $titleDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); + $showem[]=array($statlang->gT("2nd quartile (Median)"), $total/2); + } - $headPDF[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); + else + { + //EVEN NUMBER + $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; + $result = Yii::app()->db->createCommand($query)->limit(1, $medianc-1)->query(); - break; + foreach ($result->readAll() as $row) + { + $showem[]=array($statlang->gT("Median value"), $row[$fieldname]); + } + } - case 'html': + $total=0; - $statisticsoutput .= "\n
    ".sprintf($statlang->gT("Field summary for %s"),$qtitle).":" + ."
    $qquestion
    " + .$statlang->gT("Calculation")."" + .$statlang->gT("Result")."
    \n" - ."\t\n" - ."\t\n" - ."\t\n\t\t\n" - ."\t\t\n" - ."\t\n"; - - foreach ($showem as $res) - $statisticsoutput .= ""; - break; - default: - break; - } - } + //3RD QUARTILE (Q3) + $q3=(3/4)*($medcount+1); + $q3b=(int)((3/4)*($medcount+1)); + $q3c=$q3b-1; + $q3diff=$q3-$q3b; - //N = numerical input - //K = multiple numerical input - elseif ($firstletter == "N" || $firstletter == "K") //NUMERICAL TYPE - { - //Zero handling - if (!isset($excludezeros)) //If this hasn't been set, set it to on as default: + if ($q3 != $q3b) { - $excludezeros=1; - } - //check last character, greater/less/equals don't need special treatment - if (substr($rt, -1) == "G" || substr($rt, -1) == "L" || substr($rt, -1) == "=") - { - //DO NOTHING - } - else - { - $showem = array(); - //create SGQ identifier - list($qsid, $qgid, $qqid) = explode("X", $rt, 3); + $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; + $result = Yii::app()->db->createCommand($query)->limit(2,$q3c)->query(); - //multiple numerical input - if($firstletter == "K") + foreach ($result->readAll() as $row) { - // This is a multiple numerical question so we need to strip of the answer id to find the question title - $tmpqid=substr($qqid, 0, strlen($qqid)-1); + if ($total == 0) {$total=$total-$row[$fieldname];} - //did we get a valid ID? - while (!in_array ($tmpqid,$legitqids)) - $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1); + else {$total=$total+$row[$fieldname];} - //check lenght of ID - $qidlength=strlen($tmpqid); + $lastnumber=$row[$fieldname]; + } + $q3total=$lastnumber-((1-$q3diff)*$total); - //get answer ID from qid - $qaid=substr($qqid, $qidlength, strlen($qqid)-$qidlength); + if ($q3total < $maximum) {$q1total=$maximum;} - //get question details from DB - $nquery = "SELECT title, type, question, qid, parent_qid - FROM {{questions}} - WHERE parent_qid=0 AND qid='".substr($qqid, 0, $qidlength)."' - AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); - } + $showem[]=array($statlang->gT("3rd quartile (Q3)"), $q3total); + } - //probably question type "N" = numerical input - else - { - //we can use the qqid without any editing - $nquery = "SELECT title, type, question, qid, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); - } + else + { + $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1"; + $result = Yii::app()->db->createCommand($query)->limit(1, $q3c); - //loop through results - foreach ($nresult->readAll() as $nrow) + foreach ($result->queryAll() as $row) { - $nrow=array_values($nrow); - $qtitle=flattenText($nrow[0]); //clean up title - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $qiqid=$nrow[3]; - $qlid=$nrow[4]; + $showem[]=array($statlang->gT("3rd quartile (Q3)"), $row[$fieldname]); } + } - //Get answer texts for multiple numerical - if(substr($rt, 0, 1) == "K") - { - //get answer data - $atext=Yii::app()->db->createCommand("SELECT question FROM {{questions}} WHERE parent_qid='{$qiqid}' AND scale_id=0 AND title='{$qaid}' AND language='{$language}'")->queryScalar(); - //put single items in brackets at output - $qtitle .= " [$atext]"; - } + $total=0; + + $showem[]=array($statlang->gT("Maximum"), $maximum); - //outputting + //output results + foreach ($showem as $shw) + { switch($outputType) { case 'xls': - $headXLS = array(); - $tableXLS = array(); - $footXLS = array(); - - $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); - $xlsDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); - ++$xlsRow; ++$xlsRow; + $sheet->write($xlsRow, 0,html_entity_decode($shw[0],ENT_QUOTES,'UTF-8')); + $sheet->write($xlsRow, 1,html_entity_decode($shw[1],ENT_QUOTES,'UTF-8')); - ++$xlsRow; - $sheet->setCellValueByColumnAndRow(0,$xlsRow,$xlsTitle); - ++$xlsRow; - $sheet->setCellValueByColumnAndRow(0,$xlsRow,$xlsDesc); - $headXLS[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); - ++$xlsRow; - $sheet->setCellValueByColumnAndRow(0,$xlsRow,$statlang->gT("Calculation")); - $sheet->setCellValueByColumnAndRow(1,$xlsRow,$statlang->gT("Result")); + $tableXLS[] = array($shw[0],$shw[1]); break; case 'pdf': - $headPDF = array(); - $tablePDF = array(); - $footPDF = array(); - - $pdfTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); - $titleDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); - - $headPDF[] = array($statlang->gT("Calculation"),$statlang->gT("Result")); + $tablePDF[] = array(html_entity_decode($shw[0],ENT_QUOTES,'UTF-8'),html_entity_decode($shw[1],ENT_QUOTES,'UTF-8')); break; case 'html': - $statisticsoutput .= "\n
    ".sprintf($statlang->gT("Field summary for %s"),$qtitle).":" - ."
    $qquestion
    " - .$statlang->gT("Calculation")."" - .$statlang->gT("Result")."
    ".$res[0]."".$res[1]."
    \n" - ."\t\n" - ."\t\n" - ."\t\n\t\t\n" - ."\t\t\n" - ."\t\n"; + $statisticsoutput .= "\t\n" + ."\t\t\n" + ."\t\t\n" + ."\t\n"; break; default: @@ -1336,2096 +1257,2206 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, break; } + } + switch($outputType) + { + case 'xls': - //this field is queried using mathematical functions - $fieldname=substr($rt, 1, strlen($rt)); + ++$xlsRow; + $sheet->write($xlsRow, 0,$statlang->gT("Null values are ignored in calculations")); + ++$xlsRow; + $sheet->write($xlsRow, 0,sprintf($statlang->gT("Q1 and Q3 calculated using %s"), $statlang->gT("minitab method"))); - //special treatment for MS SQL databases - $sDatabaseType = Yii::app()->db->getDriverName(); - if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv') - { - //standard deviation - $query = "SELECT STDEVP(".Yii::app()->db->quoteColumnName($fieldname)."*1) as stdev"; - } + $footXLS[] = array($statlang->gT("Null values are ignored in calculations")); + $footXLS[] = array(sprintf($statlang->gT("Q1 and Q3 calculated using %s"), $statlang->gT("minitab method"))); - //other databases (MySQL, Postgres) - else - { - //standard deviation - $query = "SELECT STDDEV(".Yii::app()->db->quoteColumnName($fieldname).") as stdev"; - } - - //sum - $query .= ", SUM(".Yii::app()->db->quoteColumnName($fieldname)."*1) as sum"; + break; + case 'pdf': - //average - $query .= ", AVG(".Yii::app()->db->quoteColumnName($fieldname)."*1) as average"; + $footPDF[] = array($statlang->gT("Null values are ignored in calculations")); + $footPDF[] = array(sprintf($statlang->gT("Q1 and Q3 calculated using %s"), "".$statlang->gT("minitab method")."")); + $pdf->addPage('P','A4'); + $pdf->Bookmark($pdf->delete_html($qquestion), 1, 0); + $pdf->titleintopdf($pdfTitle,$titleDesc); - //min - $query .= ", MIN(".Yii::app()->db->quoteColumnName($fieldname)."*1) as minimum"; + $pdf->headTable($headPDF, $tablePDF); - //max - $query .= ", MAX(".Yii::app()->db->quoteColumnName($fieldname)."*1) as maximum"; - //Only select responses where there is an actual number response, ignore nulls and empties (if these are included, they are treated as zeroes, and distort the deviation/mean calculations) + $pdf->tablehead($footPDF); - //special treatment for MS SQL databases - if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv') - { - //no NULL/empty values please - $query .= " FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($fieldname)." IS NOT NULL"; - if(!$excludezeros) - { - //NO ZERO VALUES - $query .= " AND (".Yii::app()->db->quoteColumnName($fieldname)." <> 0)"; - } - } + break; + case 'html': - //other databases (MySQL, Postgres) - else - { - //no NULL/empty values please - $query .= " FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($fieldname)." IS NOT NULL"; - if(!$excludezeros) - { - //NO ZERO VALUES - $query .= " AND (".Yii::app()->db->quoteColumnName($fieldname)." != 0)"; - } - } + //footer of question type "N" + $statisticsoutput .= "\t\n" + ."\t\t\n" + ."\t\n
    ".sprintf($statlang->gT("Field summary for %s"),$qtitle).":" - ."
    $qquestion
    " - .$statlang->gT("Calculation")."" - .$statlang->gT("Result")."
    $shw[0]$shw[1]
    \n" + ."\t\t\t".$statlang->gT("Null values are ignored in calculations")."
    \n" + ."\t\t\t".sprintf($statlang->gT("Q1 and Q3 calculated using %s"), "".$statlang->gT("minitab method")."") + ."    \n" + ."\t\t
    \n"; - //filter incomplete answers if set - if (incompleteAnsFilterState() == "inc") {$query .= " AND submitdate is null";} - elseif (incompleteAnsFilterState() == "filter") {$query .= " AND submitdate is not null";} + break; + default: - //$sql was set somewhere before - if ($sql != "NULL") {$query .= " AND $sql";} - //execute query - $result=Yii::app()->db->createCommand($query)->queryAll(); + break; + } - //get calculated data - foreach ($result as $row) - { - //put translation of mean and calculated data into $showem array - $showem[]=array($statlang->gT("Sum"), $row['sum']); - $showem[]=array($statlang->gT("Standard deviation"), round($row['stdev'],2)); - $showem[]=array($statlang->gT("Average"), round($row['average'],2)); - $showem[]=array($statlang->gT("Minimum"), $row['minimum']); - - //Display the maximum and minimum figures after the quartiles for neatness - $maximum=$row['maximum']; - $minimum=$row['minimum']; - } + //clean up + unset($showem); + } //end if (enough results?) + //not enough (<1) results for calculation + else + { + switch($outputType) + { + case 'xls': - //CALCULATE QUARTILES + $tableXLS = array(); + $tableXLS[] = array($statlang->gT("Not enough values for calculation")); - //get data - $query ="SELECT ".Yii::app()->db->quoteColumnName($fieldname)." FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($fieldname)." IS NOT null"; - //NO ZEROES - if(!$excludezeros) - { - $query .= " AND ".Yii::app()->db->quoteColumnName($fieldname)." != 0"; - } + ++$xlsRow; + $sheet->write($xlsRow, 0, $statlang->gT("Not enough values for calculation")); - //filtering enabled? - if (incompleteAnsFilterState() == "inc") {$query .= " AND submitdate is null";} - elseif (incompleteAnsFilterState() == "filter") {$query .= " AND submitdate is not null";} - //if $sql values have been passed to the statistics script from another script, incorporate them - if ($sql != "NULL") {$query .= " AND $sql";} - //execute query - $result = Yii::app()->db->createCommand($query)->query(); - $querystarter="SELECT ".Yii::app()->db->quoteColumnName($fieldname)." FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($fieldname)." IS NOT null"; - //No Zeroes - if(!$excludezeros) - { - $querystart .= " AND ".Yii::app()->db->quoteColumnName($fieldname)." != 0"; - } - //filtering enabled? - if (incompleteAnsFilterState() == "inc") {$querystarter .= " AND submitdate is null";} - elseif (incompleteAnsFilterState() == "filter") {$querystarter .= " AND submitdate is not null";} + break; + case 'pdf': - //if $sql values have been passed to the statistics script from another script, incorporate them - if ($sql != "NULL") {$querystarter .= " AND $sql";} + $tablePDF = array(); + $tablePDF[] = array($statlang->gT("Not enough values for calculation")); + $pdf->addPage('P','A4'); + $pdf->Bookmark($pdf->delete_html($qquestion), 1, 0); + $pdf->titleintopdf($pdfTitle,$titleDesc); - //we just count the number of records returned - $medcount=$result->getRowCount(); + $pdf->equalTable($tablePDF); - //put the total number of records at the beginning of this array - array_unshift($showem, array($statlang->gT("Count"), $medcount)); + break; + case 'html': + //output + $statisticsoutput .= "\t\n" + ."\t\t".$statlang->gT("Not enough values for calculation")."\n" + ."\t\n
    \n"; - //no more comment from Mazi regarding the calculation + break; + default: - // Calculating only makes sense with more than one result - if ($medcount>1) - { - //1ST QUARTILE (Q1) - $q1=(1/4)*($medcount+1); - $q1b=(int)((1/4)*($medcount+1)); - $q1c=$q1b-1; - $q1diff=$q1-$q1b; - $total=0; - // fix if there are too few values to evaluate. - if ($q1c<0) {$q1c=0;} + break; + } - if ($q1 != $q1b) - { - //ODD NUMBER - $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result=Yii::app()->db->createCommand($query)->limit(2, $q1c)->query(); + unset($showem); - foreach ($result->readAll() as $row) - { - if ($total == 0) {$total=$total-$row[$fieldname];} + } - else {$total=$total+$row[$fieldname];} + } //end else -> check last character, greater/less/equals don't need special treatment - $lastnumber=$row[$fieldname]; - } + } //end else-if -> multiple numerical types - $q1total=$lastnumber-((1-$q1diff)*$total); + //is there some "id", "datestamp" or "D" within the type? + elseif (substr($rt, 0, 2) == "id" || substr($rt, 0, 9) == "datestamp" || ($firstletter == "D")) + { + /* + * DON'T show anything for date questions + * because there aren't any statistics implemented yet! + * + * See bug report #2539 and + * feature request #2620 + */ + } - if ($q1total < $minimum) {$q1total=$minimum;} + // NICE SIMPLE SINGLE OPTION ANSWERS + else + { + //search for key + $fielddata=$fieldmap[$rt]; + //print_r($fielddata); + //get SGQA IDs + $qsid=$fielddata['sid']; + $qgid=$fielddata['gid']; + $qqid=$fielddata['qid']; + $qanswer=$fielddata['aid']; + + //question type + $qtype=$fielddata['type']; + + //question string + $qastring=$fielddata['question']; + + //question ID + $rqid=$qqid; + + //get question data + $nquery = "SELECT title, type, question, qid, parent_qid, other FROM {{questions}} WHERE qid='{$rqid}' AND parent_qid=0 and language='{$language}'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); + + //loop though question data + foreach ($nresult->readAll() as $nrow) + { + $nrow=array_values($nrow); + $qtitle=flattenText($nrow[0]); + $qtype=$nrow[1]; + $qquestion=flattenText($nrow[2]); + $qiqid=$nrow[3]; + $qparentqid=$nrow[4]; + $qother=$nrow[5]; + } - $showem[]=array($statlang->gT("1st quartile (Q1)"), $q1total); - } - else - { - //EVEN NUMBER - $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result=Yii::app()->db->createCommand($query)->limit(1, $q1c)->query(); - - foreach ($result->readAll() as $row) - { - $showem[]=array($statlang->gT("1st quartile (Q1)"), $row[$fieldname]); - } - } + //check question types + switch($qtype) + { + //Array of 5 point choices (several items to rank!) + case "A": - $total=0; + //get data + $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; + $qresult=Yii::app()->db->createCommand($qquery)->query(); + //loop through results + foreach ($qresult->readAll() as $qrow) + { + $qrow=array_values($qrow); + //5-point array + for ($i=1; $i<=5; $i++) + { + //add data + $alist[]=array("$i", "$i"); + } + //add counter + $atext=flattenText($qrow[1]); + } - //MEDIAN (Q2) - $median=(1/2)*($medcount+1); - $medianb=(int)((1/2)*($medcount+1)); - $medianc=$medianb-1; - $mediandiff=$median-$medianb; + //list IDs and answer codes in brackets + $qquestion .= $linefeed."[".$atext."]"; + $qtitle .= "($qanswer)"; + break; - if ($median != $medianb) - { - //remainder - $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result=Yii::app()->db->createCommand($query)->limit(2, $medianc)->query(); - foreach ($result->readAll() as $row) {$total=$total+$row[$fieldname];} - $showem[]=array($statlang->gT("2nd quartile (Median)"), $total/2); - } + //Array of 10 point choices + //same as above just with 10 items + case "B": + $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; + $qresult=Yii::app()->db->createCommand($qquery)->query(); + foreach ($qresult->readAll() as $qrow) + { + $qrow=array_values($qrow); + for ($i=1; $i<=10; $i++) + { + $alist[]=array("$i", "$i"); + } + $atext=flattenText($qrow[1]); + } - else - { - //EVEN NUMBER - $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result = Yii::app()->db->createCommand($query)->limit(1, $medianc-1)->query(); - - foreach ($result->readAll() as $row) - { - $showem[]=array($statlang->gT("Median value"), $row[$fieldname]); - } - } + $qquestion .= $linefeed."[".$atext."]"; + $qtitle .= "($qanswer)"; + break; - $total=0; - //3RD QUARTILE (Q3) - $q3=(3/4)*($medcount+1); - $q3b=(int)((3/4)*($medcount+1)); - $q3c=$q3b-1; - $q3diff=$q3-$q3b; + //Array of Yes/No/$statlang->gT("Uncertain") + case "C": + $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; + $qresult=Yii::app()->db->createCommand($qquery)->query(); - if ($q3 != $q3b) - { - $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result = Yii::app()->db->createCommand($query)->limit(2,$q3c)->query(); + //loop thorugh results + foreach ($qresult->readAll() as $qrow) + { + $qrow=array_values($qrow); + //add results + $alist[]=array("Y", $statlang->gT("Yes")); + $alist[]=array("N", $statlang->gT("No")); + $alist[]=array("U", $statlang->gT("Uncertain")); + $atext=flattenText($qrow[1]); + } + //output + $qquestion .= $linefeed."[".$atext."]"; + $qtitle .= "($qanswer)"; + break; - foreach ($result->readAll() as $row) - { - if ($total == 0) {$total=$total-$row[$fieldname];} - else {$total=$total+$row[$fieldname];} - $lastnumber=$row[$fieldname]; - } - $q3total=$lastnumber-((1-$q3diff)*$total); + //Array of Yes/No/$statlang->gT("Uncertain") + //same as above + case "E": + $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; + $qresult=Yii::app()->db->createCommand($qquery)->query(); + foreach ($qresult->readAll() as $qrow) + { + $qrow=array_values($qrow); + $alist[]=array("I", $statlang->gT("Increase")); + $alist[]=array("S", $statlang->gT("Same")); + $alist[]=array("D", $statlang->gT("Decrease")); + $atext=flattenText($qrow[1]); + } + $qquestion .= $linefeed."[".$atext."]"; + $qtitle .= "($qanswer)"; + break; - if ($q3total < $maximum) {$q1total=$maximum;} - $showem[]=array($statlang->gT("3rd quartile (Q3)"), $q3total); - } + case ";": //Array (Multi Flexi) (Text) + list($qacode, $licode)=explode("_", $qanswer); - else - { - $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1"; - $result = Yii::app()->db->createCommand($query)->limit(1, $q3c); + $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qacode' AND language='{$language}' ORDER BY question_order"; + $qresult=Yii::app()->db->createCommand($qquery)->query(); - foreach ($result->queryAll() as $row) - { - $showem[]=array($statlang->gT("3rd quartile (Q3)"), $row[$fieldname]); - } - } + foreach ($qresult->readAll() as $qrow) + { + $qrow=array_values($qrow); + $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND code = '{$licode}' AND language='{$language}'ORDER BY sortorder, code"; + $fresult = Yii::app()->db->createCommand($fquery)->query(); + foreach ($fresult->readAll() as $frow) + { + $alist[]=array($frow['code'], $frow['answer']); + $ltext=$frow['answer']; + } + $atext=flattenText($qrow[1]); + } - $total=0; + $qquestion .= $linefeed."[".$atext."] [".$ltext."]"; + $qtitle .= "($qanswer)"; + break; - $showem[]=array($statlang->gT("Maximum"), $maximum); - //output results - foreach ($showem as $shw) - { - switch($outputType) - { - case 'xls': + case ":": //Array (Multiple Flexi) (Numbers) + $qidattributes=getQuestionAttributeValues($qiqid); + if (trim($qidattributes['multiflexible_max'])!='') { + $maxvalue=$qidattributes['multiflexible_max']; + } + else { + $maxvalue=10; + } - ++$xlsRow; - $sheet->write($xlsRow, 0,html_entity_decode($shw[0],ENT_QUOTES,'UTF-8')); - $sheet->write($xlsRow, 1,html_entity_decode($shw[1],ENT_QUOTES,'UTF-8')); + if (trim($qidattributes['multiflexible_min'])!='') + { + $minvalue=$qidattributes['multiflexible_min']; + } + else { + $minvalue=1; + } + if (trim($qidattributes['multiflexible_step'])!='') + { + $stepvalue=$qidattributes['multiflexible_step']; + } + else { + $stepvalue=1; + } - $tableXLS[] = array($shw[0],$shw[1]); + if ($qidattributes['multiflexible_checkbox']!=0) { + $minvalue=0; + $maxvalue=1; + $stepvalue=1; + } - break; - case 'pdf': + for($i=$minvalue; $i<=$maxvalue; $i+=$stepvalue) + { + $alist[]=array($i, $i); + } - $tablePDF[] = array(html_entity_decode($shw[0],ENT_QUOTES,'UTF-8'),html_entity_decode($shw[1],ENT_QUOTES,'UTF-8')); + $qquestion .= $linefeed."[".$fielddata['subquestion1']."] [".$fielddata['subquestion2']."]"; + list($myans, $mylabel)=explode("_", $qanswer); + $qtitle .= "[$myans][$mylabel]"; + break; - break; - case 'html': + case "F": //Array of Flexible + case "H": //Array of Flexible by Column + $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; + $qresult=Yii::app()->db->createCommand($qquery)->query(); - $statisticsoutput .= "\t\n" - ."\t\t$shw[0]\n" - ."\t\t$shw[1]\n" - ."\t\n"; + //loop through answers + foreach ($qresult->readAll() as $qrow) + { + $qrow=array_values($qrow); - break; - default: + //this question type uses its own labels + $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND language='{$language}'ORDER BY sortorder, code"; + $fresult = Yii::app()->db->createCommand($fquery)->query(); + //add code and title to results for outputting them later + foreach ($fresult->readAll() as $frow) + { + $alist[]=array($frow['code'], flattenText($frow['answer'])); + } - break; - } - } - switch($outputType) - { - case 'xls': + //counter + $atext=flattenText($qrow[1]); + } - ++$xlsRow; - $sheet->write($xlsRow, 0,$statlang->gT("Null values are ignored in calculations")); - ++$xlsRow; - $sheet->write($xlsRow, 0,sprintf($statlang->gT("Q1 and Q3 calculated using %s"), $statlang->gT("minitab method"))); + //output + $qquestion .= $linefeed."[".$atext."]"; + $qtitle .= "($qanswer)"; + break; - $footXLS[] = array($statlang->gT("Null values are ignored in calculations")); - $footXLS[] = array(sprintf($statlang->gT("Q1 and Q3 calculated using %s"), $statlang->gT("minitab method"))); - break; - case 'pdf': - $footPDF[] = array($statlang->gT("Null values are ignored in calculations")); - $footPDF[] = array(sprintf($statlang->gT("Q1 and Q3 calculated using %s"), "".$statlang->gT("minitab method")."")); - $pdf->addPage('P','A4'); - $pdf->Bookmark($pdf->delete_html($qquestion), 1, 0); - $pdf->titleintopdf($pdfTitle,$titleDesc); + case "G": //Gender + $alist[]=array("F", $statlang->gT("Female")); + $alist[]=array("M", $statlang->gT("Male")); + break; - $pdf->headTable($headPDF, $tablePDF); - $pdf->tablehead($footPDF); - break; - case 'html': + case "Y": //Yes\No + $alist[]=array("Y", $statlang->gT("Yes")); + $alist[]=array("N", $statlang->gT("No")); + break; - //footer of question type "N" - $statisticsoutput .= "\t\n" - ."\t\t\n" - ."\t\t\t".$statlang->gT("Null values are ignored in calculations")."
    \n" - ."\t\t\t".sprintf($statlang->gT("Q1 and Q3 calculated using %s"), "".$statlang->gT("minitab method")."") - ."    \n" - ."\t\t\n" - ."\t\n\n"; - break; - default: + case "I": //Language + // Using previously defined $surveylanguagecodes array of language codes + foreach ($surveylanguagecodes as $availlang) + { + $alist[]=array($availlang, getLanguageNameFromCode($availlang,false)); + } + break; - break; - } - //clean up - unset($showem); + case "5": //5 Point (just 1 item to rank!) + for ($i=1; $i<=5; $i++) + { + $alist[]=array("$i", "$i"); + } + break; - } //end if (enough results?) - //not enough (<1) results for calculation - else - { - switch($outputType) - { - case 'xls': + case "1": //array (dual scale) - $tableXLS = array(); - $tableXLS[] = array($statlang->gT("Not enough values for calculation")); + $sSubquestionQuery = "SELECT question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; + $questionDesc = Yii::app()->db->createCommand($sSubquestionQuery)->query()->read(); + $sSubquestion = flattenText($questionDesc["question"]); - ++$xlsRow; - $sheet->write($xlsRow, 0, $statlang->gT("Not enough values for calculation")); + //get question attributes + $qidattributes=getQuestionAttributeValues($qqid); + //check last character -> label 1 + if (substr($rt,-1,1) == 0) + { + //get label 1 + $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qqid}' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, code"; + //header available? + if (trim($qidattributes['dualscale_headerA'][$language])!='') { + //output + $labelheader= "[".$qidattributes['dualscale_headerA'][$language]."]"; + } - break; - case 'pdf': + //no header + else + { + $labelheader =''; + } - $tablePDF = array(); - $tablePDF[] = array($statlang->gT("Not enough values for calculation")); - $pdf->addPage('P','A4'); - $pdf->Bookmark($pdf->delete_html($qquestion), 1, 0); - $pdf->titleintopdf($pdfTitle,$titleDesc); + //output + $labelno = sprintf($clang->gT('Label %s'),'1'); + } - $pdf->equalTable($tablePDF); + //label 2 + else + { + //get label 2 + $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qqid}' AND scale_id=1 AND language='{$language}' ORDER BY sortorder, code"; - break; - case 'html': + //header available? + if (trim($qidattributes['dualscale_headerB'][$language])!='') { + //output + $labelheader= "[".$qidattributes['dualscale_headerB'][$language]."]"; + } - //output - $statisticsoutput .= "\t\n" - ."\t\t".$statlang->gT("Not enough values for calculation")."\n" - ."\t\n
    \n"; + //no header + else + { + $labelheader =''; + } - break; - default: + //output + $labelno = sprintf($clang->gT('Label %s'),'2'); + } + //get data + $fresult = Yii::app()->db->createCommand($fquery)->query(); - break; - } + //put label code and label title into array + foreach ($fresult->readAll() as $frow) + { + $alist[]=array($frow['code'], flattenText($frow['answer'])); + } - unset($showem); + //adapt title and question + $qtitle = $qtitle." [".$sSubquestion."][".$labelno."]"; + $qquestion = $qastring .$labelheader; + break; - } - } //end else -> check last character, greater/less/equals don't need special treatment - } //end else-if -> multiple numerical types - //is there some "id", "datestamp" or "D" within the type? - elseif (substr($rt, 0, 2) == "id" || substr($rt, 0, 9) == "datestamp" || ($firstletter == "D")) - { - /* - * DON'T show anything for date questions - * because there aren't any statistics implemented yet! - * - * See bug report #2539 and - * feature request #2620 - */ - } + default: //default handling - // NICE SIMPLE SINGLE OPTION ANSWERS - else - { - //search for key - $fielddata=$fieldmap[$rt]; - //print_r($fielddata); - //get SGQA IDs - $qsid=$fielddata['sid']; - $qgid=$fielddata['gid']; - $qqid=$fielddata['qid']; - $qanswer=$fielddata['aid']; - - //question type - $qtype=$fielddata['type']; - - //question string - $qastring=$fielddata['question']; - - //question ID - $rqid=$qqid; - - //get question data - $nquery = "SELECT title, type, question, qid, parent_qid, other FROM {{questions}} WHERE qid='{$rqid}' AND parent_qid=0 and language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + //get answer code and title + $qquery = "SELECT code, answer FROM {{answers}} WHERE qid='$qqid' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, answer"; + $qresult = Yii::app()->db->createCommand($qquery)->query(); - //loop though question data - foreach ($nresult->readAll() as $nrow) + //put answer code and title into array + foreach ($qresult->readAll() as $qrow) { - $nrow=array_values($nrow); - $qtitle=flattenText($nrow[0]); - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $qiqid=$nrow[3]; - $qparentqid=$nrow[4]; - $qother=$nrow[5]; + $qrow=array_values($qrow); + $alist[]=array("$qrow[0]", flattenText($qrow[1])); } - //check question types - switch($qtype) + //handling for "other" field for list radio or list drowpdown + if ((($qtype == "L" || $qtype == "!") && $qother == "Y")) { - //Array of 5 point choices (several items to rank!) - case "A": - - //get data - $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; - $qresult=Yii::app()->db->createCommand($qquery)->query(); + //add "other" + $alist[]=array($statlang->gT("Other"),$statlang->gT("Other"),$fielddata['fieldname'].'other'); + } + if ( $qtype == "O") + { + //add "comment" + $alist[]=array($statlang->gT("Comments"),$statlang->gT("Comments"),$fielddata['fieldname'].'comment'); + } - //loop through results - foreach ($qresult->readAll() as $qrow) - { - $qrow=array_values($qrow); - //5-point array - for ($i=1; $i<=5; $i++) - { - //add data - $alist[]=array("$i", "$i"); - } - //add counter - $atext=flattenText($qrow[1]); - } + } //end switch question type - //list IDs and answer codes in brackets - $qquestion .= $linefeed."[".$atext."]"; - $qtitle .= "($qanswer)"; - break; + //moved because it's better to have "no answer" at the end of the list instead of the beginning + //put data into array + $alist[]=array("", $statlang->gT("No answer")); + } + return array("alist"=>$alist, "qtitle"=>$qtitle, "qquestion"=>$qquestion, "qtype"=>$qtype); +} - //Array of 10 point choices - //same as above just with 10 items - case "B": - $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; - $qresult=Yii::app()->db->createCommand($qquery)->query(); - foreach ($qresult->readAll() as $qrow) - { - $qrow=array_values($qrow); - for ($i=1; $i<=10; $i++) - { - $alist[]=array("$i", "$i"); - } - $atext=flattenText($qrow[1]); - } +/** +* displayResults builds html output to display the actual results from a survey +* +* @param mixed $outputs +* @param INT $results The number of results being displayed overall +* @param mixed $rt +* @param mixed $outputType +* @param mixed $surveyid +* @param mixed $sql +* @param mixed $usegraph +*/ +function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $usegraph, $browse, $pdf) { - $qquestion .= $linefeed."[".$atext."]"; - $qtitle .= "($qanswer)"; - break; + /* Set up required variables */ + $TotalCompleted = 0; //Count of actually completed answers + $statlangcode = getBaseLanguageFromSurveyID($surveyid); + $statlang = new Limesurvey_lang($statlangcode); + $statisticsoutput=""; + $sDatabaseType = Yii::app()->db->getDriverName(); + switch($outputType) + { + case 'xls': + $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($outputs['qtitle'],ENT_QUOTES,'UTF-8')); + $xlsDesc = html_entity_decode($outputs['qquestion'],ENT_QUOTES,'UTF-8'); - //Array of Yes/No/$statlang->gT("Uncertain") - case "C": - $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; - $qresult=Yii::app()->db->createCommand($qquery)->query(); + ++$xlsRow; + ++$xlsRow; - //loop thorugh results - foreach ($qresult->readAll() as $qrow) - { - $qrow=array_values($qrow); - //add results - $alist[]=array("Y", $statlang->gT("Yes")); - $alist[]=array("N", $statlang->gT("No")); - $alist[]=array("U", $statlang->gT("Uncertain")); - $atext=flattenText($qrow[1]); - } - //output - $qquestion .= $linefeed."[".$atext."]"; - $qtitle .= "($qanswer)"; - break; + ++$xlsRow; + $sheet->write($xlsRow, 0,$xlsTitle); + ++$xlsRow; + $sheet->write($xlsRow, 0,$xlsDesc); + $tableXLS = array(); + $footXLS = array(); + break; + case 'pdf': - //Array of Yes/No/$statlang->gT("Uncertain") - //same as above - case "E": - $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; - $qresult=Yii::app()->db->createCommand($qquery)->query(); - foreach ($qresult->readAll() as $qrow) - { - $qrow=array_values($qrow); - $alist[]=array("I", $statlang->gT("Increase")); - $alist[]=array("S", $statlang->gT("Same")); - $alist[]=array("D", $statlang->gT("Decrease")); - $atext=flattenText($qrow[1]); - } - $qquestion .= $linefeed."[".$atext."]"; - $qtitle .= "($qanswer)"; - break; + $sPDFQuestion=flattenText($outputs['qquestion'],false,true); + $pdfTitle = $pdf->delete_html(sprintf($statlang->gT("Field summary for %s"),html_entity_decode($outputs['qtitle'],ENT_QUOTES,'UTF-8'))); + $titleDesc = $sPDFQuestion; + $pdf->addPage('P','A4'); + $pdf->Bookmark($sPDFQuestion, 1, 0); + $pdf->titleintopdf($pdfTitle,$sPDFQuestion); + $tablePDF = array(); + $footPDF = array(); - case ";": //Array (Multi Flexi) (Text) - list($qacode, $licode)=explode("_", $qanswer); + break; + case 'html': + //output + $statisticsoutput .= "\n" + ."\t\n" + ."\t\n" + ."\t\n\t\t\n" + ."\t\t\n" + ."\t\t\n" + ."\t\n"; + } - case "I": //Language - // Using previously defined $surveylanguagecodes array of language codes - foreach ($surveylanguagecodes as $availlang) + //check if aggregated results should be shown + elseif (Yii::app()->getConfig('showaggregateddata') == 1) + { + if(!isset($showheadline) || $showheadline != false) + { + if($outputs['qtype'] == "5" || $outputs['qtype'] == "A") + { + switch($outputType) { - $alist[]=array($availlang, getLanguageNameFromCode($availlang,false)); - } - break; + case 'xls': + $headXLS = array(); + $headXLS[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage"),$statlang->gT("Sum")); - case "5": //5 Point (just 1 item to rank!) - for ($i=1; $i<=5; $i++) - { - $alist[]=array("$i", "$i"); - } - break; + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Answer")); + $sheet->write($xlsRow,1,$statlang->gT("Count")); + $sheet->write($xlsRow,2,$statlang->gT("Percentage")); + $sheet->write($xlsRow,3,$statlang->gT("Sum")); + + break; + case 'pdf': + $headPDF = array(); + $headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage"),$statlang->gT("Sum")); + + break; + case 'html': + //four columns + $statisticsoutput .= "".$statlang->gT("Answer")."\n" + ."\t\t\n" + ."\t\t\n" + ."\t\t\n" + ."\t\n"; + break; + default: - case "1": //array (dual scale) - $sSubquestionQuery = "SELECT question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; - $questionDesc = Yii::app()->db->createCommand($sSubquestionQuery)->query()->read(); - $sSubquestion = flattenText($questionDesc["question"]); + break; + } - //get question attributes - $qidattributes=getQuestionAttributeValues($qqid); - //check last character -> label 1 - if (substr($rt,-1,1) == 0) + $showheadline = false; + } + else + { + switch($outputType) { - //get label 1 - $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qqid}' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, code"; + case 'xls': - //header available? - if (trim($qidattributes['dualscale_headerA'][$language])!='') { - //output - $labelheader= "[".$qidattributes['dualscale_headerA'][$language]."]"; - } + $headXLS = array(); + $headXLS[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); - //no header - else - { - $labelheader =''; - } + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Answer")); + $sheet->write($xlsRow,1,$statlang->gT("Count")); + $sheet->write($xlsRow,2,$statlang->gT("Percentage")); - //output - $labelno = sprintf($clang->gT('Label %s'),'1'); - } + break; - //label 2 - else - { - //get label 2 - $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qqid}' AND scale_id=1 AND language='{$language}' ORDER BY sortorder, code"; + case 'pdf': + + $headPDF = array(); + $headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); - //header available? - if (trim($qidattributes['dualscale_headerB'][$language])!='') { - //output - $labelheader= "[".$qidattributes['dualscale_headerB'][$language]."]"; - } + break; + case 'html': + //three columns + $statisticsoutput .= "".$statlang->gT("Answer")."\n" + ."\t\t\n" + ."\t\t\n" + ."\t\n"; + break; + default: - //no header - else - { - $labelheader =''; - } - //output - $labelno = sprintf($clang->gT('Label %s'),'2'); + break; } - //get data - $fresult = Yii::app()->db->createCommand($fquery)->query(); + $showheadline = false; + } - //put label code and label title into array - foreach ($fresult->readAll() as $frow) - { - $alist[]=array($frow['code'], flattenText($frow['answer'])); - } + } - //adapt title and question - $qtitle = $qtitle." [".$sSubquestion."][".$labelno."]"; - $qquestion = $qastring .$labelheader; - break; + //text for answer column is always needed + $fname="$al[1] ($al[0])"; + //these question types get special treatment by Yii::app()->getConfig('showaggregateddata') + if($outputs['qtype'] == "5" || $outputs['qtype'] == "A") + { + //put non-edited data in here because $row will be edited later + $grawdata[]=$row[0]; + $showaggregated_indice=count($grawdata) - 1; + $showaggregated_indice_table[$showaggregated_indice]="aggregated"; + $showaggregated_indice=-1; + + //keep in mind that we already added data (will be checked later) + $justadded = true; + + //we need a counter because we want to sum up certain values + //reset counter if 5 items have passed + if(!isset($testcounter) || $testcounter >= 4) + { + $testcounter = 0; + } + else + { + $testcounter++; + } + //beside the known percentage value a new aggregated value should be shown + //therefore this item is marked in a certain way + if($testcounter == 0 ) //add 300 to original value + { + //store the original value! + $tempcount = $row[0]; + //HACK: add three times the total number of results to the value + //This way we get a 300 + X percentage which can be checked later + $row[0] += (3*$results); + } - default: //default handling + //the third value should be shown twice later -> mark it + if($testcounter == 2) //add 400 to original value + { + //store the original value! + $tempcount = $row[0]; + //HACK: add four times the total number of results to the value + //This way there should be a 400 + X percentage which can be checked later + $row[0] += (4*$results); + } - //get answer code and title - $qquery = "SELECT code, answer FROM {{answers}} WHERE qid='$qqid' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, answer"; - $qresult = Yii::app()->db->createCommand($qquery)->query(); + //the last value aggregates the data of item 4 + item 5 later + if($testcounter == 4 ) //add 200 to original value + { + //store the original value! + $tempcount = $row[0]; + //HACK: add two times the total number of results to the value + //This way there should be a 200 + X percentage which can be checked later + $row[0] += (2*$results); + } - //put answer code and title into array - foreach ($qresult->readAll() as $qrow) - { - $qrow=array_values($qrow); - $alist[]=array("$qrow[0]", flattenText($qrow[1])); - } + } //end if -> question type = "5"/"A" - //handling for "other" field for list radio or list drowpdown - if ((($qtype == "L" || $qtype == "!") && $qother == "Y")) - { - //add "other" - $alist[]=array($statlang->gT("Other"),$statlang->gT("Other"),$fielddata['fieldname'].'other'); - } - if ( $qtype == "O") - { - //add "comment" - $alist[]=array($statlang->gT("Comments"),$statlang->gT("Comments"),$fielddata['fieldname'].'comment'); - } + } //end if -> show aggregated data - } //end switch question type + //handling what's left + else + { + if(!isset($showheadline) || $showheadline != false) + { + switch($outputType) + { + case 'xls': - //moved because it's better to have "no answer" at the end of the list instead of the beginning - //put data into array - $alist[]=array("", $statlang->gT("No answer")); + $headXLS = array(); + $headXLS[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); - } //end else -> single option answers + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Answer")); + $sheet->write($xlsRow,1,$statlang->gT("Count")); + $sheet->write($xlsRow,2,$statlang->gT("Percentage")); - //foreach ($alist as $al) {$statisticsoutput .= "$al[0] - $al[1]
    ";} //debugging line - //foreach ($fvalues as $fv) {$statisticsoutput .= "$fv | ";} //debugging line + break; + case 'pdf': + $headPDF = array(); + $headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); + break; + case 'html': + //three columns + $statisticsoutput .= "".$statlang->gT("Answer")."\n" + ."\t\t\n" + ."\t\t\n" + ."\t\n"; + break; + default: - //2. Collect and Display results ####################################################################### - if (isset($alist) && $alist) //Make sure there really is an answerlist, and if so: - { + break; + } - // this will count the answers considered completed - $TotalCompleted = 0; - switch($outputType) - { - case 'xls': + $showheadline = false; - $xlsTitle = sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8')); - $xlsDesc = html_entity_decode($qquestion,ENT_QUOTES,'UTF-8'); + } + //answer text + $fname="$al[1] ($al[0])"; + } - ++$xlsRow; - ++$xlsRow; + //are there some results to play with? + if ($results > 0) + { + //calculate percentage + $gdata[] = ($row[0]/$results)*100; + } + //no results + else + { + //no data! + $gdata[] = "N/A"; + } - ++$xlsRow; - $sheet->write($xlsRow, 0,$xlsTitle); - ++$xlsRow; - $sheet->write($xlsRow, 0,$xlsDesc); + //only add this if we don't handle question type "5"/"A" + if(!isset($justadded)) + { + //put absolute data into array + $grawdata[]=$row[0]; + } + else + { + //unset to handle "no answer" data correctly + unset($justadded); + } - $tableXLS = array(); - $footXLS = array(); + //put question title and code into array + $label[]=$fname; - break; - case 'pdf': + //put only the code into the array + $justcode[]=$al[0]; - $sPDFQuestion=flattenText($qquestion,false,true); - $pdfTitle = $pdf->delete_html(sprintf($statlang->gT("Field summary for %s"),html_entity_decode($qtitle,ENT_QUOTES,'UTF-8'))); - $titleDesc = $sPDFQuestion; + //edit labels and put them into antoher array - $pdf->addPage('P','A4'); - $pdf->Bookmark($sPDFQuestion, 1, 0); - $pdf->titleintopdf($pdfTitle,$sPDFQuestion); - $tablePDF = array(); - $footPDF = array(); + //first check if $tempcount is > 0. If yes, $row[0] has been modified and $tempcount has the original count. + if ($tempcount > 0) + { + $lbl[] = wordwrap(FlattenText("$al[1] ($tempcount)"), 25, "\n"); // NMO 2009-03-24 + $lblrtl[] = UTF8Strrev(wordwrap(FlattenText("$al[1] )$tempcount("), 25, "\n")); // NMO 2009-03-24 + } + else + { + $lbl[] = wordwrap(FlattenText("$al[1] ($row[0])"), 25, "\n"); // NMO 2009-03-24 + $lblrtl[] = UTF8Strrev(wordwrap(FlattenText("$al[1] )$row[0]("), 25, "\n")); // NMO 2009-03-24 - break; - case 'html': - //output - $statisticsoutput .= "
    " + + //headline + .sprintf($statlang->gT("Field summary for %s"),$outputs['qtitle'])."" + ."
    " + + //question title + .$outputs['qquestion']."
    "; + break; + default: - $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qacode' AND language='{$language}' ORDER BY question_order"; - $qresult=Yii::app()->db->createCommand($qquery)->query(); - foreach ($qresult->readAll() as $qrow) - { - $qrow=array_values($qrow); - $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND code = '{$licode}' AND language='{$language}'ORDER BY sortorder, code"; - $fresult = Yii::app()->db->createCommand($fquery)->query(); - foreach ($fresult->readAll() as $frow) - { - $alist[]=array($frow['code'], $frow['answer']); - $ltext=$frow['answer']; - } - $atext=flattenText($qrow[1]); - } + break; + } + echo ''; - $qquestion .= $linefeed."[".$atext."] [".$ltext."]"; - $qtitle .= "($qanswer)"; - break; + //loop thorugh the array which contains all answer data + foreach ($outputs['alist'] as $al) + { + //picks out answer list ($outputs['alist']/$al)) that come from the multiple list above + if (isset($al[2]) && $al[2]) + { + //handling for "other" option + if ($al[0] == $statlang->gT("Other")) + { + if($outputs['qtype']=='!' || $outputs['qtype']=='L') + { + // It is better for single choice question types to filter on the number of '-oth-' entries, than to + // just count the number of 'other' values - that way with failing Javascript the statistics don't get messed up + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName(substr($al[2],0,strlen($al[2])-5))."='-oth-'"; + } + else + { + //get data + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE "; + $query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." != ''" : "NOT (".Yii::app()->db->quoteColumnName($al[2])." LIKE '')"; + } + } - case ":": //Array (Multiple Flexi) (Numbers) - $qidattributes=getQuestionAttributeValues($qiqid); - if (trim($qidattributes['multiflexible_max'])!='') { - $maxvalue=$qidattributes['multiflexible_max']; - } - else { - $maxvalue=10; - } + /* + * text questions: + * + * U = huge free text + * T = long free text + * S = short free text + * Q = multiple short text + */ - if (trim($qidattributes['multiflexible_min'])!='') - { - $minvalue=$qidattributes['multiflexible_min']; - } - else { - $minvalue=1; - } + elseif ($outputs['qtype'] == "U" || $outputs['qtype'] == "T" || $outputs['qtype'] == "S" || $outputs['qtype'] == "Q" || $outputs['qtype'] == ";") + { + $sDatabaseType = Yii::app()->db->getDriverName(); - if (trim($qidattributes['multiflexible_step'])!='') - { - $stepvalue=$qidattributes['multiflexible_step']; - } - else { - $stepvalue=1; - } + //free text answers + if($al[0]=="Answers") + { + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE "; + $query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." != ''" : "NOT (".Yii::app()->db->quoteColumnName($al[2])." LIKE '')"; + } + //"no answer" handling + elseif($al[0]=="NoAnswer") + { + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( "; + $query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." = '')" : " (".Yii::app()->db->quoteColumnName($al[2])." LIKE ''))"; + } + } + elseif ($outputs['qtype'] == "O") + { + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( "; + $query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." <> '')" : " (".Yii::app()->db->quoteColumnName($al[2])." NOT LIKE ''))"; + // all other question types + } + else + { + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE " . Yii::app()->db->quoteColumnName($al[2])." ="; - if ($qidattributes['multiflexible_checkbox']!=0) { - $minvalue=0; - $maxvalue=1; - $stepvalue=1; - } + //ranking question? + if (substr($rt, 0, 1) == "R") + { + $query .= " '$al[0]'"; + } + else + { + $query .= " 'Y'"; + } + } - for($i=$minvalue; $i<=$maxvalue; $i+=$stepvalue) - { - $alist[]=array($i, $i); - } + } //end if -> alist set - $qquestion .= $linefeed."[".$fielddata['subquestion1']."] [".$fielddata['subquestion2']."]"; - list($myans, $mylabel)=explode("_", $qanswer); - $qtitle .= "[$myans][$mylabel]"; - break; + else + { + if ($al[0] != "") + { + //get more data + $sDatabaseType = Yii::app()->db->getDriverName(); + if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv') + { + // mssql cannot compare text blobs so we have to cast here + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE cast(".Yii::app()->db->quoteColumnName($rt)." as varchar)= '$al[0]'"; + } + else + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE " . Yii::app()->db->quoteColumnName($rt)." = '$al[0]'"; + } + else + { // This is for the 'NoAnswer' case + // We need to take into account several possibilities + // * NoAnswer cause the participant clicked the NoAnswer radio + // ==> in this case value is '' or ' ' + // * NoAnswer in text field + // ==> value is '' + // * NoAnswer due to conditions, or a page not displayed + // ==> value is NULL + if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv') + { + // mssql cannot compare text blobs so we have to cast here + //$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE (".sanitize_int($rt)." IS NULL " + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( " + // . "OR cast(".sanitize_int($rt)." as varchar) = '' " + . "cast(".Yii::app()->db->quoteColumnName($rt)." as varchar) = '' " + . "OR cast(".Yii::app()->db->quoteColumnName($rt)." as varchar) = ' ' )"; + } + else + // $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE (".sanitize_int($rt)." IS NULL " + $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( " + // . "OR ".sanitize_int($rt)." = '' " + . " ".Yii::app()->db->quoteColumnName($rt)." = '' " + . "OR ".Yii::app()->db->quoteColumnName($rt)." = ' ') "; + } - case "F": //Array of Flexible - case "H": //Array of Flexible by Column - $qquery = "SELECT title, question FROM {{questions}} WHERE parent_qid='$qiqid' AND title='$qanswer' AND language='{$language}' ORDER BY question_order"; - $qresult=Yii::app()->db->createCommand($qquery)->query(); + } - //loop through answers - foreach ($qresult->readAll() as $qrow) - { - $qrow=array_values($qrow); + //check filter option + if (incompleteAnsFilterState() == "inc") {$query .= " AND submitdate is null";} + elseif (incompleteAnsFilterState() == "filter") {$query .= " AND submitdate is not null";} - //this question type uses its own labels - $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND language='{$language}'ORDER BY sortorder, code"; - $fresult = Yii::app()->db->createCommand($fquery)->query(); + //check for any "sql" that has been passed from another script + if ($sql != "NULL") {$query .= " AND $sql";} - //add code and title to results for outputting them later - foreach ($fresult->readAll() as $frow) - { - $alist[]=array($frow['code'], flattenText($frow['answer'])); - } + //get data + $result=Yii::app()->db->createCommand($query)->query(); - //counter - $atext=flattenText($qrow[1]); - } + // $statisticsoutput .= "\n\n\n"; - //output - $qquestion .= $linefeed."[".$atext."]"; - $qtitle .= "($qanswer)"; - break; + // this just extracts the data, after we present + foreach ($result->readAll() as $row) + { + $row=array_values($row); + //store temporarily value of answer count of question type '5' and 'A'. + $tempcount = -1; //count can't be less han zero + //increase counter + $TotalCompleted += $row[0]; - case "G": //Gender - $alist[]=array("F", $statlang->gT("Female")); - $alist[]=array("M", $statlang->gT("Male")); - break; + //"no answer" handling + if ($al[0] === "") + {$fname=$statlang->gT("No answer");} + //"other" handling + //"Answers" means that we show an option to list answer to "other" text field + elseif ($al[0] === $statlang->gT("Other") || $al[0] === "Answers" || ($outputs['qtype'] === "O" && $al[0] === $statlang->gT("Comments")) || $outputs['qtype'] === "P") + { + if ($outputs['qtype'] == "P") $ColumnName_RM = $al[2]."comment"; + else $ColumnName_RM = $al[2]; + if ($outputs['qtype']=='O') { + $TotalCompleted -=$row[0]; + } + $fname="$al[1]"; + if ($browse===true) $fname .= " "; + } + /* + * text questions: + * + * U = huge free text + * T = long free text + * S = short free text + * Q = multiple short text + */ + elseif ($outputs['qtype'] == "S" || $outputs['qtype'] == "U" || $outputs['qtype'] == "T" || $outputs['qtype'] == "Q") + { + $headPDF = array(); + $headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); - case "Y": //Yes\No - $alist[]=array("Y", $statlang->gT("Yes")); - $alist[]=array("N", $statlang->gT("No")); - break; + //show free text answers + if ($al[0] == "Answers") + { + $fname= "$al[1]"; + if ($browse===true) $fname .= " "; + } + elseif ($al[0] == "NoAnswer") + { + $fname= "$al[1]"; + } + $statisticsoutput .= "" + ."".$statlang->gT("Count")."" + ."".$statlang->gT("Percentage")."
    " + ."".$statlang->gT("Count")."" + ."".$statlang->gT("Percentage")."" + ."".$statlang->gT("Sum")."
    " + ."".$statlang->gT("Count")."" + ."".$statlang->gT("Percentage")."
    " + ."".$statlang->gT("Count")."" + ."".$statlang->gT("Percentage")."
    \n" - ."\t\n" - ."\t\n" - ."\t\n\t\t\n" - ."\t\t\n" - ."\t\t\n" - ."\t\n"; - } + //loop through all available answers + while (isset($gdata[$i])) + { + //repeat header (answer, count, ...) for each new question + unset($showheadline); - //check if aggregated results should be shown - elseif (Yii::app()->getConfig('showaggregateddata') == 1) - { - if(!isset($showheadline) || $showheadline != false) - { - if($qtype == "5" || $qtype == "A") - { - switch($outputType) - { - case 'xls': - - $headXLS = array(); - $headXLS[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage"),$statlang->gT("Sum")); - - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Answer")); - $sheet->write($xlsRow,1,$statlang->gT("Count")); - $sheet->write($xlsRow,2,$statlang->gT("Percentage")); - $sheet->write($xlsRow,3,$statlang->gT("Sum")); - - break; - case 'pdf': - - $headPDF = array(); - $headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage"),$statlang->gT("Sum")); - - break; - case 'html': - //four columns - $statisticsoutput .= "".$statlang->gT("Answer")."\n" - ."\t\t\n" - ."\t\t\n" - ."\t\t\n" - ."\t\n"; - break; - default: - - - break; - } - - - $showheadline = false; - } - else - { - switch($outputType) - { - case 'xls': - - $headXLS = array(); - $headXLS[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); - - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Answer")); - $sheet->write($xlsRow,1,$statlang->gT("Count")); - $sheet->write($xlsRow,2,$statlang->gT("Percentage")); - - break; - - case 'pdf': - - $headPDF = array(); - $headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); - - break; - case 'html': - //three columns - $statisticsoutput .= "".$statlang->gT("Answer")."\n" - ."\t\t\n" - ."\t\t\n" - ."\t\n"; - break; - default: - - - break; - } - - $showheadline = false; - } - - } - - //text for answer column is always needed - $fname="$al[1] ($al[0])"; - - //these question types get special treatment by Yii::app()->getConfig('showaggregateddata') - if($qtype == "5" || $qtype == "A") - { - //put non-edited data in here because $row will be edited later - $grawdata[]=$row[0]; - $showaggregated_indice=count($grawdata) - 1; - $showaggregated_indice_table[$showaggregated_indice]="aggregated"; - $showaggregated_indice=-1; - - //keep in mind that we already added data (will be checked later) - $justadded = true; - - //we need a counter because we want to sum up certain values - //reset counter if 5 items have passed - if(!isset($testcounter) || $testcounter >= 4) - { - $testcounter = 0; - } - else - { - $testcounter++; - } - - //beside the known percentage value a new aggregated value should be shown - //therefore this item is marked in a certain way - - if($testcounter == 0 ) //add 300 to original value - { - //store the original value! - $tempcount = $row[0]; - //HACK: add three times the total number of results to the value - //This way we get a 300 + X percentage which can be checked later - $row[0] += (3*$results); - } - - //the third value should be shown twice later -> mark it - if($testcounter == 2) //add 400 to original value - { - //store the original value! - $tempcount = $row[0]; - //HACK: add four times the total number of results to the value - //This way there should be a 400 + X percentage which can be checked later - $row[0] += (4*$results); - } - - //the last value aggregates the data of item 4 + item 5 later - if($testcounter == 4 ) //add 200 to original value - { - //store the original value! - $tempcount = $row[0]; - //HACK: add two times the total number of results to the value - //This way there should be a 200 + X percentage which can be checked later - $row[0] += (2*$results); - } - - } //end if -> question type = "5"/"A" - - } //end if -> show aggregated data - - //handling what's left - else - { - if(!isset($showheadline) || $showheadline != false) - { - switch($outputType) - { - case 'xls': - - $headXLS = array(); - $headXLS[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); - - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Answer")); - $sheet->write($xlsRow,1,$statlang->gT("Count")); - $sheet->write($xlsRow,2,$statlang->gT("Percentage")); - - break; - case 'pdf': - - $headPDF = array(); - $headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); - - break; - case 'html': - //three columns - $statisticsoutput .= "".$statlang->gT("Answer")."\n" - ."\t\t\n" - ."\t\t\n" - ."\t\n"; - break; - default: - - - break; - } - - $showheadline = false; - - } - //answer text - $fname="$al[1] ($al[0])"; - } + /* + * there are 3 colums: + * + * 1 (50%) = answer (title and code in brackets) + * 2 (25%) = count (absolute) + * 3 (25%) = percentage + */ + $statisticsoutput .= "\t\n\t\t\n"; + /* + * If there is a "browse" button in this label, let's make sure there's an extra row afterwards + * to store the columnlist + * + * */ + if(strpos($label[$i], "class='statisticsbrowsebutton'")) + { + $extraline="\n"; + } - //are there some results to play with? - if ($results > 0) - { - //calculate percentage - $gdata[] = ($row[0]/$results)*100; - } - //no results - else - { - //no data! - $gdata[] = "N/A"; - } + //output absolute number of records + $statisticsoutput .= "\t\t"; - //only add this if we don't handle question type "5"/"A" - if(!isset($justadded)) - { - //put absolute data into array - $grawdata[]=$row[0]; - } - else - { - //unset to handle "no answer" data correctly - unset($justadded); - } - //put question title and code into array - $label[]=$fname; + //no data + if ($gdata[$i] == "N/A") + { + switch($outputType) + { + case 'xls': - //put only the code into the array - $justcode[]=$al[0]; + $label[$i]=flattenText($label[$i]); + $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $gdata[$i]). "%"); - //edit labels and put them into antoher array + ++$xlsRow; + $sheet->write($xlsRow,0,$label[$i]); + $sheet->write($xlsRow,1,$grawdata[$i]); + $sheet->write($xlsRow,2,sprintf("%01.2f", $gdata[$i]). "%"); - //first check if $tempcount is > 0. If yes, $row[0] has been modified and $tempcount has the original count. - if ($tempcount > 0) - { - $lbl[] = wordwrap(FlattenText("$al[1] ($tempcount)"), 25, "\n"); // NMO 2009-03-24 - $lblrtl[] = UTF8Strrev(wordwrap(FlattenText("$al[1] )$tempcount("), 25, "\n")); // NMO 2009-03-24 - } - else - { - $lbl[] = wordwrap(FlattenText("$al[1] ($row[0])"), 25, "\n"); // NMO 2009-03-24 - $lblrtl[] = UTF8Strrev(wordwrap(FlattenText("$al[1] )$row[0]("), 25, "\n")); // NMO 2009-03-24 + break; + case 'pdf': - } + $tablePDF[] = array(flattenText($label[$i]),$grawdata[$i],sprintf("%01.2f", $gdata[$i]). "%", ""); - } //end while -> loop through results + break; + case 'html': + //output when having no data + $statisticsoutput .= "\t\t"; + } + elseif ($outputs['qtype'] == "S" || $outputs['qtype'] == "U" || $outputs['qtype'] == "T" || $outputs['qtype'] == "Q") { - //calculate total number of incompleted records - $TotalIncomplete = $results - $TotalCompleted; + $statisticsoutput .= "\n\t"; + } + $statisticsoutput .= "\n"; //Close the row + if(isset($extraline)) {$statisticsoutput .= $extraline;} + break; + default: - //output - if ((incompleteAnsFilterState() != "filter")) - { - $fname=$statlang->gT("Not completed or Not displayed"); - } - else - { - $fname=$statlang->gT("Not displayed"); - } - //we need some data - if ($results > 0) - { - //calculate percentage - $gdata[] = ($TotalIncomplete/$results)*100; - } + break; + } - //no data :( - else - { - $gdata[] = "N/A"; - } + } - //put data of incompleted records into array - $grawdata[]=$TotalIncomplete; + //data available + else + { + //check if data should be aggregated + if(Yii::app()->getConfig('showaggregateddata') == 1 && ($outputs['qtype'] == "5" || $outputs['qtype'] == "A")) + { + //mark that we have done soemthing special here + $aggregated = true; - //put question title ("Not completed") into array - $label[]= $fname; + //just calculate everything once. the data is there in the array + if($itemcounter == 1) + { + //there are always 5 answers + for($x = 0; $x < 5; $x++) + { + //put 5 items into array for further calculations + array_push($stddevarray, $grawdata[$x]); + } + } - //put the code ("Not completed") into the array - $justcode[]=$fname; + //"no answer" & items 2 / 4 - nothing special to do here, just adjust output + if($gdata[$i] <= 100) + { + if($itemcounter == 2 && $label[$i+4] == $statlang->gT("No answer")) + { + //prevent division by zero + if(($results - $grawdata[$i+4]) > 0) + { + //re-calculate percentage + $percentage = ($grawdata[$i] / ($results - $grawdata[$i+4])) * 100; + } + else + { + $percentage = 0; + } - //edit labels and put them into antoher array - if ((incompleteAnsFilterState() != "filter")) + } + elseif($itemcounter == 4 && $label[$i+2] == $statlang->gT("No answer")) + { + //prevent division by zero + if(($results - $grawdata[$i+2]) > 0) { - $lbl[] = wordwrap(flattenText($statlang->gT("Not completed or Not displayed")." ($TotalIncomplete)"), 20, "\n"); // NMO 2009-03-24 + //re-calculate percentage + $percentage = ($grawdata[$i] / ($results - $grawdata[$i+2])) * 100; } else { - $lbl[] = wordwrap(flattenText($statlang->gT("Not displayed")." ($TotalIncomplete)"), 20, "\n"); // NMO 2009-03-24 + $percentage = 0; } - } //end else -> noncompleted NOT checked + } + else + { + $percentage = $gdata[$i]; + } + switch($outputType) + { + case 'xls': - } //end if -> no filtering of incomplete answers and no multiple option questions + $label[$i]=flattenText($label[$i]); + $tableXLS[]= array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%"); + ++$xlsRow; + $sheet->write($xlsRow,0,$label[$i]); + $sheet->write($xlsRow,1,$grawdata[$i]); + $sheet->write($xlsRow,2,sprintf("%01.2f", $percentage)."%"); - //counter - $i=0; + break; + case 'pdf': + $label[$i]=flattenText($label[$i]); + $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%", ""); - //we need to know which item we are editing - $itemcounter = 1; + break; + case 'html': + //output + $statisticsoutput .= "\t\t"; + break; + default: - /* - * there are 3 colums: - * - * 1 (50%) = answer (title and code in brackets) - * 2 (25%) = count (absolute) - * 3 (25%) = percentage - */ - $statisticsoutput .= "\t\n\t\t\n"; - /* - * If there is a "browse" button in this label, let's make sure there's an extra row afterwards - * to store the columnlist - * - * */ - if(strpos($label[$i], "class='statisticsbrowsebutton'")) - { - $extraline="\n"; + break; } - //output absolute number of records - $statisticsoutput .= "\t\t"; + } + //item 3 - just show results twice + //old: if($gdata[$i] >= 400) + //trying to fix bug #2583: + if($gdata[$i] >= 400 && $i != 0) + { + //remove "400" which was added before + $gdata[$i] -= 400; - //no data - if ($gdata[$i] == "N/A") + if($itemcounter == 3 && $label[$i+3] == $statlang->gT("No answer")) { - switch($outputType) + //prevent division by zero + if(($results - $grawdata[$i+3]) > 0) { - case 'xls': + //re-calculate percentage + $percentage = ($grawdata[$i] / ($results - $grawdata[$i+3])) * 100; + } + else + { + $percentage = 0; + } + } + else + { + //get the original percentage + $percentage = $gdata[$i]; + } + switch($outputType) + { + case 'xls': - $label[$i]=flattenText($label[$i]); - $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $gdata[$i]). "%"); + $label[$i]=flattenText($label[$i]); + $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $percentage)."%"); - ++$xlsRow; - $sheet->write($xlsRow,0,$label[$i]); - $sheet->write($xlsRow,1,$grawdata[$i]); - $sheet->write($xlsRow,2,sprintf("%01.2f", $gdata[$i]). "%"); + ++$xlsRow; + $sheet->write($xlsRow,0,$label[$i]); + $sheet->write($xlsRow,1,$grawdata[$i]); + $sheet->write($xlsRow,2,sprintf("%01.2f", $percentage)."%"); + $sheet->write($xlsRow,3,sprintf("%01.2f", $percentage)."%"); - break; - case 'pdf': + break; + case 'pdf': + $label[$i]=flattenText($label[$i]); + $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $percentage)."%"); - $tablePDF[] = array(flattenText($label[$i]),$grawdata[$i],sprintf("%01.2f", $gdata[$i]). "%", ""); + break; + case 'html': + //output percentage + $statisticsoutput .= "\t\t"; + + //output again (no real aggregation here) + $statisticsoutput .= "\t\t\t\t"; + break; + default: - break; - case 'html': - //output when having no data - $statisticsoutput .= "\t\t"; - } - elseif ($qtype == "S" || $qtype == "U" || $qtype == "T" || $qtype == "Q") - { - $statisticsoutput .= "\n\t"; - } - $statisticsoutput .= "\n"; //Close the row - if(isset($extraline)) {$statisticsoutput .= $extraline;} - break; - default: + break; + } - break; - } + } - } + //FIRST value -> add percentage of item 1 + item 2 + //old: if($gdata[$i] >= 300 && $gdata[$i] < 400) + //trying to fix bug #2583: + if(($gdata[$i] >= 300 && $gdata[$i] < 400) || ($i == 0 && $gdata[$i] <= 400)) + { + //remove "300" which was added before + $gdata[$i] -= 300; - //data available - else + if($itemcounter == 1 && $label[$i+5] == $statlang->gT("No answer")) { - //check if data should be aggregated - if(Yii::app()->getConfig('showaggregateddata') == 1 && ($qtype == "5" || $qtype == "A")) + //prevent division by zero + if(($results - $grawdata[$i+5]) > 0) { - //mark that we have done soemthing special here - $aggregated = true; - - //just calculate everything once. the data is there in the array - if($itemcounter == 1) - { - //there are always 5 answers - for($x = 0; $x < 5; $x++) - { - //put 5 items into array for further calculations - array_push($stddevarray, $grawdata[$x]); - } - } - - //"no answer" & items 2 / 4 - nothing special to do here, just adjust output - if($gdata[$i] <= 100) - { - if($itemcounter == 2 && $label[$i+4] == $statlang->gT("No answer")) - { - //prevent division by zero - if(($results - $grawdata[$i+4]) > 0) - { - //re-calculate percentage - $percentage = ($grawdata[$i] / ($results - $grawdata[$i+4])) * 100; - } - else - { - $percentage = 0; - } - - } - elseif($itemcounter == 4 && $label[$i+2] == $statlang->gT("No answer")) - { - //prevent division by zero - if(($results - $grawdata[$i+2]) > 0) - { - //re-calculate percentage - $percentage = ($grawdata[$i] / ($results - $grawdata[$i+2])) * 100; - } - else - { - $percentage = 0; - } - } - else - { - $percentage = $gdata[$i]; - } - switch($outputType) - { - case 'xls': - - $label[$i]=flattenText($label[$i]); - $tableXLS[]= array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%"); - - ++$xlsRow; - $sheet->write($xlsRow,0,$label[$i]); - $sheet->write($xlsRow,1,$grawdata[$i]); - $sheet->write($xlsRow,2,sprintf("%01.2f", $percentage)."%"); - - break; - case 'pdf': - $label[$i]=flattenText($label[$i]); - $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%", ""); - - break; - case 'html': - //output - $statisticsoutput .= "\t\t"; - break; - default: - - - break; - } - - } - - //item 3 - just show results twice - //old: if($gdata[$i] >= 400) - //trying to fix bug #2583: - if($gdata[$i] >= 400 && $i != 0) - { - //remove "400" which was added before - $gdata[$i] -= 400; - - if($itemcounter == 3 && $label[$i+3] == $statlang->gT("No answer")) - { - //prevent division by zero - if(($results - $grawdata[$i+3]) > 0) - { - //re-calculate percentage - $percentage = ($grawdata[$i] / ($results - $grawdata[$i+3])) * 100; - } - else - { - $percentage = 0; - } - } - else - { - //get the original percentage - $percentage = $gdata[$i]; - } - switch($outputType) - { - case 'xls': - - $label[$i]=flattenText($label[$i]); - $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $percentage)."%"); - - ++$xlsRow; - $sheet->write($xlsRow,0,$label[$i]); - $sheet->write($xlsRow,1,$grawdata[$i]); - $sheet->write($xlsRow,2,sprintf("%01.2f", $percentage)."%"); - $sheet->write($xlsRow,3,sprintf("%01.2f", $percentage)."%"); - - break; - case 'pdf': - $label[$i]=flattenText($label[$i]); - $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $percentage)."%"); - - break; - case 'html': - //output percentage - $statisticsoutput .= "\t\t"; - - //output again (no real aggregation here) - $statisticsoutput .= "\t\t\t\t"; - break; - default: - - - break; - } - - } - - //FIRST value -> add percentage of item 1 + item 2 - //old: if($gdata[$i] >= 300 && $gdata[$i] < 400) - //trying to fix bug #2583: - if(($gdata[$i] >= 300 && $gdata[$i] < 400) || ($i == 0 && $gdata[$i] <= 400)) - { - //remove "300" which was added before - $gdata[$i] -= 300; - - if($itemcounter == 1 && $label[$i+5] == $statlang->gT("No answer")) - { - //prevent division by zero - if(($results - $grawdata[$i+5]) > 0) - { - //re-calculate percentage - $percentage = ($grawdata[$i] / ($results - $grawdata[$i+5])) * 100; - $percentage2 = ($grawdata[$i + 1] / ($results - $grawdata[$i+5])) * 100; - } - else - { - $percentage = 0; - $percentage2 = 0; - - } - } - else - { - $percentage = $gdata[$i]; - $percentage2 = $gdata[$i+1]; - } - //percentage of item 1 + item 2 - $aggregatedgdata = $percentage + $percentage2; - - - switch($outputType) - { - case 'xls': - - $label[$i]=flattenText($label[$i]); - $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $aggregatedgdata)."%"); - - ++$xlsRow; - $sheet->write($xlsRow,0,$label[$i]); - $sheet->write($xlsRow,1,$grawdata[$i]); - $sheet->write($xlsRow,2,sprintf("%01.2f", $percentage)."%"); - $sheet->write($xlsRow,3,sprintf("%01.2f", $aggregatedgdata)."%"); - - break; - case 'pdf': - $label[$i]=flattenText($label[$i]); - $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $aggregatedgdata)."%"); - - break; - case 'html': - //output percentage - $statisticsoutput .= "\t\t"; - - //output aggregated data - $statisticsoutput .= "\t\t\t\t"; - break; - default: - - - break; - } - } - - //LAST value -> add item 4 + item 5 - if($gdata[$i] > 100 && $gdata[$i] < 300) - { - //remove "200" which was added before - $gdata[$i] -= 200; - - if($itemcounter == 5 && $label[$i+1] == $statlang->gT("No answer")) - { - //prevent division by zero - if(($results - $grawdata[$i+1]) > 0) - { - //re-calculate percentage - $percentage = ($grawdata[$i] / ($results - $grawdata[$i+1])) * 100; - $percentage2 = ($grawdata[$i - 1] / ($results - $grawdata[$i+1])) * 100; - } - else - { - $percentage = 0; - $percentage2 = 0; - } - } - else - { - $percentage = $gdata[$i]; - $percentage2 = $gdata[$i-1]; - } - - //item 4 + item 5 - $aggregatedgdata = $percentage + $percentage2; - switch($outputType) - { - case 'xls': - - $label[$i]=flattenText($label[$i]); - $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $aggregatedgdata)."%"); - - ++$xlsRow; - $sheet->write($xlsRow,0,$label[$i]); - $sheet->write($xlsRow,1,$grawdata[$i]); - $sheet->write($xlsRow,2,sprintf("%01.2f", $percentage)."%"); - $sheet->write($xlsRow,3,sprintf("%01.2f", $aggregatedgdata)."%"); - - break; - case 'pdf': - $label[$i]=flattenText($label[$i]); - $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $aggregatedgdata)."%"); - - break; - case 'html': - //output percentage - $statisticsoutput .= "\t\t"; - - //output aggregated data - $statisticsoutput .= "\t\t\t\t"; - break; - default: - - - break; - } - - // create new row "sum" - //calculate sum of items 1-5 - $sumitems = $grawdata[$i] - + $grawdata[$i-1] - + $grawdata[$i-2] - + $grawdata[$i-3] - + $grawdata[$i-4]; - - //special treatment for zero values - if($sumitems > 0) - { - $sumpercentage = "100.00"; - } - else - { - $sumpercentage = "0"; - } - //special treatment for zero values - if($TotalCompleted > 0) - { - $casepercentage = "100.00"; - } - else - { - $casepercentage = "0"; - } - switch($outputType) - { - case 'xls': - - - $footXLS[] = array($statlang->gT("Sum")." (".$statlang->gT("Answers").")",$sumitems,$sumpercentage."%",$sumpercentage."%"); - $footXLS[] = array($statlang->gT("Number of cases"),$TotalCompleted,$casepercentage."%",""); - - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Sum")." (".$statlang->gT("Answers").")"); - $sheet->write($xlsRow,1,$sumitems); - $sheet->write($xlsRow,2,$sumpercentage."%"); - $sheet->write($xlsRow,3,$sumpercentage."%"); - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Number of cases")); - $sheet->write($xlsRow,1,$TotalCompleted); - $sheet->write($xlsRow,2,$casepercentage."%"); - - break; - case 'pdf': - - $footPDF[] = array($statlang->gT("Sum")." (".$statlang->gT("Answers").")",$sumitems,$sumpercentage."%",$sumpercentage."%"); - $footPDF[] = array($statlang->gT("Number of cases"),$TotalCompleted,$casepercentage."%",""); - - break; - case 'html': - $statisticsoutput .= "\t\t \n\t\n"; - $statisticsoutput .= ""; - $statisticsoutput .= ""; - $statisticsoutput .= ""; - $statisticsoutput .= ""; - $statisticsoutput .= "\t\t \n\t\n"; - - $statisticsoutput .= ""; //German: "Fallzahl" - $statisticsoutput .= ""; - $statisticsoutput .= ""; - //there has to be a whitespace within the table cell to display correctly - $statisticsoutput .= ""; - break; - default: - - - break; - } - - } - - } //end if -> show aggregated data - - //don't show aggregated data + //re-calculate percentage + $percentage = ($grawdata[$i] / ($results - $grawdata[$i+5])) * 100; + $percentage2 = ($grawdata[$i + 1] / ($results - $grawdata[$i+5])) * 100; + } else { - switch($outputType) - { - case 'xls': - $label[$i]=flattenText($label[$i]); - $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $gdata[$i])."%", ""); - - ++$xlsRow; - $sheet->write($xlsRow,0,$label[$i]); - $sheet->write($xlsRow,1,$grawdata[$i]); - $sheet->write($xlsRow,2,sprintf("%01.2f", $gdata[$i])."%"); - - break; - case 'pdf': - $label[$i]=flattenText($label[$i]); - $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $gdata[$i])."%", ""); - - break; - case 'html': - //output percentage - $statisticsoutput .= "\t\t\n\t\n"; - if(isset($extraline)) {$statisticsoutput .= $extraline;} - break; - default: - - - break; - } + $percentage = 0; + $percentage2 = 0; } + } + else + { + $percentage = $gdata[$i]; + $percentage2 = $gdata[$i+1]; + } + //percentage of item 1 + item 2 + $aggregatedgdata = $percentage + $percentage2; + - } //end else -> $gdata[$i] != "N/A" + switch($outputType) + { + case 'xls': + $label[$i]=flattenText($label[$i]); + $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $aggregatedgdata)."%"); + ++$xlsRow; + $sheet->write($xlsRow,0,$label[$i]); + $sheet->write($xlsRow,1,$grawdata[$i]); + $sheet->write($xlsRow,2,sprintf("%01.2f", $percentage)."%"); + $sheet->write($xlsRow,3,sprintf("%01.2f", $aggregatedgdata)."%"); - //increase counter - $i++; + break; + case 'pdf': + $label[$i]=flattenText($label[$i]); + $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $aggregatedgdata)."%"); - $itemcounter++; + break; + case 'html': + //output percentage + $statisticsoutput .= "\t\t"; + + //output aggregated data + $statisticsoutput .= "\t\t\t\t"; + break; + default: - //Clear extraline - unset($extraline); - } //end while + break; + } + } - //only show additional values when this setting is enabled - if(Yii::app()->getConfig('showaggregateddata') == 1 ) + //LAST value -> add item 4 + item 5 + if($gdata[$i] > 100 && $gdata[$i] < 300) { - //it's only useful to calculate standard deviation and arithmetic means for question types - //5 = 5 Point Scale - //A = Array (5 Point Choice) - if($qtype == "5" || $qtype == "A") - { - $stddev = 0; - $am = 0; + //remove "200" which was added before + $gdata[$i] -= 200; - //calculate arithmetic mean - if(isset($sumitems) && $sumitems > 0) + if($itemcounter == 5 && $label[$i+1] == $statlang->gT("No answer")) + { + //prevent division by zero + if(($results - $grawdata[$i+1]) > 0) { - - - //calculate and round results - //there are always 5 items - for($x = 0; $x < 5; $x++) - { - //create product of item * value - $am += (($x+1) * $stddevarray[$x]); - } - - //prevent division by zero - if(isset($stddevarray) && array_sum($stddevarray) > 0) - { - $am = round($am / array_sum($stddevarray),2); - } - else - { - $am = 0; - } - - //calculate standard deviation -> loop through all data - /* - * four steps to calculate the standard deviation - * 1 = calculate difference between item and arithmetic mean and multiply with the number of elements - * 2 = create sqaure value of difference - * 3 = sum up square values - * 4 = multiply result with 1 / (number of items) - * 5 = get root - */ - - - - for($j = 0; $j < 5; $j++) - { - //1 = calculate difference between item and arithmetic mean - $diff = (($j+1) - $am); - - //2 = create square value of difference - $squarevalue = square($diff); - - //3 = sum up square values and multiply them with the occurence - //prevent divison by zero - if($squarevalue != 0 && $stddevarray[$j] != 0) - { - $stddev += $squarevalue * $stddevarray[$j]; - } - - } - - //4 = multiply result with 1 / (number of items (=5)) - //There are two different formulas to calculate standard derivation - //$stddev = $stddev / array_sum($stddevarray); //formula source: http://de.wikipedia.org/wiki/Standardabweichung - - //prevent division by zero - if((array_sum($stddevarray)-1) != 0 && $stddev != 0) - { - $stddev = $stddev / (array_sum($stddevarray)-1); //formula source: http://de.wikipedia.org/wiki/Empirische_Varianz - } - else - { - $stddev = 0; - } - - //5 = get root - $stddev = sqrt($stddev); - $stddev = round($stddev,2); + //re-calculate percentage + $percentage = ($grawdata[$i] / ($results - $grawdata[$i+1])) * 100; + $percentage2 = ($grawdata[$i - 1] / ($results - $grawdata[$i+1])) * 100; } - switch($outputType) + else { - case 'xls': + $percentage = 0; + $percentage2 = 0; + } + } + else + { + $percentage = $gdata[$i]; + $percentage2 = $gdata[$i-1]; + } - $tableXLS[] = array($statlang->gT("Arithmetic mean"),$am,'',''); - $tableXLS[] = array($statlang->gT("Standard deviation"),$stddev,'',''); + //item 4 + item 5 + $aggregatedgdata = $percentage + $percentage2; + switch($outputType) + { + case 'xls': - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Arithmetic mean")); - $sheet->write($xlsRow,1,$am); + $label[$i]=flattenText($label[$i]); + $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $aggregatedgdata)."%"); - ++$xlsRow; - $sheet->write($xlsRow,0,$statlang->gT("Standard deviation")); - $sheet->write($xlsRow,1,$stddev); + ++$xlsRow; + $sheet->write($xlsRow,0,$label[$i]); + $sheet->write($xlsRow,1,$grawdata[$i]); + $sheet->write($xlsRow,2,sprintf("%01.2f", $percentage)."%"); + $sheet->write($xlsRow,3,sprintf("%01.2f", $aggregatedgdata)."%"); - break; - case 'pdf': + break; + case 'pdf': + $label[$i]=flattenText($label[$i]); + $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $percentage)."%",sprintf("%01.2f", $aggregatedgdata)."%"); - $tablePDF[] = array($statlang->gT("Arithmetic mean"),$am,'',''); - $tablePDF[] = array($statlang->gT("Standard deviation"),$stddev,'',''); + break; + case 'html': + //output percentage + $statisticsoutput .= "\t\t"; + + //output aggregated data + $statisticsoutput .= "\t\t\t\t"; + break; + default: - break; - case 'html': - //calculate standard deviation - $statisticsoutput .= ""; //German: "Fallzahl" - $statisticsoutput .= ""; - $statisticsoutput .= ""; //German: "Fallzahl" - $statisticsoutput .= ""; - break; - default: + break; + } + // create new row "sum" + //calculate sum of items 1-5 + $sumitems = $grawdata[$i] + + $grawdata[$i-1] + + $grawdata[$i-2] + + $grawdata[$i-3] + + $grawdata[$i-4]; - break; - } + //special treatment for zero values + if($sumitems > 0) + { + $sumpercentage = "100.00"; + } + else + { + $sumpercentage = "0"; + } + //special treatment for zero values + if($TotalCompleted > 0) + { + $casepercentage = "100.00"; + } + else + { + $casepercentage = "0"; + } + switch($outputType) + { + case 'xls': + + + $footXLS[] = array($statlang->gT("Sum")." (".$statlang->gT("Answers").")",$sumitems,$sumpercentage."%",$sumpercentage."%"); + $footXLS[] = array($statlang->gT("Number of cases"),$TotalCompleted,$casepercentage."%",""); + + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Sum")." (".$statlang->gT("Answers").")"); + $sheet->write($xlsRow,1,$sumitems); + $sheet->write($xlsRow,2,$sumpercentage."%"); + $sheet->write($xlsRow,3,$sumpercentage."%"); + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Number of cases")); + $sheet->write($xlsRow,1,$TotalCompleted); + $sheet->write($xlsRow,2,$casepercentage."%"); + + break; + case 'pdf': + + $footPDF[] = array($statlang->gT("Sum")." (".$statlang->gT("Answers").")",$sumitems,$sumpercentage."%",$sumpercentage."%"); + $footPDF[] = array($statlang->gT("Number of cases"),$TotalCompleted,$casepercentage."%",""); + + break; + case 'html': + $statisticsoutput .= "\t\t \n\t\n"; + $statisticsoutput .= ""; + $statisticsoutput .= ""; + $statisticsoutput .= ""; + $statisticsoutput .= ""; + $statisticsoutput .= "\t\t \n\t\n"; + + $statisticsoutput .= ""; //German: "Fallzahl" + $statisticsoutput .= ""; + $statisticsoutput .= ""; + //there has to be a whitespace within the table cell to display correctly + $statisticsoutput .= ""; + break; + default: + + + break; } + } - if($outputType=='pdf') //XXX TODO PDF + } //end if -> show aggregated data + + //don't show aggregated data + else + { + switch($outputType) { - //$tablePDF = array(); - $tablePDF = array_merge_recursive($tablePDF, $footPDF); - $pdf->headTable($headPDF,$tablePDF); - //$pdf->tableintopdf($tablePDF); - - // if(isset($footPDF)) - // foreach($footPDF as $foot) - // { - // $footA = array($foot); - // $pdf->tablehead($footA); - // } - } - - if ($outputType=='html') { - $statisticsoutput .= "\n\t\n"; + if(isset($extraline)) {$statisticsoutput .= $extraline;} + break; + default: - $pdf->AddPage('P','A4'); - $pdf->titleintopdf($pdfTitle,$titleDesc); - $pdf->Image($tempdir."/".$cachefilename, 0, 70, 180, 0, '', $homeurl."/admin.php?sid=$surveyid", 'B', true, 150,'C',false,false,0,true); + break; + } - break; - case 'html': - $statisticsoutput .= ""; - - $aattr = getQuestionAttributeValues($qqid, $firstletter); - if ($bShowMap) { - $statisticsoutput .= "
    "; - - $agmapdata[$rt] = array ( - "coord" => getQuestionMapData(substr($rt, 1), $qsid), - "zoom" => $aattr['location_mapzoom'], - "width" => $aattr['location_mapwidth'], - "height" => $aattr['location_mapheight'] - ); - } - break; - default: + } + } //end else -> $gdata[$i] != "N/A" - break; - } - } + + //increase counter + $i++; + + $itemcounter++; + + //Clear extraline + unset($extraline); + + } //end while + + //only show additional values when this setting is enabled + if(Yii::app()->getConfig('showaggregateddata') == 1 ) + { + //it's only useful to calculate standard deviation and arithmetic means for question types + //5 = 5 Point Scale + //A = Array (5 Point Choice) + if($outputs['qtype'] == "5" || $outputs['qtype'] == "A") + { + $stddev = 0; + $am = 0; + + //calculate arithmetic mean + if(isset($sumitems) && $sumitems > 0) + { + + + //calculate and round results + //there are always 5 items + for($x = 0; $x < 5; $x++) + { + //create product of item * value + $am += (($x+1) * $stddevarray[$x]); } - //close table/output - if($outputType=='html') { - if ($usegraph==1) { - $sImgUrl = Yii::app()->getConfig('adminimageurl'); + //prevent division by zero + if(isset($stddevarray) && array_sum($stddevarray) > 0) + { + $am = round($am / array_sum($stddevarray),2); + } + else + { + $am = 0; + } + + //calculate standard deviation -> loop through all data + /* + * four steps to calculate the standard deviation + * 1 = calculate difference between item and arithmetic mean and multiply with the number of elements + * 2 = create sqaure value of difference + * 3 = sum up square values + * 4 = multiply result with 1 / (number of items) + * 5 = get root + */ + + + + for($j = 0; $j < 5; $j++) + { + //1 = calculate difference between item and arithmetic mean + $diff = (($j+1) - $am); - $statisticsoutput .= ""; + //2 = create square value of difference + $squarevalue = square($diff); + //3 = sum up square values and multiply them with the occurence + //prevent divison by zero + if($squarevalue != 0 && $stddevarray[$j] != 0) + { + $stddev += $squarevalue * $stddevarray[$j]; } - $statisticsoutput .= "
    " + } - //headline - .sprintf($statlang->gT("Field summary for %s"),$qtitle)."" - ."
    " + } //end while -> loop through results - //question title - .$qquestion."
    "; - break; - default: + } //end foreach -> loop through answer data + //no filtering of incomplete answers and NO multiple option questions + //if ((incompleteAnsFilterState() != "filter") and ($outputs['qtype'] != "M") and ($outputs['qtype'] != "P")) + //error_log("TIBO ".print_r($showaggregated_indice_table,true)); + if (($outputs['qtype'] != "M") and ($outputs['qtype'] != "P")) + { + //is the checkbox "Don't consider NON completed responses (only works when Filter incomplete answers is Disable)" checked? + //if (isset($_POST["noncompleted"]) and ($_POST["noncompleted"] == "on") && (isset(Yii::app()->getConfig('showaggregateddata')) && Yii::app()->getConfig('showaggregateddata') == 0)) + // TIBO: TODO WE MUST SKIP THE FOLLOWING SECTION FOR TYPE A and 5 when + // showaggreagated data is set and set to 1 + if (isset($_POST["noncompleted"]) and ($_POST["noncompleted"] == "on") ) + { + //counter + $i=0; - break; + while (isset($gdata[$i])) + { + if (isset($showaggregated_indice_table[$i]) && $showaggregated_indice_table[$i]=="aggregated") + { // do nothing, we don't rewrite aggregated results + // or at least I don't know how !!! (lemeur) } - echo ''; - - //loop thorugh the array which contains all answer data - foreach ($alist as $al) + else { - //picks out answer list ($alist/$al)) that come from the multiple list above - if (isset($al[2]) && $al[2]) + //we want to have some "real" data here + if ($gdata[$i] != "N/A") { - //handling for "other" option + //calculate percentage + $gdata[$i] = ($grawdata[$i]/$TotalCompleted)*100; + } + } - if ($al[0] == $statlang->gT("Other")) - { - if($qtype=='!' || $qtype=='L') - { - // It is better for single choice question types to filter on the number of '-oth-' entries, than to - // just count the number of 'other' values - that way with failing Javascript the statistics don't get messed up - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName(substr($al[2],0,strlen($al[2])-5))."='-oth-'"; - } - else - { - //get data - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE "; - $query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." != ''" : "NOT (".Yii::app()->db->quoteColumnName($al[2])." LIKE '')"; - } - } + //increase counter + $i++; - /* - * text questions: - * - * U = huge free text - * T = long free text - * S = short free text - * Q = multiple short text - */ + } //end while (data available) - elseif ($qtype == "U" || $qtype == "T" || $qtype == "S" || $qtype == "Q" || $qtype == ";") - { - $sDatabaseType = Yii::app()->db->getDriverName(); - - //free text answers - if($al[0]=="Answers") - { - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE "; - $query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." != ''" : "NOT (".Yii::app()->db->quoteColumnName($al[2])." LIKE '')"; - } - //"no answer" handling - elseif($al[0]=="NoAnswer") - { - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( "; - $query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." = '')" : " (".Yii::app()->db->quoteColumnName($al[2])." LIKE ''))"; - } - } - elseif ($qtype == "O") - { - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( "; - $query .= ($sDatabaseType == "mysql")? Yii::app()->db->quoteColumnName($al[2])." <> '')" : " (".Yii::app()->db->quoteColumnName($al[2])." NOT LIKE ''))"; - // all other question types - } - else - { - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE " . Yii::app()->db->quoteColumnName($al[2])." ="; - - //ranking question? - if (substr($rt, 0, 1) == "R") - { - $query .= " '$al[0]'"; - } - else - { - $query .= " 'Y'"; - } - } + } //end if -> noncompleted checked - } //end if -> alist set + //noncompleted is NOT checked + else + { + //calculate total number of incompleted records + $TotalIncomplete = $results - $TotalCompleted; - else - { - if ($al[0] != "") - { - //get more data - $sDatabaseType = Yii::app()->db->getDriverName(); - if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv') - { - // mssql cannot compare text blobs so we have to cast here - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE cast(".Yii::app()->db->quoteColumnName($rt)." as varchar)= '$al[0]'"; - } - else - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE " . Yii::app()->db->quoteColumnName($rt)." = '$al[0]'"; - } - else - { // This is for the 'NoAnswer' case - // We need to take into account several possibilities - // * NoAnswer cause the participant clicked the NoAnswer radio - // ==> in this case value is '' or ' ' - // * NoAnswer in text field - // ==> value is '' - // * NoAnswer due to conditions, or a page not displayed - // ==> value is NULL - if ($sDatabaseType == 'mssql' || $sDatabaseType == 'sqlsrv') - { - // mssql cannot compare text blobs so we have to cast here - //$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE (".sanitize_int($rt)." IS NULL " - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( " - // . "OR cast(".sanitize_int($rt)." as varchar) = '' " - . "cast(".Yii::app()->db->quoteColumnName($rt)." as varchar) = '' " - . "OR cast(".Yii::app()->db->quoteColumnName($rt)." as varchar) = ' ' )"; - } - else - // $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE (".sanitize_int($rt)." IS NULL " - $query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( " - // . "OR ".sanitize_int($rt)." = '' " - . " ".Yii::app()->db->quoteColumnName($rt)." = '' " - . "OR ".Yii::app()->db->quoteColumnName($rt)." = ' ') "; - } + //output + if ((incompleteAnsFilterState() != "filter")) + { + $fname=$statlang->gT("Not completed or Not displayed"); + } + else + { + $fname=$statlang->gT("Not displayed"); + } - } + //we need some data + if ($results > 0) + { + //calculate percentage + $gdata[] = ($TotalIncomplete/$results)*100; + } - //check filter option - if (incompleteAnsFilterState() == "inc") {$query .= " AND submitdate is null";} - elseif (incompleteAnsFilterState() == "filter") {$query .= " AND submitdate is not null";} + //no data :( + else + { + $gdata[] = "N/A"; + } - //check for any "sql" that has been passed from another script - if ($sql != "NULL") {$query .= " AND $sql";} + //put data of incompleted records into array + $grawdata[]=$TotalIncomplete; - //get data - $result=Yii::app()->db->createCommand($query)->query(); + //put question title ("Not completed") into array + $label[]= $fname; - // $statisticsoutput .= "\n\n\n"; + //put the code ("Not completed") into the array + $justcode[]=$fname; - // this just extracts the data, after we present - foreach ($result->readAll() as $row) - { - $row=array_values($row); + //edit labels and put them into antoher array + if ((incompleteAnsFilterState() != "filter")) + { + $lbl[] = wordwrap(flattenText($statlang->gT("Not completed or Not displayed")." ($TotalIncomplete)"), 20, "\n"); // NMO 2009-03-24 + } + else + { + $lbl[] = wordwrap(flattenText($statlang->gT("Not displayed")." ($TotalIncomplete)"), 20, "\n"); // NMO 2009-03-24 + } + } //end else -> noncompleted NOT checked - //store temporarily value of answer count of question type '5' and 'A'. - $tempcount = -1; //count can't be less han zero + } //end if -> no filtering of incomplete answers and no multiple option questions - //increase counter - $TotalCompleted += $row[0]; - //"no answer" handling - if ($al[0] === "") - {$fname=$statlang->gT("No answer");} + //counter + $i=0; - //"other" handling - //"Answers" means that we show an option to list answer to "other" text field - elseif ($al[0] === $statlang->gT("Other") || $al[0] === "Answers" || ($qtype === "O" && $al[0] === $statlang->gT("Comments")) || $qtype === "P") - { - if ($qtype == "P") $ColumnName_RM = $al[2]."comment"; - else $ColumnName_RM = $al[2]; - if ($qtype=='O') { - $TotalCompleted -=$row[0]; - } - $fname="$al[1]"; - if ($browse===true) $fname .= " "; - } + //we need to know which item we are editing + $itemcounter = 1; - /* - * text questions: - * - * U = huge free text - * T = long free text - * S = short free text - * Q = multiple short text - */ - elseif ($qtype == "S" || $qtype == "U" || $qtype == "T" || $qtype == "Q") - { - $headPDF = array(); - $headPDF[] = array($statlang->gT("Answer"),$statlang->gT("Count"),$statlang->gT("Percentage")); + //array to store items 1 - 5 of question types "5" and "A" + $stddevarray = array(); - //show free text answers - if ($al[0] == "Answers") - { - $fname= "$al[1]"; - if ($browse===true) $fname .= " "; - } - elseif ($al[0] == "NoAnswer") - { - $fname= "$al[1]"; - } - - $statisticsoutput .= "" - ."".$statlang->gT("Count")."" - ."".$statlang->gT("Percentage")."
    " - ."".$statlang->gT("Count")."" - ."".$statlang->gT("Percentage")."" - ."".$statlang->gT("Sum")."
    " - ."".$statlang->gT("Count")."" - ."".$statlang->gT("Percentage")."
    " - ."".$statlang->gT("Count")."" - ."".$statlang->gT("Percentage")."
    " . $label[$i] ."\n" + ."\t\t
    " . $grawdata[$i] . "\n"; - } //end foreach -> loop through answer data + //percentage = 0 + $statisticsoutput .= sprintf("%01.2f", $gdata[$i]) . "%"; + $gdata[$i] = 0; - //no filtering of incomplete answers and NO multiple option questions - //if ((incompleteAnsFilterState() != "filter") and ($qtype != "M") and ($qtype != "P")) - //error_log("TIBO ".print_r($showaggregated_indice_table,true)); - if (($qtype != "M") and ($qtype != "P")) - { - //is the checkbox "Don't consider NON completed responses (only works when Filter incomplete answers is Disable)" checked? - //if (isset($_POST["noncompleted"]) and ($_POST["noncompleted"] == "on") && (isset(Yii::app()->getConfig('showaggregateddata')) && Yii::app()->getConfig('showaggregateddata') == 0)) - // TIBO: TODO WE MUST SKIP THE FOLLOWING SECTION FOR TYPE A and 5 when - // showaggreagated data is set and set to 1 - if (isset($_POST["noncompleted"]) and ($_POST["noncompleted"] == "on") ) + //check if we have to adjust ouput due to Yii::app()->getConfig('showaggregateddata') setting + if(Yii::app()->getConfig('showaggregateddata') == 1 && ($outputs['qtype'] == "5" || $outputs['qtype'] == "A")) { - //counter - $i=0; - - while (isset($gdata[$i])) - { - if (isset($showaggregated_indice_table[$i]) && $showaggregated_indice_table[$i]=="aggregated") - { // do nothing, we don't rewrite aggregated results - // or at least I don't know how !!! (lemeur) - } - else - { - //we want to have some "real" data here - if ($gdata[$i] != "N/A") - { - //calculate percentage - $gdata[$i] = ($grawdata[$i]/$TotalCompleted)*100; - } - } - - //increase counter - $i++; - - } //end while (data available) - - } //end if -> noncompleted checked - - //noncompleted is NOT checked - else + $statisticsoutput .= "\t\t
    "; - //array to store items 1 - 5 of question types "5" and "A" - $stddevarray = array(); + //output percentage + $statisticsoutput .= sprintf("%01.2f", $percentage) . "%"; - //loop through all available answers - while (isset($gdata[$i])) - { - //repeat header (answer, count, ...) for each new question - unset($showheadline); + //adjust output + $statisticsoutput .= "\t\t
    " . $label[$i] ."\n" - ."\t\t
    " . $grawdata[$i] . "\n"; + $statisticsoutput .= sprintf("%01.2f", $percentage) . "%"; + $statisticsoutput .= sprintf("%01.2f", $percentage)."%"; + $statisticsoutput .= ""; - - //percentage = 0 - $statisticsoutput .= sprintf("%01.2f", $gdata[$i]) . "%"; - $gdata[$i] = 0; - - //check if we have to adjust ouput due to Yii::app()->getConfig('showaggregateddata') setting - if(Yii::app()->getConfig('showaggregateddata') == 1 && ($qtype == "5" || $qtype == "A")) - { - $statisticsoutput .= "\t\t
    "; - - //output percentage - $statisticsoutput .= sprintf("%01.2f", $percentage) . "%"; - - //adjust output - $statisticsoutput .= "\t\t"; - $statisticsoutput .= sprintf("%01.2f", $percentage) . "%"; - $statisticsoutput .= sprintf("%01.2f", $percentage)."%"; - $statisticsoutput .= ""; - $statisticsoutput .= sprintf("%01.2f", $percentage) . "%"; - $statisticsoutput .= sprintf("%01.2f", $aggregatedgdata)."%"; - $statisticsoutput .= ""; - $statisticsoutput .= sprintf("%01.2f", $percentage) . "%"; - $statisticsoutput .= sprintf("%01.2f", $aggregatedgdata)."%"; - $statisticsoutput .= "
    ".$statlang->gT("Sum")." (".$statlang->gT("Answers").")".$sumitems."$sumpercentage%$sumpercentage%
    ".$statlang->gT("Number of cases")."".$TotalCompleted."$casepercentage% 
    "; - $statisticsoutput .= sprintf("%01.2f", $gdata[$i]) . "%"; - $statisticsoutput .= "\t\t"; - //end output per line. there has to be a whitespace within the table cell to display correctly - $statisticsoutput .= "\t\t 
    "; + $statisticsoutput .= sprintf("%01.2f", $percentage) . "%"; + $statisticsoutput .= sprintf("%01.2f", $aggregatedgdata)."%"; + $statisticsoutput .= ""; + $statisticsoutput .= sprintf("%01.2f", $percentage) . "%"; + $statisticsoutput .= sprintf("%01.2f", $aggregatedgdata)."%"; + $statisticsoutput .= "
    ".$statlang->gT("Arithmetic mean")."  $am 
    ".$statlang->gT("Standard deviation")." $stddev 
    ".$statlang->gT("Sum")." (".$statlang->gT("Answers").")".$sumitems."$sumpercentage%$sumpercentage%
    ".$statlang->gT("Number of cases")."".$TotalCompleted."$casepercentage% 
    "; - } - - - - //-------------------------- PCHART OUTPUT ---------------------------- - list($qsid, $qgid, $qqid) = explode("X", $rt, 3); - $qsid = $surveyid; - $aattr = getQuestionAttributeValues($qqid, substr($rt, 0, 1)); - - //PCHART has to be enabled and we need some data - if ($usegraph == 1) { - $bShowGraph = $aattr["statistics_showgraph"] == "1"; - $bAllowPieChart = ($qtype != "M" && $qtype != "P"); - $bAllowMap = (isset($aattr["location_mapservice"]) && $aattr["location_mapservice"] == "1"); - $bShowMap = ($bAllowMap && $aattr["statistics_showmap"] == "1"); - $bShowPieChart = ($bAllowPieChart && $aattr["statistics_graphtype"] == "1"); - - $astatdata[$rt] = array( - 'id' => $rt, - 'sg' => $bShowGraph, - 'ap' => $bAllowPieChart, - 'am' => $bAllowMap, - 'sm' => $bShowMap, - 'sp' => $bShowPieChart - ); - - $stats=Yii::app()->session['stats']; - $stats[$rt]=array( - 'lbl' => $lbl, - 'gdata' => $gdata, - 'grawdata' => $grawdata - ); - Yii::app()->session['stats'] = $stats; - - if (array_sum($gdata)>0 && $bShowGraph == true) - { - $cachefilename = createChart($qqid, $qsid, $bShowPieChart, $lbl, $gdata, $grawdata, $MyCache); - //introduce new counter - if (!isset($ci)) {$ci=0;} + case 'xls': + $label[$i]=flattenText($label[$i]); + $tableXLS[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $gdata[$i])."%", ""); - //increase counter, start value -> 1 - $ci++; - switch($outputType) - { - case 'xls': + ++$xlsRow; + $sheet->write($xlsRow,0,$label[$i]); + $sheet->write($xlsRow,1,$grawdata[$i]); + $sheet->write($xlsRow,2,sprintf("%01.2f", $gdata[$i])."%"); - /** - * No Image for Excel... - */ + break; + case 'pdf': + $label[$i]=flattenText($label[$i]); + $tablePDF[] = array($label[$i],$grawdata[$i],sprintf("%01.2f", $gdata[$i])."%", ""); - break; - case 'pdf': + break; + case 'html': + //output percentage + $statisticsoutput .= "\t\t"; + $statisticsoutput .= sprintf("%01.2f", $gdata[$i]) . "%"; + $statisticsoutput .= "\t\t"; + //end output per line. there has to be a whitespace within the table cell to display correctly + $statisticsoutput .= "\t\t 
    " - ."" - ."" - ."" - ."" - ."" - ."" - ."

    \n"; + } - } //end if -> collect and display results + //4 = multiply result with 1 / (number of items (=5)) + //There are two different formulas to calculate standard derivation + //$stddev = $stddev / array_sum($stddevarray); //formula source: http://de.wikipedia.org/wiki/Standardabweichung + + //prevent division by zero + if((array_sum($stddevarray)-1) != 0 && $stddev != 0) + { + $stddev = $stddev / (array_sum($stddevarray)-1); //formula source: http://de.wikipedia.org/wiki/Empirische_Varianz + } + else + { + $stddev = 0; + } + + //5 = get root + $stddev = sqrt($stddev); + $stddev = round($stddev,2); + } + switch($outputType) + { + case 'xls': + + $tableXLS[] = array($statlang->gT("Arithmetic mean"),$am,'',''); + $tableXLS[] = array($statlang->gT("Standard deviation"),$stddev,'',''); + + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Arithmetic mean")); + $sheet->write($xlsRow,1,$am); + + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Standard deviation")); + $sheet->write($xlsRow,1,$stddev); + + break; + case 'pdf': + + $tablePDF[] = array($statlang->gT("Arithmetic mean"),$am,'',''); + $tablePDF[] = array($statlang->gT("Standard deviation"),$stddev,'',''); + + break; + case 'html': + //calculate standard deviation + $statisticsoutput .= "".$statlang->gT("Arithmetic mean").""; //German: "Fallzahl" + $statisticsoutput .= "  $am "; + $statisticsoutput .= "".$statlang->gT("Standard deviation").""; //German: "Fallzahl" + $statisticsoutput .= " $stddev "; + + break; + default: + + + break; + } + } + } + + if($outputType=='pdf') //XXX TODO PDF + { + //$tablePDF = array(); + $tablePDF = array_merge_recursive($tablePDF, $footPDF); + $pdf->headTable($headPDF,$tablePDF); + //$pdf->tableintopdf($tablePDF); + + // if(isset($footPDF)) + // foreach($footPDF as $foot) + // { + // $footA = array($foot); + // $pdf->tablehead($footA); + // } + } + + if ($outputType=='html') { + $statisticsoutput .= ""; + } + + + + //-------------------------- PCHART OUTPUT ---------------------------- + list($qsid, $qgid, $qqid) = explode("X", $rt, 3); + $qsid = $surveyid; + $aattr = getQuestionAttributeValues($qqid, substr($rt, 0, 1)); + + //PCHART has to be enabled and we need some data + if ($usegraph == 1) { + $bShowGraph = $aattr["statistics_showgraph"] == "1"; + $bAllowPieChart = ($outputs['qtype'] != "M" && $outputs['qtype'] != "P"); + $bAllowMap = (isset($aattr["location_mapservice"]) && $aattr["location_mapservice"] == "1"); + $bShowMap = ($bAllowMap && $aattr["statistics_showmap"] == "1"); + $bShowPieChart = ($bAllowPieChart && $aattr["statistics_graphtype"] == "1"); + + $astatdata[$rt] = array( + 'id' => $rt, + 'sg' => $bShowGraph, + 'ap' => $bAllowPieChart, + 'am' => $bAllowMap, + 'sm' => $bShowMap, + 'sp' => $bShowPieChart + ); + + $stats=Yii::app()->session['stats']; + $stats[$rt]=array( + 'lbl' => $lbl, + 'gdata' => $gdata, + 'grawdata' => $grawdata + ); + Yii::app()->session['stats'] = $stats; + + if (array_sum($gdata)>0 && $bShowGraph == true) + { + $cachefilename = createChart($qqid, $qsid, $bShowPieChart, $lbl, $gdata, $grawdata, $MyCache); + //introduce new counter + if (!isset($ci)) {$ci=0;} + + //increase counter, start value -> 1 + $ci++; + switch($outputType) + { + case 'xls': + + /** + * No Image for Excel... + */ + + break; + case 'pdf': + + $pdf->AddPage('P','A4'); + + $pdf->titleintopdf($pdfTitle,$titleDesc); + $pdf->Image($tempdir."/".$cachefilename, 0, 70, 180, 0, '', Yii::app()->getController()->createUrl("admin/survey/view/surveyid/".$surveyid), 'B', true, 150,'C',false,false,0,true); + + break; + case 'html': + $statisticsoutput .= ""; + + $aattr = getQuestionAttributeValues($qqid, $firstletter); + if ($bShowMap) { + $statisticsoutput .= "
    "; + + $agmapdata[$rt] = array ( + "coord" => getQuestionMapData(substr($rt, 1), $qsid), + "zoom" => $aattr['location_mapzoom'], + "width" => $aattr['location_mapwidth'], + "height" => $aattr['location_mapheight'] + ); + } + break; + default: + break; + } + + } + } + + //close table/output + if($outputType=='html') { + if ($usegraph==1) { + $sImgUrl = Yii::app()->getConfig('adminimageurl'); + + $statisticsoutput .= "
    " + ."" + ."" + ."" + ."" + ."" + ."" + ."
    "; + + } + $statisticsoutput .= "
    \n"; + } + + return array("statisticsoutput"=>$statisticsoutput, "pdf"=>$pdf); + +} + + +/** +* Generates statistics +* +* @param int $surveyid The survey id +* @param mixed $allfields +* @param mixed $q2show +* @param mixed $usegraph +* @param string $outputType Optional - Can be xls, html or pdf - Defaults to pdf +* @param string $pdfOutput Sets the target for the PDF output: DD=File download , F=Save file to local disk +* @param string $statlangcode Lamguage for statistics +* @param mixed $browse Show browse buttons +* @return buffer +*/ +function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $outputType='pdf', $pdfOutput='I',$statlangcode=null, $browse = true) +{ + //$allfields =""; + + global $pdfdefaultfont, $pdffontsize; + + //load surveytranslator helper + Yii::import('application.helpers.surveytranslator_helper', true); + + $statisticsoutput = ""; //This string carries all the actual HTML code to print. + $imagedir = Yii::app()->getConfig("imagedir"); + $tempdir = Yii::app()->getConfig("tempdir"); + $tempurl = Yii::app()->getConfig("tempurl"); + $clang = Yii::app()->lang; + $pdf=array(); //Make sure $pdf exists - it will be replaced with an object if a $pdf is actually being created + + + $astatdata = array(); + + // Used for getting coordinates for google maps + $agmapdata = array(); + + //pick the best font file if font setting is 'auto' + if (is_null($statlangcode)) + { + $statlangcode = getBaseLanguageFromSurveyID($surveyid); + } + else + { + $statlang = new Limesurvey_lang($statlangcode); + } + + /* + * this variable is used in the function shortencode() which cuts off a question/answer title + * after $maxchars and shows the rest as tooltip (in html mode) + */ + $maxchars = 13; + //we collect all the html-output within this variable + $statisticsoutput =''; + /** + * $outputType: html || pdf || + */ + /** + * get/set Survey Details + */ + + //no survey ID? -> come and get one + if (!isset($surveyid)) {$surveyid=returnGlobal('sid');} + + //Get an array of codes of all available languages in this survey + $surveylanguagecodes = Survey::model()->findByPk($surveyid)->additionalLanguages; + $surveylanguagecodes[] = Survey::model()->findByPk($surveyid)->language; + + $fieldmap=createFieldMap($surveyid, "full", false, false, $statlang->getlangcode()); + + // Set language for questions and answers to base language of this survey + $language=$statlangcode; + + if ($usegraph==1) + { + //for creating graphs we need some more scripts which are included here + require_once(APPPATH.'/third_party/pchart/pchart/pChart.class'); + require_once(APPPATH.'/third_party/pchart/pchart/pData.class'); + require_once(APPPATH.'/third_party/pchart/pchart/pCache.class'); + $MyCache = new pCache($tempdir.'/'); + } + + if($q2show=='all' ) + { + $summarySql=" SELECT gid, parent_qid, qid, type " + ." FROM {{questions}} WHERE parent_qid=0" + ." AND sid=$surveyid "; + + $summaryRs = Yii::app()->db->createCommand($summarySql)->query()->readAll(); + + foreach($summaryRs as $field) + { + $myField = $surveyid."X".$field['gid']."X".$field['qid']; + + // Multiple choice get special treatment + if ($field['type'] == "M") {$myField = "M$myField";} + if ($field['type'] == "P") {$myField = "P$myField";} + //numerical input will get special treatment (arihtmetic mean, standard derivation, ...) + if ($field['type'] == "N") {$myField = "N$myField";} + + if ($field['type'] == "|") {$myField = "|$myField";} + + if ($field['type'] == "Q") {$myField = "Q$myField";} + // textfields get special treatment + if ($field['type'] == "S" || $field['type'] == "T" || $field['type'] == "U"){$myField = "T$myField";} + //statistics for Date questions are not implemented yet. + if ($field['type'] == "D") {$myField = "D$myField";} + if ($field['type'] == "F" || $field['type'] == "H") + { + //Get answers. We always use the answer code because the label might be too long elsewise + $query = "SELECT code, answer FROM {{answers}} WHERE qid='".$field['qid']."' AND scale_id=0 AND language='{$language}' ORDER BY sortorder, answer"; + $result = Yii::app()->db->createCommand($query)->query(); + $counter2=0; + + //check all the answers + foreach ($result->readAll() as $row) + { + $row=array_values($row); + $myField = "$myField{$row[0]}"; + } + //$myField = "{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]"; + + + } + if($q2show=='all') + $summary[]=$myField; + + //$allfields[]=$myField; + } + } + else + { + // This gets all the 'to be shown questions' from the POST and puts these into an array + if (!is_array($q2show)) + $summary=returnGlobal('summary'); + else + $summary = $q2show; + + //print_r($_POST); + //if $summary isn't an array we create one + if (isset($summary) && !is_array($summary)) + { + $summary = explode("+", $summary); + } + } + + /** + * pdf Config + */ + if($outputType=='pdf') + { + //require_once('classes/tcpdf/config/lang/eng.php'); + global $l; + $l['w_page'] = $statlang->gT("Page",'unescaped'); + //require_once('classes/tcpdf/mypdf.php'); + Yii::import('application.libraries.admin.pdf', true); + // create new PDF document + $pdf = new Pdf(); + $pdf->SetFont($pdfdefaultfont,'',$pdffontsize); + + $surveyInfo = getSurveyInfo($surveyid,$language); + + // set document information + $pdf->SetCreator(PDF_CREATOR); + $pdf->SetAuthor('LimeSurvey'); + $pdf->SetTitle('Statistic survey '.$surveyid); + $pdf->SetSubject($surveyInfo['surveyls_title']); + $pdf->SetKeywords('LimeSurvey, Statistics, Survey '.$surveyid.''); + $pdf->SetDisplayMode('fullpage', 'two'); + + // set header and footer fonts + $pdf->setHeaderFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_MAIN)); + $pdf->setFooterFont(Array($pdfdefaultfont, '', PDF_FONT_SIZE_DATA)); + + // set default header data + $pdf->SetHeaderData("statistics.png", 10, $statlang->gT("Quick statistics",'unescaped') , $statlang->gT("Survey")." ".$surveyid." '".flattenText($surveyInfo['surveyls_title'],false,true,'UTF-8')."'"); + + + // set default monospaced font + $pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED); + + //set margins + $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT); + $pdf->SetHeaderMargin(PDF_MARGIN_HEADER); + $pdf->SetFooterMargin(PDF_MARGIN_FOOTER); + + //set auto page breaks + $pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM); + + //set image scale factor + $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); + + //set some language-dependent strings + $pdf->setLanguageArray($l); + } + if($outputType=='xls') + { + /** + * Initiate the Spreadsheet_Excel_Writer + */ + Yii::import('application.libraries.admin.pear.Spreadsheet.Excel.Xlswriter', true); + if($pdfOutput=='F') + $workbook = new Xlswriter($tempdir.'/statistic-survey'.$surveyid.'.xls'); + else + $workbook = new Xlswriter(); + + $workbook->setVersion(8); + // Inform the module that our data will arrive as UTF-8. + // Set the temporary directory to avoid PHP error messages due to open_basedir restrictions and calls to tempnam("", ...) + if (!empty($tempdir)) { + $workbook->setTempDir($tempdir); + } + if ($pdfOutput!='F') + $workbook->send('statistic-survey'.$surveyid.'.xls'); + + // Creating the first worksheet + $sheet =& $workbook->addWorksheet(utf8_decode('results-survey'.$surveyid)); + $sheet->setInputEncoding('utf-8'); + $sheet->setColumn(0,20,20); + $separator="~|"; + /**XXX*/ + } + /** + * Start generating + */ + + + + $selects=buildSelects($allfields, $surveyid, $language); + + //count number of answers + $query = "SELECT count(*) FROM {{survey_$surveyid}}"; + + //if incompleted answers should be filtert submitdate has to be not null + if (incompleteAnsFilterState() == "inc") {$query .= " WHERE submitdate is null";} + elseif (incompleteAnsFilterState() == "filter") {$query .= " WHERE submitdate is not null";} + $result = Yii::app()->db->createCommand($query)->query(); + + //$total = total number of answers + $row=$result->read(); $total=reset($row); + + //are there any filters that have to be taken care of? + if (isset($selects) && $selects) + { + //filter incomplete answers? + if (incompleteAnsFilterState() == "filter" || incompleteAnsFilterState() == "inc") {$query .= " AND ";} + + else {$query .= " WHERE ";} + + //add filter criteria to SQL + $query .= implode(" AND ", $selects); + } + + + //get me some data Scotty + $result=Yii::app()->db->createCommand($query)->query(); + + //put all results into $results + $row=$result->read(); $results=reset($row); + + if ($total) + { + $percent=sprintf("%01.2f", ($results/$total)*100); + + } + switch($outputType) + { + case "xls": + $xlsRow = 0; + $sheet->write($xlsRow,0,$statlang->gT("Number of records in this query:",'unescaped')); + $sheet->write($xlsRow,1,$results); + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Total records in survey:",'unescaped')); + $sheet->write($xlsRow,1,$total); + + if($total) + { + ++$xlsRow; + $sheet->write($xlsRow,0,$statlang->gT("Percentage of total:",'unescaped')); + $sheet->write($xlsRow,1,$percent."%"); + } + + break; + case 'pdf': + + // add summary to pdf + $array = array(); + //$array[] = array($statlang->gT("Results"),""); + $array[] = array($statlang->gT("Number of records in this query:",'unescaped'), $results); + $array[] = array($statlang->gT("Total records in survey:",'unescaped'), $total); + + if($total) + $array[] = array($statlang->gT("Percentage of total:",'unescaped'), $percent."%"); + + $pdf->addPage('P','A4'); + + $pdf->Bookmark($pdf->delete_html($statlang->gT("Results",'unescaped')), 0, 0); + $pdf->titleintopdf($statlang->gT("Results",'unescaped'),$statlang->gT("Survey",'unescaped')." ".$surveyid); + $pdf->tableintopdf($array); + + $pdf->addPage('P','A4'); + + break; + case 'html': + + $statisticsoutput .= "
    \n\n" + ."\t\n" + ."\t' + ."\n" + ."\t' + ."\n"; + + //only calculate percentage if $total is set + if ($total) + { + $percent=sprintf("%01.2f", ($results/$total)*100); + $statisticsoutput .= "\t' + ."\n"; + } + $statisticsoutput .="
    ".$statlang->gT("Results")."
    ".$statlang->gT("Number of records in this query:").'$results
    ".$statlang->gT("Total records in survey:").'$total
    ".$statlang->gT("Percentage of total:").'$percent%
    \n"; + + break; + default: + + + break; + } + + //put everything from $selects array into a string connected by AND + //This string ($sql) can then be passed on to other functions so you can + //browse these results + if (isset ($selects) && $selects) {$sql=implode(" AND ", $selects);} + + elseif (!empty($newsql)) {$sql = $newsql;} + + if (!isset($sql) || !$sql) {$sql="NULL";} + + //only continue if we have something to output + if ($results > 0) + { + if($outputType=='html' && $browse === true) + { + //add a buttons to browse results + $statisticsoutput .= "
    \n" + ."\t\t

    " + ."\t\t\t\n" + ."\t\t\t\n" + ."\t\t\t\n" + ."\t\t\t\n" + ."\t\t

    " + ."\t\t
    \n"; + } + } //end if (results > 0) + + /* Show Summary results + * The $summary array contains each fieldname that we want to display statistics for + * + * */ + + if (isset($summary) && $summary) + { + //let's run through the survey + $runthrough=$summary; + + //START Chop up fieldname and find matching questions + + //Build an array of legitimate qid's for testing later + $qidquery = Questions::model()->findAll("sid=:surveyid AND parent_qid=0", array(":surveyid"=>$surveyid)); + foreach ($qidquery as $row) { $legitqids[] = $row['qid']; } + + //loop through all selected questions + foreach ($runthrough as $rt) + { + + //Step 1: Get information about this response field (SGQA) for the summary + $outputs=buildOutputList($rt, $language, $surveyid, $outputType); + + //2. Collect and Display results ####################################################################### + if (isset($outputs['alist']) && $outputs['alist']) //Make sure there really is an answerlist, and if so: + { + $display=displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $usegraph, $browse, $pdf); + $statisticsoutput .= $display['statisticsoutput']; + } //end if -> collect and display results - //delete data - unset($gdata); - unset($grawdata); - unset($label); - unset($lbl); - unset($lblrtl); - unset($lblout); - unset($justcode); - unset ($alist); + //Delete Build Outputs data + unset($outputs); + unset($display); } // end foreach -> loop through all questions //output From b1947782aa59a1dcfdff865329c45f7fae031753 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Tue, 24 Jul 2012 13:07:08 +0200 Subject: [PATCH 28/71] Fixed issue #6377: Large integer values corrupted in survey responses --- application/helpers/admin/activate_helper.php | 2 +- application/views/admin/survey/Question/questionbar_view.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php index 8386c09bb7f..3d1e3b582de 100644 --- a/application/helpers/admin/activate_helper.php +++ b/application/helpers/admin/activate_helper.php @@ -301,7 +301,7 @@ function activateSurvey($iSurveyID, $simulate = false) $createsurvey[$arow['fieldname']] = "integer"; break; case "N": //NUMERICAL - $createsurvey[$arow['fieldname']] = "float"; + $createsurvey[$arow['fieldname']] = "decimal (30,10)"; break; case "S": //SHORT TEXT if (Yii::app()->db->driverName == 'mysql' || Yii::app()->db->driverName == 'mysqli') {$createsurvey[$arow['fieldname']] = "text";} diff --git a/application/views/admin/survey/Question/questionbar_view.php b/application/views/admin/survey/Question/questionbar_view.php index 571f563af81..5fcef8d6f3f 100644 --- a/application/views/admin/survey/Question/questionbar_view.php +++ b/application/views/admin/survey/Question/questionbar_view.php @@ -7,7 +7,7 @@
    - eT("Question"); ?> (gT("ID").":".$qid; ?>) + eT("Question"); ?> (gT("ID").":".$qid; ?>)
    From 7da54116dcd159f2ab10e1baa653ad781fc364a5 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Tue, 24 Jul 2012 13:27:16 +0200 Subject: [PATCH 29/71] Fixed issue #6378: Fatal error when editing conditions and using Text (Array) question --- application/controllers/admin/conditionsaction.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php index 43785981082..1bd97753871 100644 --- a/application/controllers/admin/conditionsaction.php +++ b/application/controllers/admin/conditionsaction.php @@ -792,18 +792,18 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $x_axis[$frow['title']]=$frow['question']; } - foreach ($y_axis_db->readAll() as $arow) + foreach ($y_axis_db->readAll() as $yrow) { foreach($x_axis as $key=>$val) { - $shortquestion=$rows['title'].":{$arows['title']}:$key: [".strip_tags($arows['question']). "][" .strip_tags($val). "] " . flattenText($rows['question']); - $cquestions[]=array($shortquestion, $rows['qid'], $rows['type'], $rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title']."_".$key); + $shortquestion=$rows['title'].":{$yrow['title']}:$key: [".strip_tags($yrow['question']). "][" .strip_tags($val). "] " . flattenText($rows['question']); + $cquestions[]=array($shortquestion, $rows['qid'], $rows['type'], $rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$yrow['title']."_".$key); if ($rows['type'] == ":") { for($ii=$minvalue; $ii<=$maxvalue; $ii+=$stepvalue) { - $canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title']."_".$key, $ii, $ii); + $canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$yrow['title']."_".$key, $ii, $ii); } } } From a84281116f6fd02cdc993a7bec73645ddaa63186 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Tue, 24 Jul 2012 23:43:14 +1000 Subject: [PATCH 30/71] Fixed issue: more statistics_help script fixes --- application/helpers/admin/statistics_helper.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 19c90707469..2d55ee86924 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -494,7 +494,7 @@ function buildSelects($allfields, $surveyid, $language) { * @output array $output An array containing "alist"=>A list of answers to the question, "qtitle"=>The title of the question, * "qquestion"=>The description of the question, "qtype"=>The question type code */ -function buildOutputList($rt, $language, $surveyid, $outputType) { +function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { //Set up required variables $alist=array(); @@ -506,7 +506,7 @@ function buildOutputList($rt, $language, $surveyid, $outputType) { $firstletter = substr($rt, 0, 1); $fieldmap=createFieldMap($surveyid, "full", false, false, $language); $sDatabaseType = Yii::app()->db->getDriverName(); - + $statisticsoutput=""; /* Some variable depend on output type, actually : only line feed */ switch($outputType) @@ -1726,7 +1726,7 @@ function buildOutputList($rt, $language, $surveyid, $outputType) { } - return array("alist"=>$alist, "qtitle"=>$qtitle, "qquestion"=>$qquestion, "qtype"=>$qtype); + return array("alist"=>$alist, "qtitle"=>$qtitle, "qquestion"=>$qquestion, "qtype"=>$qtype, "statisticsoutput"=>$statisticsoutput); } /** @@ -3442,8 +3442,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, { //Step 1: Get information about this response field (SGQA) for the summary - $outputs=buildOutputList($rt, $language, $surveyid, $outputType); - + $outputs=buildOutputList($rt, $language, $surveyid, $outputType, $sql); + $statisticsoutput .= $outputs['statisticsoutput']; //2. Collect and Display results ####################################################################### if (isset($outputs['alist']) && $outputs['alist']) //Make sure there really is an answerlist, and if so: { From c2897ab457bd3ad7f9fe9e0b488fcf06cd21064b Mon Sep 17 00:00:00 2001 From: jcleeland Date: Wed, 25 Jul 2012 10:07:44 +1000 Subject: [PATCH 31/71] Fixed issue #6368 - Some older tokens tables don't have all required fields. Fixed issue, deals with Yii's shortocmings handling varchar fields for different db's. --- .../helpers/update/updatedb_helper.php | 69 +++++++++++++------ application/models/Tokens_dynamic.php | 20 +++++- 2 files changed, 64 insertions(+), 25 deletions(-) diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php index d89d1b16322..e76991a1e87 100644 --- a/application/helpers/update/updatedb_helper.php +++ b/application/helpers/update/updatedb_helper.php @@ -28,28 +28,8 @@ function db_upgrade_all($oldversion) { $clang = Yii::app()->lang; echo str_pad($clang->gT('The LimeSurvey database is being upgraded').' ('.date('Y-m-d H:i:s').')',14096).".

    ". $clang->gT('Please be patient...')."

    \n"; - $sDBDriverName=Yii::app()->db->getDriverName(); - if ($sDBDriverName=='mysqli') $sDBDriverName='mysql'; - if ($sDBDriverName=='sqlsrv') $sDBDriverName='mssql'; - - // Special customization because Yii is too limited to handle a varchar field of a length other than 255 in a cross-DB compatible way - // see http://www.yiiframework.com/forum/index.php/topic/32289-cross-db-compatible-varchar-field-length-definitions/ - // and http://github.com/yiisoft/yii/issues/765 - if ($sDBDriverName=='pgsql') - { - Yii::app()->setConfig('varchar',$sVarchar='character varying'); - Yii::app()->setConfig('autoincrement', $sAutoIncrement='serial'); - } - elseif ($sDBDriverName=='mssql') - { - Yii::app()->setConfig('varchar',$sVarchar='varchar'); - Yii::app()->setConfig('autoincrement', $sAutoIncrement='integer NOT NULL IDENTITY (1,1)'); - } - else - { - Yii::app()->setConfig('varchar',$sVarchar='varchar'); - Yii::app()->setConfig('autoincrement', $sAutoIncrement='int(11) NOT NULL AUTO_INCREMENT'); - } + $sDBDriverName=setsDBDriverName(); + setVarchar($sDBDriverName); if ($oldversion < 111) { @@ -1715,3 +1695,48 @@ function dropDefaultValueMSSQL($fieldname, $tablename) } } + +/** +* Returns the name of the DB Driver - used for other functions that make db specific calls +* +*/ +function setsDBDriverName() { + $sDBDriverName=Yii::app()->db->getDriverName(); + if ($sDBDriverName=='mysqli') $sDBDriverName='mysql'; + if ($sDBDriverName=='sqlsrv') $sDBDriverName='mssql'; + return $sDBDriverName; +} + +/** +* Special customisation because Yii is limited in its ability to handle varchar fields of lenghts other than 255 in a cross-db +* compatible way. see http://www.yiiframework.com/forum/index.php/topic/32289-cross-db-compatible-varchar-field-length-definitions/ +* and http://github.com/yiisoft/yii/issues/765 +* +* Note that it sets values for the config files for use later, and does not return any values. +* Access the set values using Yii::app()->getConfig('varchar') or Yii::app()->getConfigu('autoincrement'); +* +* @param mixed $sDBDriverName The name of the db driver being used. If the parameter is forgotten, the +* function is capable of retrieving it itself. +*/ +function setVarchar($sDBDriverName=null) { + + if(!$sDBDriverName) { + $sDBDriverName=setsDBDriverName(); + } + + if ($sDBDriverName=='pgsql') + { + Yii::app()->setConfig('varchar',$sVarchar='character varying'); + Yii::app()->setConfig('autoincrement', $sAutoIncrement='serial'); + } + elseif ($sDBDriverName=='mssql') + { + Yii::app()->setConfig('varchar',$sVarchar='varchar'); + Yii::app()->setConfig('autoincrement', $sAutoIncrement='integer NOT NULL IDENTITY (1,1)'); + } + else + { + Yii::app()->setConfig('varchar',$sVarchar='varchar'); + Yii::app()->setConfig('autoincrement', $sAutoIncrement='int(11) NOT NULL AUTO_INCREMENT'); + } +} \ No newline at end of file diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php index 99b80085ca4..e8757a1c2a7 100644 --- a/application/models/Tokens_dynamic.php +++ b/application/models/Tokens_dynamic.php @@ -105,10 +105,24 @@ public function summary() public function checkColumns() { $sid = self::$sid; $surveytable='{{tokens_'.$sid.'}}'; + $columncheck=array("tid", "participant_id", "firstname", "lastname", "email", "emailstatus","token","language","blacklisted","sent","remindersent","completed","usesleft","validfrom","validuntil"); $columns = Yii::app()->db->schema->getTable($surveytable)->getColumnNames(); - if(!in_array('participant_id', $columns)) Yii::app()->db->createCommand()->addColumn($surveytable, "participant_id", "text null"); - if(!in_array('validuntil', $columns)) Yii::app()->db->createCommand()->addColumn($surveytable, 'validuntil', 'date null'); - if(!in_array('validfrom', $columns)) Yii::app()->db->createCommand()->addColumn($surveytable, 'validfrom', 'date null'); + $missingcolumns=array_diff($columncheck,$columns); + if(count($missingcolumns)>0) //Some columns are missing - we need to create them + { + Yii::app()->loadHelper('update/updatedb'); //Load the admin helper to allow column creation + setVarchar(); //Set the appropriate varchar settings according to the database + $sVarchar=Yii::app()->getConfig('varchar'); //Retrieve the db specific varchar setting + $columninfo=array('validfrom'=>'datetime', + 'validuntil'=>'datetime', + 'blacklisted'=>$sVarchar.'(17) NOT NULL', + 'participant_id'=>$sVarchar.'(50) NOT NULL', + 'remindercount'=>"integer DEFAULT '0'", + 'usesleft'=>'integer NOT NULL default 1'); //Not sure if any other fields would ever turn up here - please add if you can think of any others + foreach($missingcolumns as $columnname) { + addColumn($surveytable,$columnname,$columninfo[$columnname]); + } + } } public function findUninvited($aTokenIds = false, $iMaxEmails = 0, $bEmail = true, $SQLemailstatuscondition = '', $SQLremindercountcondition = '', $SQLreminderdelaycondition = '') From 618c326f1ab2ae9caf930927017a18a15503bdbc Mon Sep 17 00:00:00 2001 From: jcleeland Date: Wed, 25 Jul 2012 11:25:28 +1000 Subject: [PATCH 32/71] Fixed issue #6368 missing variable after creating function --- application/helpers/update/updatedb_helper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php index e76991a1e87..36d7696e8ff 100644 --- a/application/helpers/update/updatedb_helper.php +++ b/application/helpers/update/updatedb_helper.php @@ -30,6 +30,7 @@ function db_upgrade_all($oldversion) { $sDBDriverName=setsDBDriverName(); setVarchar($sDBDriverName); + $sVarchar = Yii::app()->getConfig('varchar'); if ($oldversion < 111) { From 99ef7a1ef2501c953585b7ba21a12a8644f6472f Mon Sep 17 00:00:00 2001 From: jcleeland Date: Wed, 25 Jul 2012 13:31:42 +1000 Subject: [PATCH 33/71] Fixed issue #6381 - Central participant database, admin language should not determine the list of available surveys --- .../controllers/admin/participantsaction.php | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php index ff6a6ef9992..32fe6665d15 100644 --- a/application/controllers/admin/participantsaction.php +++ b/application/controllers/admin/participantsaction.php @@ -109,27 +109,26 @@ function displayParticipants() $urlSearch=Yii::app()->request->getQuery('searchurl'); $urlSearch=!empty($urlSearch) ? "getParticipantsResults_json/search/$urlSearch" : "getParticipants_json"; - if (Yii::app()->session['USER_RIGHT_SUPERADMIN']) - { - $aSurveyNames = Surveys_languagesettings::model()->with('survey', 'owner')->findAll('surveyls_language=:lang', array(':lang'=>$lang)); - } - // otherwise owned by him - else - { - $aSurveyNames = Surveys_languagesettings::model()->with('survey', 'owner')->findAll('survey.owner_id=:uid AND surveyls_language=:lang',array('survey.uid'=>Yii::app()->session['loginID'], ':lang'=>$lang)); - } + //Get list of surveys. + //Should be all surveys owned by user (or all surveys for super admin) + $surveys = Survey::model(); + //!!! Is this even possible to execute? + if (empty(Yii::app()->session['USER_RIGHT_SUPERADMIN'])) + $surveys->permission(Yii::app()->user->getId()); + + $aSurveyNames = $surveys->model()->with(array('languagesettings'=>array('condition'=>'surveyls_language=language'), 'owner'))->findAll(); /* Build a list of surveys that have tokens tables */ $tSurveyNames=array(); foreach($aSurveyNames as $row) { - $bTokenExists = tableExists('{{tokens_' . $row['surveyls_survey_id'] . '}}'); + $row = array_merge($row->attributes, $row->languagesettings[0]->attributes); + $bTokenExists = tableExists('{{tokens_' . $row['sid'] . '}}'); if ($bTokenExists) //If tokens table exists { $tSurveyNames[]=$row; } } - // data to be passed to view $aData = array( 'names' => User::model()->findAll(), From e0473692715a6ed34906ba7e2bcfd8c4a5c6d559 Mon Sep 17 00:00:00 2001 From: Marcel Minke Date: Wed, 25 Jul 2012 12:15:33 +0200 Subject: [PATCH 34/71] New feature: CSS styles for EM's "Show Logic File" feature Dev: First version, feel free to overwork and improve the new styles Dev: Tested with a small survey and latest Firefox and Chrome browsers Dev: Currently using same styles for all admin templates Dev: There are still some hardcoded styles at the "public function GetPrettyPrintString()" function at "em_core_helper.php" --- application/controllers/admin/expressions.php | 11 +- .../helpers/expressions/em_manager_helper.php | 106 +++++++++--------- styles/blobblueish/adminstyle.css | 104 +++++++++++++++++ styles/gartergrey/adminstyle.css | 104 +++++++++++++++++ styles/gringegreen/adminstyle.css | 105 +++++++++++++++++ 5 files changed, 367 insertions(+), 63 deletions(-) diff --git a/application/controllers/admin/expressions.php b/application/controllers/admin/expressions.php index af8ff519a8a..2c82f101ef9 100644 --- a/application/controllers/admin/expressions.php +++ b/application/controllers/admin/expressions.php @@ -24,16 +24,7 @@ function index() - + " /> _printOnLoad(Yii::app()->request->getQuery('sa', 'index'))?>> db->createCommand($query)->execute(); if (($this->debugLevel & LEM_DEBUG_VALIDATION_SUMMARY) == LEM_DEBUG_VALIDATION_SUMMARY) { - $message .= ';
    '.$query; + $message .= ';
    '.$query; } } @@ -5084,7 +5084,7 @@ function _ValidateGroup($groupSeq) if (($LEM->debugLevel & LEM_DEBUG_VALIDATION_SUMMARY) == LEM_DEBUG_VALIDATION_SUMMARY) { $editlink = Yii::app()->getController()->createUrl('/admin/survey/view/surveyid/' . $LEM->sid . '/gid/' . $gid); - $debug_message .= '
    [G#' . $LEM->currentGroupSeq . ']' + $debug_message .= '
    [G#' . $LEM->currentGroupSeq . ']' . '[' . $groupSeqInfo['qstart'] . '-' . $groupSeqInfo['qend'] . ']' . "[" . 'GID:' . $gid . "]: " @@ -5093,7 +5093,7 @@ function _ValidateGroup($groupSeq) . (($ghidden && $grel) ? " always-hidden " : ' ') . ($gmandViolation ? " (missing a relevant mandatory) " : ' ') . ($gvalid ? '' : " (fails at least one validation rule) ") - . "
    \n" + . "
    \n" . implode('', $messages); if ($grel == true) @@ -5102,16 +5102,16 @@ function _ValidateGroup($groupSeq) { if (($LEM->debugLevel & LEM_DEBUG_VALIDATION_DETAIL) == LEM_DEBUG_VALIDATION_DETAIL) { - $debug_message .= "**At least one relevant question was invalid, so re-show this group
    \n"; - $debug_message .= "**Validity Violators: " . implode(', ', explode('|',$invalidSQList)) . "
    \n"; + $debug_message .= "**At least one relevant question was invalid, so re-show this group
    \n"; + $debug_message .= "**Validity Violators: " . implode(', ', explode('|',$invalidSQList)) . "
    \n"; } } if ($gmandViolation) { if (($LEM->debugLevel & LEM_DEBUG_VALIDATION_DETAIL) == LEM_DEBUG_VALIDATION_DETAIL) { - $debug_message .= "**At least one relevant question was mandatory but unanswered, so re-show this group
    \n"; - $debug_message .= '**Mandatory Violators: ' . implode(', ', explode('|',$unansweredSQList)). "
    \n"; + $debug_message .= "**At least one relevant question was mandatory but unanswered, so re-show this group
    \n"; + $debug_message .= '**Mandatory Violators: ' . implode(', ', explode('|',$unansweredSQList)). "
    \n"; } } @@ -5127,7 +5127,7 @@ function _ValidateGroup($groupSeq) { if (($LEM->debugLevel & LEM_DEBUG_VALIDATION_DETAIL) == LEM_DEBUG_VALIDATION_DETAIL) { - $debug_message .= '** Page is irrelevant, so NULL all questions in this group
    '; + $debug_message .= '** Page is irrelevant, so NULL all questions in this group
    '; } } } @@ -5696,31 +5696,31 @@ function _ValidateQuestion($questionSeq) . (($hasValidationEqn) ? (!$qvalid ? " (fails validation rule) " : ' valid') : '') . ($qmandViolation ? " (missing a relevant mandatory) " : ' ') . $prettyPrintRelEqn - . "
    \n"; + . "
    \n"; if (($LEM->debugLevel & LEM_DEBUG_VALIDATION_DETAIL) == LEM_DEBUG_VALIDATION_DETAIL) { if ($mandatoryTip != '') { - $debug_qmessage .= '----Mandatory Tip: ' . flattenText($mandatoryTip) . "
    \n"; + $debug_qmessage .= '----Mandatory Tip: ' . flattenText($mandatoryTip) . "
    \n"; } if ($prettyPrintValidTip != '') { - $debug_qmessage .= '----Pretty Validation Tip:
    ' . $prettyPrintValidTip . "
    \n"; + $debug_qmessage .= '----Pretty Validation Tip:
    ' . $prettyPrintValidTip . "
    \n"; } if ($validTip != '') { - $debug_qmessage .= '----Validation Tip:
    ' . $validTip . "
    \n"; + $debug_qmessage .= '----Validation Tip:
    ' . $validTip . "
    \n"; } if ($prettyPrintValidEqn != '') { - $debug_qmessage .= '----Validation Eqn: ' . $prettyPrintValidEqn . "
    \n"; + $debug_qmessage .= '----Validation Eqn: ' . $prettyPrintValidEqn . "
    \n"; } if ($validationJS != '') { - $debug_qmessage .= '----Validation JavaScript: ' . $validationJS . "
    \n"; + $debug_qmessage .= '----Validation JavaScript: ' . $validationJS . "
    \n"; } // what are the database question codes for this question? @@ -5728,16 +5728,16 @@ function _ValidateQuestion($questionSeq) // pretty-print them $LEM->ProcessString($subQList, $qid,NULL,false,1,1,false,false); $prettyPrintSubQList = $LEM->GetLastPrettyPrintExpression(); - $debug_qmessage .= '----SubQs=> ' . $prettyPrintSubQList . "
    \n"; + $debug_qmessage .= '----SubQs=> ' . $prettyPrintSubQList . "
    \n"; if (count($prettyPrintSQRelEqns) > 0) { - $debug_qmessage .= "----Array Filters Applied:
    \n"; + $debug_qmessage .= "----Array Filters Applied:
    \n"; foreach ($prettyPrintSQRelEqns as $key => $value) { - $debug_qmessage .= '------' . $key . ': ' . $value . "
    \n"; + $debug_qmessage .= '------' . $key . ': ' . $value . "
    \n"; } - $debug_qmessage .= "
    \n"; + $debug_qmessage .= "
    \n"; } if (count($relevantSQs) > 0) @@ -5746,7 +5746,7 @@ function _ValidateQuestion($questionSeq) // pretty-print them $LEM->ProcessString($subQList, $qid,NULL,false,1,1,false,false); $prettyPrintSubQList = $LEM->GetLastPrettyPrintExpression(); - $debug_qmessage .= '----Relevant SubQs: ' . $prettyPrintSubQList . "
    \n"; + $debug_qmessage .= '----Relevant SubQs: ' . $prettyPrintSubQList . "
    \n"; } if (count($irrelevantSQs) > 0) @@ -5755,7 +5755,7 @@ function _ValidateQuestion($questionSeq) // pretty-print them $LEM->ProcessString($subQList, $qid,NULL,false,1,1,false,false); $prettyPrintSubQList = $LEM->GetLastPrettyPrintExpression(); - $debug_qmessage .= '----Irrelevant SubQs: ' . $prettyPrintSubQList . "
    \n"; + $debug_qmessage .= '----Irrelevant SubQs: ' . $prettyPrintSubQList . "
    \n"; } // show which relevant subQs were not answered @@ -5765,7 +5765,7 @@ function _ValidateQuestion($questionSeq) // pretty-print them $LEM->ProcessString($subQList, $qid,NULL,false,1,1,false,false); $prettyPrintSubQList = $LEM->GetLastPrettyPrintExpression(); - $debug_qmessage .= '----Unanswered Relevant SubQs: ' . $prettyPrintSubQList . "
    \n"; + $debug_qmessage .= '----Unanswered Relevant SubQs: ' . $prettyPrintSubQList . "
    \n"; } } } @@ -5802,7 +5802,7 @@ function _ValidateQuestion($questionSeq) if (($LEM->debugLevel & LEM_DEBUG_VALIDATION_DETAIL) == LEM_DEBUG_VALIDATION_DETAIL) { $prettyPrintEqn = $LEM->em->GetPrettyPrintString(); - $debug_qmessage .= '** Process Hidden but Relevant Equation [' . $sgqa . '](' . $prettyPrintEqn . ') => ' . $result . "
    \n"; + $debug_qmessage .= '** Process Hidden but Relevant Equation [' . $sgqa . '](' . $prettyPrintEqn . ') => ' . $result . "
    \n"; } } foreach ($irrelevantSQs as $sq) @@ -5845,7 +5845,7 @@ function _ValidateQuestion($questionSeq) 'invalidSQs' => (isset($invalidSQs) ? $invalidSQs : ''), 'relevantSQs' => implode('|',$relevantSQs), 'irrelevantSQs' => implode('|',$irrelevantSQs), - 'subQrelEqn' => implode('
    ',$prettyPrintSQRelEqns), + 'subQrelEqn' => implode('
    ',$prettyPrintSQRelEqns), 'mandViolation' => $qmandViolation, 'anyUnanswered' => $anyUnanswered, 'mandTip' => $mandatoryTip, @@ -6872,25 +6872,25 @@ static function UnitTestProcessStringContainingExpressions() ); $tests = <<Here is an example of OK syntax with tooltips
    Hello {if(gender=='M','Mr.','Mrs.')} {surname}, it is now {date('g:i a',time())}. Do you know where your {sum(numPets,numKids)} chidren and pets are? -Here are common errors so you can see the tooltips
    Variables used before they are declared: {notSetYet}
    Unknown Function: {iff(numPets>numKids,1,2)}
    Unknown Variable: {sum(age,num_pets,numKids)}
    Wrong # parameters: {sprintf()},{if(1,2)},{date()}
    Assign read-only-vars:{TOKEN:ATTRIBUTE_1+=10},{name='Sally'}
    Unbalanced parentheses: {pow(3,4},{(pow(3,4)},{pow(3,4))} -Here is some of the unsupported syntax
    No support for '++', '--', '%',';': {min(++age, --age,age % 2);}
    Nor '|', '&', '^': {(sum(2 | 3,3 & 4,5 ^ 6)}}
    Nor arrays: {name[2], name['mine']} -Inline JavaScipt that forgot to add spaces after curly brace
    [script type="text/javascript" language="Javascript"] var job='{TOKEN:ATTRIBUTE_1}'; if (job=='worker') {document.write('BOSSES');}[/script] -Unknown/Misspelled Variables, Functions, and Operators
    {if(sex=='M','Mr.','Mrs.')} {surname}, next year you will be {age++} years old. +Here is an example of OK syntax with tooltips
    Hello {if(gender=='M','Mr.','Mrs.')} {surname}, it is now {date('g:i a',time())}. Do you know where your {sum(numPets,numKids)} chidren and pets are? +Here are common errors so you can see the tooltips
    Variables used before they are declared: {notSetYet}
    Unknown Function: {iff(numPets>numKids,1,2)}
    Unknown Variable: {sum(age,num_pets,numKids)}
    Wrong # parameters: {sprintf()},{if(1,2)},{date()}
    Assign read-only-vars:{TOKEN:ATTRIBUTE_1+=10},{name='Sally'}
    Unbalanced parentheses: {pow(3,4},{(pow(3,4)},{pow(3,4))} +Here is some of the unsupported syntax
    No support for '++', '--', '%',';': {min(++age, --age,age % 2);}
    Nor '|', '&', '^': {(sum(2 | 3,3 & 4,5 ^ 6)}}
    Nor arrays: {name[2], name['mine']} +Inline JavaScipt that forgot to add spaces after curly brace
    [script type="text/javascript" language="Javascript"] var job='{TOKEN:ATTRIBUTE_1}'; if (job=='worker') {document.write('BOSSES');}[/script] +Unknown/Misspelled Variables, Functions, and Operators
    {if(sex=='M','Mr.','Mrs.')} {surname}, next year you will be {age++} years old. Warns if use = instead of == or perform value assignments
    Hello, {if(gender='M','Mr.','Mrs.')} {surname}, next year you will be {age+=1} years old. -Wrong number of arguments for functions:
    {if(gender=='M','Mr.','Mrs.','Other')} {surname}, sum(age,numKids,numPets)={sum(age,numKids,numPets,)} -Mismatched parentheses
    pow(3,4)={pow(3,4)}
    but these are wrong: {pow(3,4}, {(((pow(3,4)}, {pow(3,4))} -Unsupported syntax
    No support for '++', '--', '%',';': {min(++age, --age, age % 2);}
    Nor '|', '&', '^': {(sum(2 | 3, 3 & 4, 5 ^ 6)}}
    Nor arrays: {name[2], name['mine']} -Invalid assignments
    Assign values to equations or strings: {(3 + 4)=5}, {'hi'='there'}
    Assign read-only vars: {TOKEN:ATTRIBUTE_1='boss'}, {name='Sally'} -Values:
    name={name}; surname={surname}
    gender={gender}; age={age}; numPets={numPets}
    numKids=INSERTANS:61764X1X3={numKids}={INSERTANS:61764X1X3}
    TOKEN:ATTRIBUTE_1={TOKEN:ATTRIBUTE_1} -Question attributes:
    numKids.question={numKids.question}; Question#={numKids.qid}; .relevance={numKids.relevance} +Wrong number of arguments for functions:
    {if(gender=='M','Mr.','Mrs.','Other')} {surname}, sum(age,numKids,numPets)={sum(age,numKids,numPets,)} +Mismatched parentheses
    pow(3,4)={pow(3,4)}
    but these are wrong: {pow(3,4}, {(((pow(3,4)}, {pow(3,4))} +Unsupported syntax
    No support for '++', '--', '%',';': {min(++age, --age, age % 2);}
    Nor '|', '&', '^': {(sum(2 | 3, 3 & 4, 5 ^ 6)}}
    Nor arrays: {name[2], name['mine']} +Invalid assignments
    Assign values to equations or strings: {(3 + 4)=5}, {'hi'='there'}
    Assign read-only vars: {TOKEN:ATTRIBUTE_1='boss'}, {name='Sally'} +Values:
    name={name}; surname={surname}
    gender={gender}; age={age}; numPets={numPets}
    numKids=INSERTANS:61764X1X3={numKids}={INSERTANS:61764X1X3}
    TOKEN:ATTRIBUTE_1={TOKEN:ATTRIBUTE_1} +Question attributes:
    numKids.question={numKids.question}; Question#={numKids.qid}; .relevance={numKids.relevance} Math:
    5+7={5+7}; 2*pi={2*pi()}; sin(pi/2)={sin(pi()/2)}; max(age,numKids,numPets)={max(age,numKids,numPets)} -Text Processing:
    {str_replace('like','love','I like LimeSurvey')}
    {ucwords('hi there')}, {name}
    {implode('--',name,'this is','a convenient way','way to','concatenate strings')} -Dates:
    {name}, the current date/time is: {date('F j, Y, g:i a',time())} -Conditional:
    Hello, {if(gender=='M','Mr.','Mrs.')} {surname}, may I call you {name}? -Tailored Paragraph:
    {name}, you said that you are {age} years old, and that you have {numKids} {if((numKids==1),'child','children')} and {numPets} {if((numPets==1),'pet','pets')} running around the house. So, you have {numKids + numPets} wild {if((numKids + numPets ==1),'beast','beasts')} to chase around every day.

    Since you have more {if((numKids > numPets),'children','pets')} than you do {if((numKids > numPets),'pets','children')}, do you feel that the {if((numKids > numPets),'pets','children')} are at a disadvantage?

    -EM processes within strings:
    Here is your picture [img src='images/users_{name}_{surname}.jpg' alt='{if(gender=='M','Mr.','Mrs.')} {name} {surname}'/]; -EM doesn't process curly braces like these:
    {name}, { this is not an expression}
    {nor is this }, { nor this }
    \{nor this\},{this\},\{or this } +Text Processing:
    {str_replace('like','love','I like LimeSurvey')}
    {ucwords('hi there')}, {name}
    {implode('--',name,'this is','a convenient way','way to','concatenate strings')} +Dates:
    {name}, the current date/time is: {date('F j, Y, g:i a',time())} +Conditional:
    Hello, {if(gender=='M','Mr.','Mrs.')} {surname}, may I call you {name}? +Tailored Paragraph:
    {name}, you said that you are {age} years old, and that you have {numKids} {if((numKids==1),'child','children')} and {numPets} {if((numPets==1),'pet','pets')} running around the house. So, you have {numKids + numPets} wild {if((numKids + numPets ==1),'beast','beasts')} to chase around every day.

    Since you have more {if((numKids > numPets),'children','pets')} than you do {if((numKids > numPets),'pets','children')}, do you feel that the {if((numKids > numPets),'pets','children')} are at a disadvantage?

    +EM processes within strings:
    Here is your picture [img src='images/users_{name}_{surname}.jpg' alt='{if(gender=='M','Mr.','Mrs.')} {name} {surname}'/]; +EM doesn't process curly braces like these:
    {name}, { this is not an expression}
    {nor is this }, { nor this }
    \{nor this\},{this\},\{or this } {INSERTANS:61764X1X1}, you said that you are {INSERTANS:61764X1X2} years old, and that you have {INSERTANS:61764X1X3} {if((INSERTANS:61764X1X3==1),'child','children')} and {INSERTANS:61764X1X4} {if((INSERTANS:61764X1X4==1),'pet','pets')} running around the house. So, you have {INSERTANS:61764X1X3 + INSERTANS:61764X1X4} wild {if((INSERTANS:61764X1X3 + INSERTANS:61764X1X4 ==1),'beast','beasts')} to chase around every day. Since you have more {if((INSERTANS:61764X1X3 > INSERTANS:61764X1X4),'children','pets')} than you do {if((INSERTANS:61764X1X3 > INSERTANS:61764X1X4),'pets','children')}, do you feel that the {if((INSERTANS:61764X1X3 > INSERTANS:61764X1X4),'pets','children')} are at a disadvantage? {INSERTANS:61764X1X1}, you said that you are {INSERTANS:61764X1X2} years old, and that you have {INSERTANS:61764X1X3} {if((INSERTANS:61764X1X3==1),'child','children','kiddies')} and {INSERTANS:61764X1X4} {if((INSERTANS:61764X1X4==1),'pet','pets')} running around the house. So, you have {INSERTANS:61764X1X3 + INSERTANS:61764X1X4} wild {if((INSERTANS:61764X1X3 + INSERTANS:61764X1X4 ==1),'beast','beasts')} to chase around every day. @@ -7105,8 +7105,8 @@ function checkconditions(value, name, type, evt_type) // Print Table of questions print "

    This is a test of dynamic relevance.

    "; - print "Enter your name and age, and try all the permutations of answers to whether you have or want children.
    \n"; - print "Note how the text and sum of ages changes dynamically; that prior answers are remembered; and that irrelevant values are not included in the sum of ages.
    "; + print "Enter your name and age, and try all the permutations of answers to whether you have or want children.
    \n"; + print "Note how the text and sum of ages changes dynamically; that prior answers are remembered; and that irrelevant values are not included in the sum of ages.
    "; print " From ec847bc71d9f1e203b7fb4a3539c98c2719d49c0 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Thu, 26 Jul 2012 14:14:28 +1000 Subject: [PATCH 41/71] Fixed issue #6389 - Changing bar graph to pie graph for text based question fails --- application/helpers/admin/statistics_helper.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 97a5f7dce49..c6de929e3de 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -28,6 +28,10 @@ */ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawdata, $cache) { + /* This is a lazy solution to bug #6389. A better solution would be to find out how + the "T" gets passed to this function from the statistics.js file in the first place! */ + if(substr($iSurveyID,0,1)=="T") {$iSurveyID=substr($iSurveyID,1);} + $rootdir = Yii::app()->getConfig("rootdir"); $homedir = Yii::app()->getConfig("homedir"); $homeurl = Yii::app()->getConfig("homeurl"); @@ -3062,7 +3066,6 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ } - /** * Generates statistics * @@ -3489,7 +3492,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, } - /** * Simple function to square a value * From b55350698a1340547164142da60242ab53b0b1eb Mon Sep 17 00:00:00 2001 From: jcleeland Date: Thu, 26 Jul 2012 15:45:25 +1000 Subject: [PATCH 42/71] Fixed issue #6390 Show text responses inline option no longer available in general filter of statistics page --- application/controllers/admin/statistics.php | 14 +++++--------- application/helpers/admin/statistics_helper.php | 17 ++++++++++++++++- .../views/admin/export/statistics_view.php | 4 ++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 10dc7b2e41b..63983259079 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -520,16 +520,10 @@ public function run($surveyid, $subaction = null) //Show Summary results if (isset($summary) && $summary) { - if(isset($_POST['usegraph'])) - { - $usegraph = 1; - } - else - { - $usegraph = 0; - } - + $usegraph=isset($_POST['usegraph']) ? 1 : 0; $aData['usegraph'] = $usegraph; + $showtextinline=isset($_POST['showtextinline']) ? 1 : 0; + $aData['showtextinline'] = $showtextinline; $outputType = $_POST['outputtype']; $selects=buildSelects($summary, $surveyid, $statlang); @@ -566,6 +560,7 @@ public function run($surveyid, $subaction = null) /* Returns a simple list of values in a particular column, that meet the * requirements of the SQL * + * TODO: Move the html into a view to fit with standard mvc methodology * */ function listcolumn($surveyid, $column, $sql) { @@ -580,6 +575,7 @@ function listcolumn($surveyid, $column, $sql)
    loadHelper('admin/statistics'); diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index c6de929e3de..529d2667cfc 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -2357,7 +2357,22 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ * */ if(strpos($label[$i], "class='statisticsbrowsebutton'")) { - $extraline="    \n"; + $extraline="\n"; } //output absolute number of records diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index cd32c96ed2a..2de2824e048 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -114,6 +114,10 @@
    eT("Output options"); ?>
      +
    • + + />
      +
    • />
      From 5f71e57cfff5ccd29fa54e842ebab4b562f2eae6 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Thu, 26 Jul 2012 16:11:33 +1000 Subject: [PATCH 43/71] Fixed issue: questions with advanced-settting set to default to bar-graph weren't working in statistics page --- application/helpers/admin/statistics_helper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 529d2667cfc..d676b8bafdb 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -40,6 +40,7 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda $chartfontfile = Yii::app()->getConfig("chartfontfile"); $chartfontsize = Yii::app()->getConfig("chartfontsize"); $language = Survey::model()->findByPk($iSurveyID)->language; + $statlang = new Limesurvey_lang($language); $cachefilename = ""; /* Set the fonts for the chart */ From cca7b1f40eec5e9e136cf4f22a580e212d0a605e Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 26 Jul 2012 08:47:23 +0200 Subject: [PATCH 44/71] Fixed issue #6259: PDOException: SQLSTATE[42S02]: Base table or view not found: 1146 Table 'ls2.lime_surveys' doesn't exist Dev Please note that developers have to manually set debug paramter to 1 or 2 in config.php now to see all errors --- application/controllers/InstallerController.php | 1 - application/core/LSYii_Controller.php | 1 + index.php | 4 +--- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php index 568b39378fc..14cf63a5987 100644 --- a/application/controllers/InstallerController.php +++ b/application/controllers/InstallerController.php @@ -294,7 +294,6 @@ private function stepDatabaseConfiguration() if ($bDBExists == true) { try { $this->connection->createCommand()->select()->from('{{surveys}}')->queryAll(); - $bTablesDoNotExist = false; } catch(Exception $e) { $bTablesDoNotExist = true; } diff --git a/application/core/LSYii_Controller.php b/application/core/LSYii_Controller.php index b4f8eab675c..ee256225946 100644 --- a/application/core/LSYii_Controller.php +++ b/application/core/LSYii_Controller.php @@ -115,6 +115,7 @@ protected function _init() enforceSSLMode();// This really should be at the top but for it to utilise getGlobalSetting() it has to be here if (Yii::app()->getConfig('debug')>0) {//For debug purposes - switch on in config.php + define('YII_DEBUG', true); @ini_set("display_errors", 1); error_reporting(E_ALL); } diff --git a/index.php b/index.php index 1dc3a49a9cf..113f1788d96 100644 --- a/index.php +++ b/index.php @@ -122,8 +122,6 @@ * ------------------------------------------------------------------- */ - define('YII_DEBUG', true); - // The name of THIS file define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); @@ -171,4 +169,4 @@ Yii::createApplication('LSYii_Application', APPPATH . 'config/config' . EXT)->run(); /* End of file index.php */ -/* Location: ./index.php */ \ No newline at end of file +/* Location: ./index.php */ From a6b43b46954b434a8e96a6c8daa30456b8501087 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 26 Jul 2012 08:59:25 +0200 Subject: [PATCH 45/71] Fixed issue #6259: PDOException: SQLSTATE[42S02]: Base table or view not found: 1146 Table 'ls2.lime_surveys' doesn't exist Dev Please note that developers have to manually set debug paramter to 1 or 2 in config.php now to see all errors --- application/core/LSYii_Controller.php | 1 - index.php | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/application/core/LSYii_Controller.php b/application/core/LSYii_Controller.php index ee256225946..b4f8eab675c 100644 --- a/application/core/LSYii_Controller.php +++ b/application/core/LSYii_Controller.php @@ -115,7 +115,6 @@ protected function _init() enforceSSLMode();// This really should be at the top but for it to utilise getGlobalSetting() it has to be here if (Yii::app()->getConfig('debug')>0) {//For debug purposes - switch on in config.php - define('YII_DEBUG', true); @ini_set("display_errors", 1); error_reporting(E_ALL); } diff --git a/index.php b/index.php index 113f1788d96..41c7e0828d1 100644 --- a/index.php +++ b/index.php @@ -122,6 +122,7 @@ * ------------------------------------------------------------------- */ + // The name of THIS file define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); @@ -155,6 +156,19 @@ define('APPPATH', BASEPATH . $application_folder . '/'); } + $aSettings= include(APPPATH.'config'.DIRECTORY_SEPARATOR.'config.php'); + if ($aSettings['config']['debug']>0) + { + define('YII_DEBUG', true); + } + else + { + define('YII_DEBUG', false); + error_reporting(0); + } + + + /* * -------------------------------------------------------------------- * LOAD THE BOOTSTRAP FILE From dabf358bf68404d909b4e97b1630f40637f8676a Mon Sep 17 00:00:00 2001 From: jcleeland Date: Thu, 26 Jul 2012 17:38:11 +1000 Subject: [PATCH 46/71] Fixed issue #6391 Quartile calculations seem to be wrong. They really were. The limit/offset functions weren't working properly, and the method was calculating quartiles based on sum values, which is just wrong. Corrected methodology and database call, although the database call should probably be improved later. --- .../helpers/admin/statistics_helper.php | 125 +++++++++++------- 1 file changed, 79 insertions(+), 46 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index d676b8bafdb..459acc26515 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -1091,10 +1091,24 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { //no more comment from Mazi regarding the calculation + /* IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT */ + /* IF YOU DON'T UNDERSTAND WHAT QUARTILES ARE DO NOT MODIFY THIS CODE */ + /* Quartiles and Median values are NOT related to average, and the sum is irrelevent */ + // Calculating only makes sense with more than one result if ($medcount>1) { //1ST QUARTILE (Q1) + /* L=(1/4)(n+1), U=(3/4)(n+1) */ + /* Minitab linear interpolation between the two + closest data points. Minitab would let L = 2.5 and find the value half way between the + 2nd and 3rd data points. In our example, that would be (4+9)/2 = + 6.5. Similarly, the upper quartile value would be half way between + the 7th and 8th data points, which would be (49+64)/2 = 56.5. If L + were 2.25, Minitab would find the value one fourth of the way + between the 2nd and 3rd data points and if L were 2.75, Minitab + would find the value three fourths of the way between the 2nd and + 3rd data points. */ $q1=(1/4)*($medcount+1); $q1b=(int)((1/4)*($medcount+1)); $q1c=$q1b-1; @@ -1104,36 +1118,31 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { // fix if there are too few values to evaluate. if ($q1c<0) {$q1c=0;} - if ($q1 != $q1b) + if ($q1 != $q1b) //The value will be between two of the individual results { - //ODD NUMBER $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result=Yii::app()->db->createCommand($query)->limit(2, $q1c)->query(); - - foreach ($result->readAll() as $row) + $result = Yii::app()->db->createCommand($query)->query(); + $i=0; + foreach ($result as $row) { - if ($total == 0) {$total=$total-$row[$fieldname];} - - else {$total=$total+$row[$fieldname];} - - $lastnumber=$row[$fieldname]; + if($row[$fieldname]) {$i++;} + if($i==$q1c) {$secondlastnumber=$row[$fieldname];} + if($i==$q1b) {$lastnumber=$row[$fieldname];} } - - $q1total=$lastnumber-((1-$q1diff)*$total); - - if ($q1total < $minimum) {$q1total=$minimum;} + $q1total=$lastnumber-((1-$q1diff)*$secondlastnumber); + //if ($q3total < $maximum) {$q1total=$maximum;} //What the? If the 3rd quartiel is higher than the highest, then make the 1st quartile the highest? This makes no sense! $showem[]=array($statlang->gT("1st quartile (Q1)"), $q1total); } else { - //EVEN NUMBER - $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result=Yii::app()->db->createCommand($query)->limit(1, $q1c)->query(); + $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1"; + $result = Yii::app()->db->createCommand($query)->query(); - foreach ($result->readAll() as $row) + foreach ($result as $row) { - $showem[]=array($statlang->gT("1st quartile (Q1)"), $row[$fieldname]); + if($row[$fieldname]) {$i++;} + if($i==$q1b) {$showem[]=array($statlang->gT("1st quartile (Q1)"), $row[$fieldname]);} } } @@ -1150,22 +1159,31 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { { //remainder $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result=Yii::app()->db->createCommand($query)->limit(2, $medianc)->query(); + $result=Yii::app()->db->createCommand($query)->query(); + + $i=0; + foreach ($result as $row) { + if($row[$fieldname]) {$i++;} + if($i==$medianc) {$secondlastnumber=$row[$fieldname];} + if($i==$medianb) {$lastnumber=$row[$fieldname];} - foreach ($result->readAll() as $row) {$total=$total+$row[$fieldname];} + } + $mediantotal=$lastnumber-((1-$mediandiff)*$secondlastnumber); + //if ($q3total < $maximum) {$q1total=$maximum;} //What the? If the 3rd quartiel is higher than the highest, then make the 1st quartile the highest? This makes no sense! + + $showem[]=array($statlang->gT("2nd quartile (Median)"), $mediantotal); - $showem[]=array($statlang->gT("2nd quartile (Median)"), $total/2); } else { - //EVEN NUMBER - $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result = Yii::app()->db->createCommand($query)->limit(1, $medianc-1)->query(); + $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1"; + $result = Yii::app()->db->createCommand($query)->query(); - foreach ($result->readAll() as $row) + foreach ($result as $row) { - $showem[]=array($statlang->gT("Median value"), $row[$fieldname]); + if($row[$fieldname]) {$i++;} + if($i==$medianb) {$showem[]=array($statlang->gT("2nd quartile (Median)"), $row[$fieldname]);} } } @@ -1173,38 +1191,46 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { //3RD QUARTILE (Q3) - $q3=(3/4)*($medcount+1); - $q3b=(int)((3/4)*($medcount+1)); - $q3c=$q3b-1; + /* L=(1/4)(n+1), U=(3/4)(n+1) */ + /* Minitab linear interpolation between the two + closest data points. Minitab would let L = 2.5 and find the value half way between the + 2nd and 3rd data points. In our example, that would be (4+9)/2 = + 6.5. Similarly, the upper quartile value would be half way between + the 7th and 8th data points, which would be (49+64)/2 = 56.5. If L + were 2.25, Minitab would find the value one fourth of the way + between the 2nd and 3rd data points and if L were 2.75, Minitab + would find the value three fourths of the way between the 2nd and + 3rd data points. */ + $q3=(3/4)*($medcount+1); //Find the 75th percentile according to count of items + $q3b=(int)((3/4)*($medcount+1)); //The int version of $q3 + $q3c=$q3b-1; //The number before the int version of $q3 $q3diff=$q3-$q3b; - if ($q3 != $q3b) + if ($q3 != $q3b) //The value will be between two of the individual results { $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1 "; - $result = Yii::app()->db->createCommand($query)->limit(2,$q3c)->query(); - - foreach ($result->readAll() as $row) + $result = Yii::app()->db->createCommand($query)->query(); + $i=0; + foreach ($result as $row) { - if ($total == 0) {$total=$total-$row[$fieldname];} - - else {$total=$total+$row[$fieldname];} - - $lastnumber=$row[$fieldname]; + if($row[$fieldname]) {$i++;} + if($i==$q3c) {$secondlastnumber=$row[$fieldname];} + if($i==$q3b) {$lastnumber=$row[$fieldname];} } - $q3total=$lastnumber-((1-$q3diff)*$total); - - if ($q3total < $maximum) {$q1total=$maximum;} + $q3total=$lastnumber-((1-$q3diff)*$secondlastnumber); + //if ($q3total < $maximum) {$q1total=$maximum;} //What the? If the 3rd quartiel is higher than the highest, then make the 1st quartile the highest? This makes no sense! $showem[]=array($statlang->gT("3rd quartile (Q3)"), $q3total); } else { $query = $querystarter . " ORDER BY ".Yii::app()->db->quoteColumnName($fieldname)."*1"; - $result = Yii::app()->db->createCommand($query)->limit(1, $q3c); + $result = Yii::app()->db->createCommand($query)->query(); - foreach ($result->queryAll() as $row) + foreach ($result as $row) { - $showem[]=array($statlang->gT("3rd quartile (Q3)"), $row[$fieldname]); + if($row[$fieldname]) {$i++;} + if($i==$q3b) {$showem[]=array($statlang->gT("3rd quartile (Q3)"), $row[$fieldname]);} } } @@ -1281,7 +1307,14 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { ."\t\t\t".sprintf($statlang->gT("Q1 and Q3 calculated using %s"), "".$statlang->gT("minitab method")."") ."\n" ."\t\t\n" - ."\t\n
    "; foreach ($argInfo as $arg) { @@ -7888,7 +7888,7 @@ private function _GetVarAttribute($name,$attr,$default,$gseq,$qseq) $sqrel = (isset($_SESSION[$this->sessid]['relevanceStatus'][$rowdivid]) ? $_SESSION[$this->sessid]['relevanceStatus'][$rowdivid] : 1); // true by default - only want false if a subquestion is irrelevant return ($grel && $qrel && $sqrel); default: - print 'UNDEFINED ATTRIBUTE: ' . $attr . "
    \n"; + print 'UNDEFINED ATTRIBUTE: ' . $attr . "
    \n"; return $default; } return $default; // and throw and error? @@ -8037,8 +8037,8 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL $surveyname = templatereplace('{SURVEYNAME}'); - $out = '

    ' . $LEM->gT('Logic File for Survey # ') . '[' . $LEM->sid . "]: $surveyname

    \n"; - $out .= ""; + $out = '

    ' . $LEM->gT('Logic File for Survey # ') . '[' . $LEM->sid . "]: $surveyname

    \n"; + $out .= "
    "; if (is_null($gid) && is_null($qid)) { @@ -8096,7 +8096,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL $editlink = Yii::app()->getController()->createUrl('/admin/survey/view/surveyid/' . $LEM->sid . '/gid/' . $gid); $groupRow = "" . "" - . "" + . "" . "" . "" . "\n"; @@ -8111,7 +8111,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL ////// // SHOW QUESTION-LEVEL INFO ////// - $mandatory = (($q['info']['mandatory']=='Y') ? "*" : ''); + $mandatory = (($q['info']['mandatory']=='Y') ? "*" : ''); $type = $q['info']['type']; $typedesc = $qtypes[$type]['description']; @@ -8123,7 +8123,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL if ($LEM->em->HasErrors()) { ++$errorCount; } - $default = '
    (' . $LEM->gT('Default:') . ' ' . $_default . ')'; + $default = '
    (' . $LEM->gT('Default:') . ' ' . $_default . ')'; } else { @@ -8149,7 +8149,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL $attrs['other'] = $LEM->questionSeq2relevance[$qseq]['other']; } if (count($attrs) > 0) { - $attrTable = "
    G-$gseq".$ginfo['group_name']."
    [GID ".$gid."]    		".$ginfo['group_name']."
    [GID ".$gid."]    		".$grelevance."".$gtext."
    \n"; + $attrTable = "
    " . $LEM->gT("Question Attribute") . "" . $LEM->gT("Value"). "
    \n"; $count=0; foreach ($attrs as $key=>$value) { if (is_null($value) || trim($value) == '') { @@ -8368,7 +8368,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL if ($LEM->em->HasErrors()) { ++$errorCount; } - $subQeqn .= '
    (' . $LEM->gT('Default:') . ' ' . $_default . ')'; + $subQeqn .= '
    (' . $LEM->gT('Default:') . ' ' . $_default . ')'; } $sqRows .= "" @@ -8453,12 +8453,12 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL else { $editlink = Yii::app()->getController()->createUrl('/admin/survey/view/surveyid/' . $LEM->sid . '/gid/' . $varNameError['gid'] . '/qid/' . $varNameError['qid']); - $questionRow .= "" . $rootVarName . ""; } $editlink = Yii::app()->getController()->createUrl('/admin/survey/view/surveyid/' . $sid . '/gid/' . $gid . '/qid/' . $qid); - $questionRow .= "
    [QID $qid]
    $typedesc [$type]" + $questionRow .= "
    [QID $qid]
    $typedesc [$type]" . "" . "" . "\n"; @@ -8494,7 +8494,7 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL $message = $LEM->gT('This question, by itself, does not contain any syntax errors'); break; } - $out = "

    $message

    \n" . $out; + $out = "

    $message

    \n" . $out.""; } return array( diff --git a/styles/blobblueish/adminstyle.css b/styles/blobblueish/adminstyle.css index efc0d525327..41d5dc05b4c 100644 --- a/styles/blobblueish/adminstyle.css +++ b/styles/blobblueish/adminstyle.css @@ -1643,4 +1643,108 @@ tr.editedrow{ #templateleft select { width:150px; +} + + + +/* Expression Manager - Show Logic File */ + + +/* main DIV element */ +#showlogicfilediv { + margin: 0px 50px 20px 50px; + padding:0px; + text-align: left; +} + + + +/* main table */ +#logicfiletable { + margin-top: 20px; + text-align: center; + width: 100%; +} + +table#logicfiletable, #logicfiletable td, #logicfiletable th { + border: 1px solid #000; + border-collapse: collapse; + padding: 4px; +} + +table#logicfiletable th { + font-size: 12pt; + font-type: bold; +} + + + +/* inner table listing question attributes */ +table#logicfileattributetable, #logicfileattributetable td, #logicfileattributetable th { + border: 1px dotted #000; + border-collapse: collapse; + padding: 4px; +} + +table#logicfileattributetable { + margin: 10px auto; +} + +table#logicfileattributetable th { + background-color: #D3D3D3; + font-size: 10pt; + font-type: bold; +} +table#logicfileattributetable td { + background-color: #FFFFFF; +} + + + +/* different background colors for different survey elements */ +tr.LEMgroup td { + background-color: lightgrey; +} + +tr.LEMquestion { + background-color: #EAF2D3; +} + +tr.LEManswer td { + background-color: white; +} + +tr.LEMsubq td { + background-color: lightyellow; +} + + + +/* some classes to highlight certain elements */ +.error { + background-color: #000; +} +.ok { + background-color: #00ff00 +} + +.LEMheading, .LEMerror{ + text-align: left; + margin:20px 50px 0px 50px; + color: red; + font-size: 12pt; +} + +td.LEMerror { + text-align: center; +} + +.mandatory { + color: red; +} + + +.highlighterror { + border: 2px solid #FF00FF; + color: red; } \ No newline at end of file diff --git a/styles/gartergrey/adminstyle.css b/styles/gartergrey/adminstyle.css index 04ff0ce262e..dbd12733465 100644 --- a/styles/gartergrey/adminstyle.css +++ b/styles/gartergrey/adminstyle.css @@ -798,4 +798,108 @@ tr.editedrow { #templateleft select { width:150px; +} + + + +/* Expression Manager - Show Logic File */ + + +/* main DIV element */ +#showlogicfilediv { + margin: 0px 50px 20px 50px; + padding:0px; + text-align: left; +} + + + +/* main table */ +#logicfiletable { + margin-top: 20px; + text-align: center; + width: 100%; +} + +table#logicfiletable, #logicfiletable td, #logicfiletable th { + border: 1px solid #000; + border-collapse: collapse; + padding: 4px; +} + +table#logicfiletable th { + font-size: 12pt; + font-type: bold; +} + + + +/* inner table listing question attributes */ +table#logicfileattributetable, #logicfileattributetable td, #logicfileattributetable th { + border: 1px dotted #000; + border-collapse: collapse; + padding: 4px; +} + +table#logicfileattributetable { + margin: 10px auto; +} + +table#logicfileattributetable th { + background-color: #D3D3D3; + font-size: 10pt; + font-type: bold; +} +table#logicfileattributetable td { + background-color: #FFFFFF; +} + + + +/* different background colors for different survey elements */ +tr.LEMgroup td { + background-color: lightgrey; +} + +tr.LEMquestion { + background-color: #EAF2D3; +} + +tr.LEManswer td { + background-color: white; +} + +tr.LEMsubq td { + background-color: lightyellow; +} + + + +/* some classes to highlight certain elements */ +.error { + background-color: #000; +} +.ok { + background-color: #00ff00 +} + +.LEMheading, .LEMerror{ + text-align: left; + margin:20px 50px 0px 50px; + color: red; + font-size: 12pt; +} + +td.LEMerror { + text-align: center; +} + +.mandatory { + color: red; +} + + +.highlighterror { + border: 2px solid #FF00FF; + color: red; } \ No newline at end of file diff --git a/styles/gringegreen/adminstyle.css b/styles/gringegreen/adminstyle.css index 6061782336c..e089ad8fe0d 100644 --- a/styles/gringegreen/adminstyle.css +++ b/styles/gringegreen/adminstyle.css @@ -1691,4 +1691,109 @@ ol.organizer { legend{ margin:1em; +} + + + + +/* Expression Manager - Show Logic File */ + + +/* main DIV element */ +#showlogicfilediv { + margin: 0px 50px 20px 50px; + padding:0px; + text-align: left; +} + + + +/* main table */ +#logicfiletable { + margin-top: 20px; + text-align: center; + width: 100%; +} + +table#logicfiletable, #logicfiletable td, #logicfiletable th { + border: 1px solid #000; + border-collapse: collapse; + padding: 4px; +} + +table#logicfiletable th { + font-size: 12pt; + font-type: bold; +} + + + +/* inner table listing question attributes */ +table#logicfileattributetable, #logicfileattributetable td, #logicfileattributetable th { + border: 1px dotted #000; + border-collapse: collapse; + padding: 4px; +} + +table#logicfileattributetable { + margin: 10px auto; +} + +table#logicfileattributetable th { + background-color: #D3D3D3; + font-size: 10pt; + font-type: bold; +} +table#logicfileattributetable td { + background-color: #FFFFFF; +} + + + +/* different background colors for different survey elements */ +tr.LEMgroup td { + background-color: lightgrey; +} + +tr.LEMquestion { + background-color: #EAF2D3; +} + +tr.LEManswer td { + background-color: white; +} + +tr.LEMsubq td { + background-color: lightyellow; +} + + + +/* some classes to highlight certain elements */ +.error { + background-color: #000; +} +.ok { + background-color: #00ff00 +} + +.LEMheading, .LEMerror{ + text-align: left; + margin:20px 50px 0px 50px; + color: red; + font-size: 12pt; +} + +td.LEMerror { + text-align: center; +} + +.mandatory { + color: red; +} + + +.highlighterror { + border: 2px solid #FF00FF; + color: red; } \ No newline at end of file From 5b35da89720f755136e38a5da44a9d30bdd716d7 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Wed, 25 Jul 2012 21:38:24 +1000 Subject: [PATCH 35/71] Fixed issue #6385 - Graphs produces "Undefined offset: 8" error when there are more than 7 items to display. Problem was the directory location of the pchart color palette. Also some code tidying, changing db calls to use standard Yii models rather than raw SQL. Also fixed bug caused when the 'statistics_graphtype' question attribute did not exist. --- .../helpers/admin/statistics_helper.php | 134 ++++++++---------- 1 file changed, 58 insertions(+), 76 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 2d55ee86924..e2fe684f949 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -17,17 +17,16 @@ /** * * Generate a chart for a question -* @param mixed $iQuestionID ID of the question -* @param mixed $iSurveyID ID of the survey -* @param mixed $type Type of the chart to be created -* @param mixed $cache -* @param mixed $lbl -* @param mixed $gdata -* @param mixed $grawdata -* @param mixed $cache +* @param int $iQuestionID ID of the question +* @param int $iSurveyID ID of the survey +* @param mixed $type Type of the chart to be created - null produces bar chart, any other value produces pie chart +* @param array $lbl An array containing the labels for the chart items +* @param mixed $gdata An array containing the percentages for the chart items +* @param mixed $grawdata An array containing the raw count for the chart items +* @param mixed $cache An object containing [Hashkey] and [CacheFolder] * @return Name */ -function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $cache) +function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawdata, $cache) { $rootdir = Yii::app()->getConfig("rootdir"); $homedir = Yii::app()->getConfig("homedir"); @@ -37,7 +36,9 @@ function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $ $chartfontfile = Yii::app()->getConfig("chartfontfile"); $chartfontsize = Yii::app()->getConfig("chartfontsize"); $language = Survey::model()->findByPk($iSurveyID)->language; + $cachefilename = ""; + /* Set the fonts for the chart */ if ($chartfontfile=='auto') { $chartfontfile='vera.ttf'; @@ -59,13 +60,10 @@ function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $ } } - $cachefilename = ""; - - if (array_sum($gdata ) > 0) + if (array_sum($gdata ) > 0) //Make sure that the percentages add up to more than 0 { $graph = ""; $p1 = ""; - $i = 0; foreach ($gdata as $data) { @@ -75,8 +73,9 @@ function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $ } } + /* Totatllines is the number of entries to show in the key and we need to reduce the font + and increase the size of the chart if there are lots of them (ie more than 15) */ $totallines=$i; - if ($totallines>15) { $gheight=320+(6.7*($totallines-15)); @@ -121,13 +120,12 @@ function createChart($iQuestionID, $iSurveyID, $type, $lbl, $gdata, $grawdata, $ else { $graph = new pChart(1,1); - $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile, $chartfontsize); $legendsize=$graph->getLegendBoxSize($DataSet->GetDataDescription()); if ($legendsize[1]<320) $gheight=420; else $gheight=$legendsize[1]+100; $graph = new pChart(690+$legendsize[0],$gheight); - $graph->loadColorPalette($rootdir.DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.$admintheme.DIRECTORY_SEPARATOR.'limesurvey.pal'); + $graph->loadColorPalette($homedir.DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.$admintheme.DIRECTORY_SEPARATOR.'limesurvey.pal'); $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize); $graph->setGraphArea(50,30,500,$gheight-60); $graph->drawFilledRoundedRectangle(7,7,523+$legendsize[0],$gheight-7,5,254,255,254); @@ -259,9 +257,9 @@ function getQuestionMapData($sField, $qsid) /** Builds the list of addon SQL select statements * that builds the query result set * -* @param $allfields -* @param $fieldmap -* @param $language +* @param $allfields An array containing the names of the fields/answers we want to display in the statistics summary +* @param $fieldmap The fieldmap for the survey +* @param $language The language to use * * @return array $selects array of individual select statements that can be added/appended to * the 'where' portion of a SQL statement to restrict the result set @@ -270,19 +268,20 @@ function getQuestionMapData($sField, $qsid) */ function buildSelects($allfields, $surveyid, $language) { + //Create required variables $selects=array(); - - $fieldmap=createFieldMap($surveyid, "full", false, false, $language); - $aQuestionMap=array(); + $fieldmap=createFieldMap($surveyid, "full", false, false, $language); foreach ($fieldmap as $field) { if(isset($field['qid']) && $field['qid']!='') $aQuestionMap[]=$field['sid'].'X'.$field['gid'].'X'.$field['qid']; } + // creates array of post variable names for (reset($_POST); $key=key($_POST); next($_POST)) { $postvars[]=$key;} + /* * Iterate through postvars to create "nice" data for SQL later. * @@ -299,7 +298,15 @@ function buildSelects($allfields, $surveyid, $language) { foreach ($postvars as $pv) { //Only do this if there is actually a value for the $pv - if (in_array($pv, $allfields) || in_array(substr($pv,1),$aQuestionMap) || in_array($pv,$aQuestionMap) || (($pv[0]=='D' || $pv[0]=='N' || $pv[0]=='K') && in_array(substr($pv,1,strlen($pv)-2),$aQuestionMap))) + if ( + in_array($pv, $allfields) || in_array(substr($pv,1),$aQuestionMap) || in_array($pv,$aQuestionMap) + || ( + ( + $pv[0]=='D' || $pv[0]=='N' || $pv[0]=='K' + ) + && in_array(substr($pv,1,strlen($pv)-2),$aQuestionMap) + ) + ) { $firstletter=substr($pv,0,1); /* @@ -339,28 +346,24 @@ function buildSelects($allfields, $surveyid, $language) { //create a list out of the $pv array list($lsid, $lgid, $lqid) = explode("X", $pv); - $aquery="SELECT title FROM {{questions}} WHERE parent_qid=$lqid AND language='{$language}' and scale_id=0 ORDER BY question_order"; - $aresult=Yii::app()->db->createCommand($aquery)->query(); - - // go through every possible answer - foreach ($aresult->readAll() as $arow) + $aresult=Questions::model()->findAll(array('order'=>'question_order', 'condition'=>'parent_qid=:parent_qid AND scale_id=0', 'params'=>array(":parent_qid"=>$lqid))); + foreach ($aresult as $arow) { - $arow=array_values($arow); // only add condition if answer has been chosen - if (in_array($arow[0], $_POST[$pv])) + if (in_array($arow['title'], $_POST[$pv])) { - $mselects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)).$arow[0])." = 'Y'"; + $mselects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv)).$arow['title'])." = 'Y'"; } } + /* If there are mutliple conditions generated from this multiple choice question, join them using the boolean "OR" */ if ($mselects) { $thismulti=implode(" OR ", $mselects); $selects[]="($thismulti)"; - $mselects = ""; + unset($mselects); } } - //N - Numerical Input //K - Multiple Numerical Input elseif ($firstletter == "N" || $firstletter == "K") @@ -380,14 +383,14 @@ function buildSelects($allfields, $surveyid, $language) { //| - File Upload Question Type else if ($firstletter == "|") - { + { // no. of files greater than if (substr($pv, strlen($pv)-1, 1) == "G" && $_POST[$pv] != "") $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1)."_filecount")." > ".sanitize_int($_POST[$pv]); // no. of files less than if (substr($pv, strlen($pv)-1, 1) == "L" && $_POST[$pv] != "") - $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1)."_filecount")." < ".sanitize_int($_POST[$pv]); + $selects[]=Yii::app()->db->quoteColumnName(substr($pv, 1, -1)."_filecount")." < ".sanitize_int($_POST[$pv]); } //"id" is a built in field, the unique database id key of each response row @@ -476,11 +479,9 @@ function buildSelects($allfields, $surveyid, $language) { } } } - } //end foreach -> loop through filter options to create SQL return $selects; - } /** @@ -512,8 +513,6 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { switch($outputType) { case 'xls': - $linefeed = "\n"; - break; case 'pdf': $linefeed = "\n"; break; @@ -524,7 +523,6 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { break; } - // 1. Get answers for question ############################################################## //M - Multiple choice, therefore multiple fields if ($firstletter == "M" || $firstletter == "P") { @@ -532,32 +530,28 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); //select details for this question - $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + $nresult = Questions::model()->findAll('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$qqid)); + //$nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; + //$nresult = Yii::app()->db->createCommand($nquery)->query(); //loop through question data - foreach ($nresult->readAll() as $nrow) + foreach ($nresult as $nrow) { - $nrow=array_values($nrow); - $qtitle=$nrow[0]; - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $qlid=$nrow[3]; - $qother=$nrow[4]; + $qtitle=$nrow['title']; + $qtype=$nrow['type']; + $qquestion=flattenText($nrow['question']); + $qlid=$nrow['parent_qid']; + $qother=$nrow['other']; } //1. Get list of answers - $query="SELECT title, question FROM {{questions}} WHERE parent_qid='$qqid' AND language='{$language}' and scale_id=0 ORDER BY question_order"; - $result=Yii::app()->db->createCommand($query)->query(); - - //loop through multiple answers - foreach ($result->readAll() as $row) + $result=Questions::model()->findAll(array('order'=>'question_order', 'condition'=>'language=:language AND parent_qid=:qid AND scale_id=0', 'params'=>array(':language'=>$language, ':qid'=>$qqid))); + foreach ($result as $row) { - $row=array_values($row); - $mfield=substr($rt, 1, strlen($rt))."$row[0]"; + $mfield=substr($rt, 1, strlen($rt)).$row['title']; //create an array containing answer code, answer and fieldname(??) - $alist[]=array("$row[0]", flattenText($row[1]), $mfield); + $alist[]=array($row['title'], flattenText($row['question']), $mfield); } //check "other" field. is it set? @@ -580,29 +574,19 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { $fld = substr($rt, 1, strlen($rt)); $fielddata=$fieldmap[$fld]; - //get SGQA IDs - $qsid=$fielddata['sid']; - $qgid=$fielddata['gid']; - $qqid=$fielddata['qid']; - - list($qanswer, $qlid)=!empty($fielddata['aid']) ? explode("_", $fielddata['aid']) : array("", ""); //get SGQ data //list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); //get question data - $nquery = "SELECT title, type, question, other, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); - - //loop through question data - foreach ($nresult->readAll() as $nrow) + $nresult = Questions::model()->findAll('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$fielddata['qid'])); + foreach ($nresult as $nrow) { - $nrow=array_values($nrow); - $qtitle=flattenText($nrow[0]); - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $nlid=$nrow[4]; + $qtitle=$nrow['title']; + $qtype=$nrow['type']; + $qquestion=flattenText($nrow['question']); + $nlid=$nrow['parent_qid']; } $mfield=substr($rt, 1, strlen($rt)); @@ -2987,7 +2971,7 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ $bAllowPieChart = ($outputs['qtype'] != "M" && $outputs['qtype'] != "P"); $bAllowMap = (isset($aattr["location_mapservice"]) && $aattr["location_mapservice"] == "1"); $bShowMap = ($bAllowMap && $aattr["statistics_showmap"] == "1"); - $bShowPieChart = ($bAllowPieChart && $aattr["statistics_graphtype"] == "1"); + $bShowPieChart = ($bAllowPieChart && (isset($aattr["statistics_graphtype"]) && $aattr["statistics_graphtype"] == "1")); $astatdata[$rt] = array( 'id' => $rt, @@ -3093,8 +3077,6 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ */ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $outputType='pdf', $pdfOutput='I',$statlangcode=null, $browse = true) { - //$allfields =""; - global $pdfdefaultfont, $pdffontsize; //load surveytranslator helper From 384bb17d47df039fdf9a816f15ed53187446248b Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 25 Jul 2012 10:32:14 -0400 Subject: [PATCH 36/71] Dev Added {ACTIVE} variable which is true if the survey is active. This is helpful for templates that are conditional upon whether the survey is active. --- application/helpers/replacements_helper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php index 996fca60c84..0ae3af06f35 100644 --- a/application/helpers/replacements_helper.php +++ b/application/helpers/replacements_helper.php @@ -775,6 +775,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de // Set the array of replacement variables here - don't include curly braces $coreReplacements = array(); + $coreReplacements['ACTIVE'] = (isset($thissurvey['active']) && !($thissurvey['active'] != "Y")); $coreReplacements['AID'] = isset($questiondetails['aid']) ? $questiondetails['aid'] : ''; $coreReplacements['ANSWER'] = isset($answer) ? $answer : ''; // global $coreReplacements['ANSWERSCLEARED'] = $clang->gT("Answers Cleared"); From 4c809f2a0647e4df2b9d35ed44b26f79d04ad586 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Wed, 25 Jul 2012 22:43:20 +0200 Subject: [PATCH 37/71] Fixed issue #6379: Cannot define default answer for question --- application/controllers/admin/database.php | 22 +- application/controllers/admin/question.php | 21 +- application/core/Survey_Common_Action.php | 2 +- .../Question/editdefaultvalues_view.php | 336 +++++++++--------- 4 files changed, 192 insertions(+), 189 deletions(-) diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php index df97a11c9ce..35ce353a77a 100644 --- a/application/controllers/admin/database.php +++ b/application/controllers/admin/database.php @@ -64,11 +64,7 @@ function index($sa = null) $baselang = Survey::model()->findByPk($surveyid)->language; array_unshift($questlangs,$baselang); - $uqresult = Questions::model()->updateAll(array('same_default'=> Yii::app()->request->getPost('samedefault')?1:0), 'sid=:sid ANd qid=:qid', array(':sid'=>$surveyid, ':qid'=>$qid)); - if (!$uqresult) - { - $databaseoutput .= "\n"; - } + Questions::model()->updateAll(array('same_default'=> Yii::app()->request->getPost('samedefault')?1:0), 'sid=:sid ANd qid=:qid', array(':sid'=>$surveyid, ':qid'=>$qid)); $resrow = Questions::model()->findByAttributes(array('qid'=>$qid)); $questiontype = $resrow['type']; @@ -116,9 +112,9 @@ function index($sa = null) { foreach ($questlangs as $language) { - if (Yii::app()->request->getPost($_POST['defaultanswerscale_0_'.$language.'_0'])) + if (Yii::app()->request->getPost('defaultanswerscale_0_'.$language.'_0')) { - $this->_updateDefaultValues($postqid,0,0,'',$language,Yii::app()->request->getPost['defaultanswerscale_0_'.$language.'_0'],true); + $this->_updateDefaultValues($postqid,0,0,'',$language,Yii::app()->request->getPost('defaultanswerscale_0_'.$language.'_0'),true); } } } @@ -1135,24 +1131,18 @@ function index($sa = null) */ function _updateDefaultValues($qid,$sqid,$scale_id,$specialtype,$language,$defaultvalue,$ispost) { - //$this->load->helper('database'); if ($defaultvalue=='') // Remove the default value if it is empty { Defaultvalues::model()->deleteByPk(array('sqid'=>$sqid, 'qid'=>$qid, 'specialtype'=>$specialtype, 'scale_id'=>$scale_id, 'language'=>$language)); } else { - $res = Defaultvalues::model()->findByPk(array('sqid'=>$sqid, 'qid'=>$qid, 'specialtype'=>$specialtype, 'scale_id'=>$scale_id, 'language'=>$language)); - $exists=count($res); + $arDefaultValue = Defaultvalues::model()->findByPk(array('sqid'=>$sqid, 'qid'=>$qid, 'specialtype'=>$specialtype, 'scale_id'=>$scale_id, 'language'=>$language)); - if ($exists == 0) + if (is_null($arDefaultValue)) { $data=array('sqid'=>$sqid, 'qid'=>$qid, 'specialtype'=>$specialtype, 'scale_id'=>$scale_id, 'language'=>$language, 'defaultvalue'=>$defaultvalue); - - $value = new Defaultvalues; - foreach ($data as $k => $v) - $value->$k = $v; - $value->save(); + Defaultvalues::model()->insertRecords($data); } else { diff --git a/application/controllers/admin/question.php b/application/controllers/admin/question.php index 70fa4ddd139..3a50ce21464 100644 --- a/application/controllers/admin/question.php +++ b/application/controllers/admin/question.php @@ -112,10 +112,6 @@ public function editdefaultvalues($surveyid, $gid, $qid) $gid = sanitize_int($gid); $qid = sanitize_int($qid); - $aData['display']['menu_bars']['surveysummary'] = 'editdefaultvalues'; - $aData['display']['menu_bars']['gid_action'] = 'editdefaultvalues'; - $aData['display']['menu_bars']['qid_action'] = 'editdefaultvalues'; - $clang = $this->getController()->lang; Yii::app()->loadHelper('surveytranslator'); @@ -171,8 +167,7 @@ public function editdefaultvalues($surveyid, $gid, $qid) )); $defaultvalue = $defaultvalue != null ? $defaultvalue->defaultvalue : null; - $langopts[$language][$questionrow['type']]['Ydefaultvalue'] = - $defaultvalue == null ? '' : $defaultvalue->defaultvalue; + $langopts[$language][$questionrow['type']]['Ydefaultvalue'] = $defaultvalue; } } } @@ -217,6 +212,18 @@ public function editdefaultvalues($surveyid, $gid, $qid) } } } + if ($qtproperties[$questionrow['type']]['answerscales'] == 0 && + $qtproperties[$questionrow['type']]['subquestions'] == 0) + { + $defaultvalue = Defaultvalues::model()->findByAttributes(array( + 'specialtype' => '', + 'qid' => $qid, + 'scale_id' => 0, + 'language' => $language + )); + $langopts[$language][$questionrow['type']][0] = $defaultvalue != null ? $defaultvalue->defaultvalue : null; + } + } $aData = array( @@ -229,6 +236,8 @@ public function editdefaultvalues($surveyid, $gid, $qid) 'qtproperties' => $qtproperties, 'baselang' => $baselang, ); + $aData['display']['menu_bars']['surveysummary'] = 'editdefaultvalues'; + $aData['display']['menu_bars']['qid_action'] = 'editdefaultvalues'; $this->_renderWrappedTemplate('survey/Question', 'editdefaultvalues_view', $aData); } diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php index 1480b31a3a8..febce8e676c 100644 --- a/application/core/Survey_Common_Action.php +++ b/application/core/Survey_Common_Action.php @@ -365,7 +365,7 @@ function _questionbar($iSurveyId, $gid, $qid, $action = null) } } $aData['qtypes'] = $qtypes = getQuestionTypeList('', 'array'); - if ($action == 'editansweroptions' || $action == "editsubquestions" || $action == "editquestion" || $action == "editdefaultvalues" || $action == "copyquestion") + if ($action == 'editansweroptions' || $action == "editsubquestions" || $action == "editquestion" || $action == "editdefaultvalues" || $action =="editdefaultvalues" || $action == "copyquestion") { $qshowstyle = "style='display: none'"; } diff --git a/application/views/admin/survey/Question/editdefaultvalues_view.php b/application/views/admin/survey/Question/editdefaultvalues_view.php index f4eccfdbefb..ec2e0aab430 100644 --- a/application/views/admin/survey/Question/editdefaultvalues_view.php +++ b/application/views/admin/survey/Question/editdefaultvalues_view.php @@ -1,183 +1,187 @@ -
    eT('Edit default answer values') ?>
    -
    ' method='post'> -
    -
      - +
      eT('Edit default answer values') ?>
      +' method='post'> +
      +
        +
        • - -
      - + +
    +
      - 0) - { - for ($scale_id = 0; $scale_id < $qtproperties[$questionrow['type']]['answerscales']; $scale_id++) - { - $opts = $langopts[$language][$questionrow['type']][$scale_id]; -?> -
    • - + 0) + { + for ($scale_id = 0; $scale_id < $qtproperties[$questionrow['type']]['answerscales']; $scale_id++) + { + $opts = $langopts[$language][$questionrow['type']][$scale_id]; + ?> +
    • + - - -attributes; -?> value=""> - - -
      • - -
    • - - ' id='other_'> -
      • -> + eT('') ?> + + attributes; + ?> selected="selected" value=""> + + + + +
    • + + ' id='other_'> +
      • + 0) - { - for ($scale_id = 0; $scale_id < $qtproperties[$questionrow['type']]['subquestions']; $scale_id++) - { - $opts = $langopts[$language][$questionrow['type']][$scale_id]; + // If there are subquestions and no answerscales + if ($qtproperties[$questionrow['type']]['answerscales'] == 0 && $qtproperties[$questionrow['type']]['subquestions'] > 0) + { + for ($scale_id = 0; $scale_id < $qtproperties[$questionrow['type']]['subquestions']; $scale_id++) + { + $opts = $langopts[$language][$questionrow['type']][$scale_id]; - if ($qtproperties[$questionrow['type']]['subquestions'] > 1) - { -?> -
      - gT('Default answer for scale %s:'), $scale_id) ?> -
      - -
        - + if ($qtproperties[$questionrow['type']]['subquestions'] > 1) + { + ?> +
        + gT('Default answer for scale %s:'), $scale_id) ?> +
        + +
          + +
        • + + +
          • + +
        • + + +
          • + +
        +
      • -
        • - 1) + { ?>
      • -
        • - -
      - -
    • - -
      • - 1) - { -?> -
    • - - /> -
      • - +
    - -
    - - - - - '/> + + + + + + +

    '/>

    From 3178d5ecf1c8ce243559f626043d48b8f18d1a76 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Jul 2012 22:45:18 +0200 Subject: [PATCH 38/71] Updated translation: Czech by slansky --- locale/_template/limesurvey.pot | 3716 ++++++++++++++++--------------- locale/cs/LC_MESSAGES/cs.mo | Bin 255362 -> 262727 bytes 2 files changed, 1884 insertions(+), 1832 deletions(-) diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot index c52fc4c8b45..15ae537b17b 100644 --- a/locale/_template/limesurvey.pot +++ b/locale/_template/limesurvey.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: LimeSurvey language file\n" "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n" -"POT-Creation-Date: 2012-07-18 14:21:06+00:00\n" +"POT-Creation-Date: 2012-07-25 20:45:14+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,12 +19,12 @@ msgstr "" #: application/controllers/AdminController.php:66 #: application/controllers/PrintanswersController.php:71 -#: application/controllers/admin/dataentry.php:1669 -#: application/controllers/admin/dataentry.php:1674 -#: application/controllers/admin/dataentry.php:1679 -#: application/controllers/admin/dataentry.php:1716 -#: application/controllers/admin/dataentry.php:1717 +#: application/controllers/admin/dataentry.php:1671 +#: application/controllers/admin/dataentry.php:1676 +#: application/controllers/admin/dataentry.php:1681 #: application/controllers/admin/dataentry.php:1718 +#: application/controllers/admin/dataentry.php:1719 +#: application/controllers/admin/dataentry.php:1720 #: application/controllers/admin/templates.php:135 #: application/controllers/survey/index.php:82 #: application/controllers/survey/index.php:95 @@ -101,7 +101,7 @@ msgstr "" #: application/controllers/AdminController.php:86 #: application/controllers/admin/surveyadmin.php:420 -#: application/controllers/admin/tokens.php:2037 +#: application/controllers/admin/tokens.php:2160 #: application/helpers/admin/import_helper.php:2619 #: application/views/admin/authentication/forgotpassword.php:15 #: application/views/admin/dataentry/active_html_view.php:95 @@ -239,7 +239,7 @@ msgid "Please continue with populating the database." msgstr "" #: application/controllers/InstallerController.php:555 -#: application/controllers/InstallerController.php:1153 +#: application/controllers/InstallerController.php:1169 msgid "Try again! Connection with database failed. Reason: " msgstr "" @@ -278,21 +278,23 @@ msgstr "" msgid "Passwords don't match." msgstr "" -#: application/controllers/InstallerController.php:1023 +#: application/controllers/InstallerController.php:1039 msgid "Configuration directory is not writable" msgstr "" -#: application/controllers/InstallerController.php:1024 +#: application/controllers/InstallerController.php:1040 msgid "You will be redirected in about 5 secs. If not, click here." msgstr "" #: application/controllers/OptinController.php:64 -#: application/controllers/OptoutController.php:61 +#: application/controllers/OptoutController.php:71 +#: application/controllers/OptoutController.php:154 msgid "This survey does not seem to exist." msgstr "" #: application/controllers/OptinController.php:72 -#: application/controllers/OptoutController.php:69 +#: application/controllers/OptoutController.php:79 +#: application/controllers/OptoutController.php:163 msgid "You are not a participant in this survey." msgstr "" @@ -305,14 +307,20 @@ msgid "You are already a part of this survey." msgstr "" #: application/controllers/OptinController.php:88 -#: application/controllers/OptoutController.php:81 +#: application/controllers/OptoutController.php:91 +#: application/controllers/OptoutController.php:175 msgid "You have been already removed from this survey." msgstr "" -#: application/controllers/OptoutController.php:77 +#: application/controllers/OptoutController.php:87 +#: application/controllers/OptoutController.php:171 msgid "You have been successfully removed from this survey." msgstr "" +#: application/controllers/OptoutController.php:190 +msgid "You have been removed from the central participants list for this site" +msgstr "" + #: application/controllers/PrintanswersController.php:72 msgid "We are sorry but your session has expired." msgstr "" @@ -328,7 +336,7 @@ msgstr "" #: application/controllers/survey/index.php:358 #: application/controllers/survey/index.php:371 #: application/controllers/survey/index.php:386 -#: application/helpers/replacements_helper.php:225 +#: application/helpers/replacements_helper.php:224 msgid "Please contact %s ( %s ) for further assistance." msgstr "" @@ -346,12 +354,12 @@ msgid "Survey name (ID):" msgstr "" #: application/controllers/PrintanswersController.php:161 -#: application/controllers/admin/browse.php:643 #: application/controllers/admin/conditionsaction.php:1711 #: application/controllers/admin/conditionsaction.php:2071 #: application/controllers/admin/conditionsaction.php:2074 -#: application/views/admin/export/statistics_view.php:1275 -#: application/views/admin/export/statistics_view.php:1278 +#: application/controllers/admin/responses.php:651 +#: application/views/admin/export/statistics_view.php:1327 +#: application/views/admin/export/statistics_view.php:1330 #: application/views/admin/survey/Question/questionbar_view.php:10 #: application/views/admin/templates/templateeditor_printoutput_view.php:3 msgid "Question" @@ -364,8 +372,8 @@ msgstr "" #: application/controllers/RegisterController.php:102 #: application/controllers/survey/index.php:422 -#: application/helpers/frontend_helper.php:1414 -#: application/helpers/frontend_helper.php:1643 +#: application/helpers/frontend_helper.php:1412 +#: application/helpers/frontend_helper.php:1641 #: application/libraries/Save.php:126 msgid "The answer to the security question is incorrect." msgstr "" @@ -411,11 +419,11 @@ msgid "Generating summaries ..." msgstr "" #: application/controllers/Statistics_userController.php:451 -#: application/controllers/admin/browse.php:134 -#: application/controllers/admin/browse.php:135 -#: application/controllers/admin/browse.php:462 #: application/controllers/admin/dataentry.php:542 #: application/controllers/admin/quotas.php:156 +#: application/controllers/admin/responses.php:134 +#: application/controllers/admin/responses.php:135 +#: application/controllers/admin/responses.php:470 #: application/views/admin/quotas/viewquotas_view.php:17 #: application/views/admin/token/exportdialog.php:5 msgid "Completed" @@ -460,7 +468,7 @@ msgid "Unknown error" msgstr "" #: application/controllers/UploaderController.php:263 -#: application/helpers/qanda_helper.php:2807 +#: application/helpers/qanda_helper.php:2808 #: application/views/admin/assessments_view.php:13 #: application/views/admin/labels/labelview_view.php:40 #: application/views/admin/survey/QuestionGroups/editGroup_view.php:16 @@ -471,9 +479,9 @@ msgid "Title" msgstr "" #: application/controllers/UploaderController.php:264 -#: application/helpers/common_helper.php:2443 -#: application/helpers/common_helper.php:2656 -#: application/helpers/qanda_helper.php:2808 +#: application/helpers/common_helper.php:2447 +#: application/helpers/common_helper.php:2660 +#: application/helpers/qanda_helper.php:2809 #: application/views/admin/dataentry/content_view.php:139 msgid "Comment" msgstr "" @@ -530,19 +538,19 @@ msgstr "" #: application/controllers/admin/assessments.php:89 #: application/views/admin/assessments_view.php:42 #: application/views/admin/assessments_view.php:66 -#: application/views/admin/export/statistics_view.php:152 +#: application/views/admin/export/statistics_view.php:173 #: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:1 msgid "Question group" msgstr "" #: application/controllers/admin/assessments.php:89 -#: application/helpers/admin/statistics_helper.php:1381 +#: application/helpers/admin/statistics_helper.php:1039 #: application/views/admin/assessments_view.php:83 msgid "Minimum" msgstr "" #: application/controllers/admin/assessments.php:89 -#: application/helpers/admin/statistics_helper.php:1551 +#: application/helpers/admin/statistics_helper.php:1208 #: application/views/admin/assessments_view.php:85 msgid "Maximum" msgstr "" @@ -631,94 +639,6 @@ msgstr "" msgid "You have exceeded the number of maximum login attempts. Please wait %d minutes before trying again." msgstr "" -#: application/controllers/admin/browse.php:68 -#: application/controllers/admin/browse.php:77 -#: application/controllers/admin/browse.php:932 -#: application/controllers/admin/dataentry.php:1588 -#: application/views/admin/browse/browseallfiltered_view.php:3 -#: application/views/admin/dataentry/delete.php:5 -#: application/views/admin/dataentry/vvimport_upload.php:22 -msgid "Browse responses" -msgstr "" - -#: application/controllers/admin/browse.php:69 -msgid "This survey has not been activated. There are no results to browse." -msgstr "" - -#: application/controllers/admin/browse.php:78 -#: application/controllers/admin/checkintegrity.php:593 -#: application/controllers/admin/checkintegrity.php:609 -msgid "There is no matching survey." -msgstr "" - -#: application/controllers/admin/browse.php:129 -#: application/controllers/admin/browse.php:456 -#: application/views/admin/participants/displayParticipants_view.php:86 -msgid "Token ID" -msgstr "" - -#: application/controllers/admin/browse.php:130 -#: application/controllers/admin/browse.php:457 -#: application/helpers/common_helper.php:5311 -#: application/helpers/replacements_helper.php:629 -#: application/views/admin/export/exportresults_view.php:119 -#: application/views/admin/participants/displayParticipants_view.php:63 -#: application/views/admin/participants/displayParticipants_view.php:154 -#: application/views/admin/participants/displayParticipants_view.php:173 -#: application/views/admin/participants/sharePanel_view.php:7 -#: application/views/admin/token/browse.php:75 -#: application/views/admin/token/browse.php:131 -#: application/views/admin/token/dummytokenform.php:13 -#: application/views/admin/token/tokenform.php:30 -msgid "First name" -msgstr "" - -#: application/controllers/admin/browse.php:131 -#: application/controllers/admin/browse.php:458 -#: application/helpers/common_helper.php:5312 -#: application/helpers/replacements_helper.php:636 -#: application/views/admin/export/exportresults_view.php:120 -#: application/views/admin/participants/displayParticipants_view.php:64 -#: application/views/admin/participants/displayParticipants_view.php:154 -#: application/views/admin/participants/displayParticipants_view.php:174 -#: application/views/admin/participants/sharePanel_view.php:8 -#: application/views/admin/token/browse.php:75 -#: application/views/admin/token/browse.php:132 -#: application/views/admin/token/dummytokenform.php:15 -#: application/views/admin/token/tokenform.php:35 -msgid "Last name" -msgstr "" - -#: application/controllers/admin/browse.php:132 -#: application/controllers/admin/browse.php:459 -#: application/controllers/admin/useraction.php:146 -#: application/views/admin/authentication/forgotpassword.php:9 -#: application/views/admin/participants/displayParticipants_view.php:62 -#: application/views/admin/participants/displayParticipants_view.php:154 -#: application/views/admin/participants/displayParticipants_view.php:175 -#: application/views/admin/token/dummytokenform.php:17 -#: application/views/admin/token/tokenform.php:40 -#: application/views/admin/user/editusers.php:8 -#: application/views/admin/user/modifyuser.php:5 -#: application/views/admin/usergroup/viewUserGroup_view.php:35 -msgid "Email" -msgstr "" - -#: application/controllers/admin/browse.php:134 -#: application/views/admin/export/statistics_view.php:86 -msgid "Submission date" -msgstr "" - -#: application/controllers/admin/browse.php:639 -#: application/helpers/common_helper.php:2815 -msgid "Total time" -msgstr "" - -#: application/controllers/admin/browse.php:641 -#: application/views/admin/assessments_view.php:65 -msgid "Group" -msgstr "" - #: application/controllers/admin/checkintegrity.php:54 msgid "Deleting token table:" msgstr "" @@ -812,6 +732,12 @@ msgstr "" msgid "The related survey is missing." msgstr "" +#: application/controllers/admin/checkintegrity.php:593 +#: application/controllers/admin/checkintegrity.php:609 +#: application/controllers/admin/responses.php:78 +msgid "There is no matching survey." +msgstr "" + #: application/controllers/admin/checkintegrity.php:657 msgid "responses" msgstr "" @@ -911,54 +837,54 @@ msgstr "" #: application/controllers/admin/dataentry.php:682 #: application/controllers/admin/dataentry.php:1187 #: application/controllers/admin/dataentry.php:1247 -#: application/controllers/admin/printablesurvey.php:1043 -#: application/controllers/admin/printablesurvey.php:1047 -#: application/controllers/admin/printablesurvey.php:1163 -#: application/controllers/admin/printablesurvey.php:1180 -#: application/controllers/admin/printablesurvey.php:1185 +#: application/controllers/admin/printablesurvey.php:1046 +#: application/controllers/admin/printablesurvey.php:1050 +#: application/controllers/admin/printablesurvey.php:1166 +#: application/controllers/admin/printablesurvey.php:1183 +#: application/controllers/admin/printablesurvey.php:1188 #: application/controllers/admin/quotas.php:517 #: application/controllers/admin/surveyadmin.php:608 -#: application/controllers/admin/tokens.php:1954 -#: application/core/Survey_Common_Action.php:828 -#: application/helpers/admin/statistics_helper.php:1797 -#: application/helpers/admin/statistics_helper.php:1931 +#: application/controllers/admin/tokens.php:2077 +#: application/core/Survey_Common_Action.php:827 +#: application/helpers/admin/statistics_helper.php:1453 +#: application/helpers/admin/statistics_helper.php:1586 #: application/helpers/common_helper.php:1819 #: application/helpers/common_helper.php:1825 #: application/helpers/common_helper.php:1841 -#: application/helpers/common_helper.php:3060 -#: application/helpers/common_helper.php:3161 -#: application/helpers/common_helper.php:3271 -#: application/helpers/common_helper.php:3284 -#: application/helpers/common_helper.php:3295 -#: application/helpers/common_helper.php:3306 -#: application/helpers/common_helper.php:3317 -#: application/helpers/common_helper.php:3327 -#: application/helpers/common_helper.php:3338 -#: application/helpers/common_helper.php:3389 -#: application/helpers/common_helper.php:3420 -#: application/helpers/common_helper.php:3431 -#: application/helpers/common_helper.php:3538 -#: application/helpers/common_helper.php:3549 -#: application/helpers/common_helper.php:3569 -#: application/helpers/common_helper.php:3581 -#: application/helpers/common_helper.php:3611 -#: application/helpers/common_helper.php:3624 -#: application/helpers/common_helper.php:3635 -#: application/helpers/common_helper.php:3646 -#: application/helpers/common_helper.php:3666 -#: application/helpers/common_helper.php:3686 -#: application/helpers/common_helper.php:3723 -#: application/helpers/common_helper.php:3733 -#: application/helpers/common_helper.php:3743 -#: application/helpers/common_helper.php:3762 -#: application/helpers/common_helper.php:3805 -#: application/helpers/common_helper.php:3831 -#: application/helpers/common_helper.php:3867 -#: application/helpers/common_helper.php:3955 -#: application/helpers/common_helper.php:3965 -#: application/helpers/common_helper.php:4112 -#: application/helpers/common_helper.php:4123 -#: application/helpers/common_helper.php:4183 +#: application/helpers/common_helper.php:3064 +#: application/helpers/common_helper.php:3165 +#: application/helpers/common_helper.php:3275 +#: application/helpers/common_helper.php:3288 +#: application/helpers/common_helper.php:3299 +#: application/helpers/common_helper.php:3310 +#: application/helpers/common_helper.php:3321 +#: application/helpers/common_helper.php:3331 +#: application/helpers/common_helper.php:3342 +#: application/helpers/common_helper.php:3393 +#: application/helpers/common_helper.php:3424 +#: application/helpers/common_helper.php:3435 +#: application/helpers/common_helper.php:3542 +#: application/helpers/common_helper.php:3553 +#: application/helpers/common_helper.php:3573 +#: application/helpers/common_helper.php:3585 +#: application/helpers/common_helper.php:3615 +#: application/helpers/common_helper.php:3628 +#: application/helpers/common_helper.php:3639 +#: application/helpers/common_helper.php:3650 +#: application/helpers/common_helper.php:3670 +#: application/helpers/common_helper.php:3690 +#: application/helpers/common_helper.php:3727 +#: application/helpers/common_helper.php:3737 +#: application/helpers/common_helper.php:3747 +#: application/helpers/common_helper.php:3766 +#: application/helpers/common_helper.php:3809 +#: application/helpers/common_helper.php:3835 +#: application/helpers/common_helper.php:3871 +#: application/helpers/common_helper.php:3959 +#: application/helpers/common_helper.php:3969 +#: application/helpers/common_helper.php:4116 +#: application/helpers/common_helper.php:4127 +#: application/helpers/common_helper.php:4187 #: application/helpers/export_helper.php:241 #: application/helpers/export_helper.php:245 #: application/helpers/export_helper.php:253 @@ -967,21 +893,21 @@ msgstr "" #: application/helpers/export_helper.php:1350 #: application/helpers/expressions/em_manager_helper.php:2837 #: application/helpers/expressions/em_manager_helper.php:2841 -#: application/helpers/qanda_helper.php:4096 -#: application/helpers/qanda_helper.php:4523 -#: application/helpers/qanda_helper.php:4561 +#: application/helpers/qanda_helper.php:4097 +#: application/helpers/qanda_helper.php:4524 +#: application/helpers/qanda_helper.php:4562 #: application/views/admin/dataentry/content_view.php:527 #: application/views/admin/dataentry/content_view.php:580 #: application/views/admin/dataentry/import.php:23 -#: application/views/admin/export/statistics_view.php:506 -#: application/views/admin/export/statistics_view.php:671 +#: application/views/admin/export/statistics_view.php:543 +#: application/views/admin/export/statistics_view.php:708 #: application/views/admin/globalSettings_view.php:298 #: application/views/admin/globalSettings_view.php:309 #: application/views/admin/globalSettings_view.php:320 #: application/views/admin/globalSettings_view.php:362 #: application/views/admin/globalSettings_view.php:383 -#: application/views/admin/survey/Question/editQuestion_view.php:140 -#: application/views/admin/survey/Question/editQuestion_view.php:160 +#: application/views/admin/survey/Question/editQuestion_view.php:146 +#: application/views/admin/survey/Question/editQuestion_view.php:166 #: application/views/admin/survey/Question/questionbar_view.php:213 #: application/views/admin/survey/Question/questionbar_view.php:228 #: application/views/admin/survey/activateSurvey_view.php:65 @@ -1022,7 +948,7 @@ msgid "Yes" msgstr "" #: application/controllers/admin/conditionsaction.php:181 -#: application/controllers/admin/tokens.php:2017 +#: application/controllers/admin/tokens.php:2140 #: application/views/admin/assessments_view.php:122 #: application/views/admin/conditions/includes/conditions_scenario.php:13 #: application/views/admin/labels/labelview_view.php:161 @@ -1052,7 +978,7 @@ msgid "We recommend that before you proceed, you export the entire survey from t msgstr "" #: application/controllers/admin/conditionsaction.php:190 -#: application/controllers/admin/tokens.php:1310 +#: application/controllers/admin/tokens.php:1433 #: application/controllers/admin/useraction.php:157 #: application/views/admin/dataentry/import.php:31 #: application/views/admin/survey/Question/questionbar_view.php:193 @@ -1080,36 +1006,36 @@ msgstr "" #: application/controllers/admin/surveypermission.php:329 #: application/controllers/admin/surveypermission.php:502 #: application/controllers/admin/surveypermission.php:595 -#: application/controllers/admin/tokens.php:2156 -#: application/controllers/admin/tokens.php:2191 +#: application/controllers/admin/tokens.php:2279 +#: application/controllers/admin/tokens.php:2314 #: application/controllers/admin/useraction.php:720 -#: application/helpers/common_helper.php:6222 -#: application/helpers/common_helper.php:6227 -#: application/helpers/common_helper.php:6232 -#: application/helpers/common_helper.php:6237 -#: application/helpers/common_helper.php:6242 -#: application/helpers/common_helper.php:6247 -#: application/helpers/common_helper.php:6252 -#: application/helpers/common_helper.php:6257 -#: application/helpers/common_helper.php:6262 -#: application/helpers/common_helper.php:6268 -#: application/helpers/common_helper.php:6274 -#: application/helpers/common_helper.php:6279 -#: application/helpers/common_helper.php:6284 -#: application/helpers/common_helper.php:6289 -#: application/helpers/common_helper.php:6294 -#: application/helpers/common_helper.php:6299 -#: application/helpers/common_helper.php:6305 -#: application/helpers/common_helper.php:6310 -#: application/helpers/common_helper.php:6319 -#: application/helpers/common_helper.php:6324 +#: application/helpers/common_helper.php:6229 +#: application/helpers/common_helper.php:6234 +#: application/helpers/common_helper.php:6239 +#: application/helpers/common_helper.php:6244 +#: application/helpers/common_helper.php:6249 +#: application/helpers/common_helper.php:6254 +#: application/helpers/common_helper.php:6259 +#: application/helpers/common_helper.php:6264 +#: application/helpers/common_helper.php:6269 +#: application/helpers/common_helper.php:6275 +#: application/helpers/common_helper.php:6281 +#: application/helpers/common_helper.php:6286 +#: application/helpers/common_helper.php:6291 +#: application/helpers/common_helper.php:6296 +#: application/helpers/common_helper.php:6301 +#: application/helpers/common_helper.php:6306 +#: application/helpers/common_helper.php:6312 +#: application/helpers/common_helper.php:6317 +#: application/helpers/common_helper.php:6326 #: application/helpers/common_helper.php:6331 -#: application/helpers/common_helper.php:6335 -#: application/helpers/common_helper.php:6339 -#: application/helpers/frontend_helper.php:1446 -#: application/helpers/frontend_helper.php:1523 -#: application/helpers/frontend_helper.php:1695 -#: application/helpers/replacements_helper.php:665 +#: application/helpers/common_helper.php:6338 +#: application/helpers/common_helper.php:6342 +#: application/helpers/common_helper.php:6346 +#: application/helpers/frontend_helper.php:1444 +#: application/helpers/frontend_helper.php:1521 +#: application/helpers/frontend_helper.php:1693 +#: application/helpers/replacements_helper.php:664 #: application/views/admin/authentication/message.php:3 #: application/views/admin/participants/attributeMapCSV_view.php:76 #: application/views/admin/participants/attributeMap_view.php:106 @@ -1143,18 +1069,18 @@ msgstr "" #: application/controllers/admin/conditionsaction.php:700 #: application/controllers/admin/dataentry.php:1250 -#: application/controllers/admin/printablesurvey.php:1164 -#: application/controllers/admin/printablesurvey.php:1181 -#: application/controllers/admin/printablesurvey.php:1185 -#: application/helpers/admin/statistics_helper.php:1799 +#: application/controllers/admin/printablesurvey.php:1167 +#: application/controllers/admin/printablesurvey.php:1184 +#: application/controllers/admin/printablesurvey.php:1188 +#: application/helpers/admin/statistics_helper.php:1455 #: application/helpers/common_helper.php:1843 #: application/helpers/export_helper.php:259 #: application/helpers/export_helper.php:1350 #: application/helpers/expressions/em_manager_helper.php:2843 -#: application/helpers/qanda_helper.php:4524 -#: application/helpers/qanda_helper.php:4569 +#: application/helpers/qanda_helper.php:4525 +#: application/helpers/qanda_helper.php:4570 #: application/views/admin/dataentry/content_view.php:581 -#: application/views/admin/export/statistics_view.php:677 +#: application/views/admin/export/statistics_view.php:714 msgid "Uncertain" msgstr "" @@ -1163,75 +1089,75 @@ msgstr "" #: application/controllers/admin/dataentry.php:681 #: application/controllers/admin/dataentry.php:1190 #: application/controllers/admin/dataentry.php:1253 -#: application/controllers/admin/printablesurvey.php:1044 -#: application/controllers/admin/printablesurvey.php:1048 -#: application/controllers/admin/printablesurvey.php:1165 -#: application/controllers/admin/printablesurvey.php:1182 +#: application/controllers/admin/printablesurvey.php:1047 +#: application/controllers/admin/printablesurvey.php:1051 +#: application/controllers/admin/printablesurvey.php:1168 #: application/controllers/admin/printablesurvey.php:1185 +#: application/controllers/admin/printablesurvey.php:1188 #: application/controllers/admin/quotas.php:518 #: application/controllers/admin/surveyadmin.php:612 -#: application/controllers/admin/tokens.php:1956 -#: application/core/Survey_Common_Action.php:824 -#: application/helpers/admin/statistics_helper.php:1798 -#: application/helpers/admin/statistics_helper.php:1932 +#: application/controllers/admin/tokens.php:2079 +#: application/core/Survey_Common_Action.php:823 +#: application/helpers/admin/statistics_helper.php:1454 +#: application/helpers/admin/statistics_helper.php:1587 #: application/helpers/common_helper.php:1826 #: application/helpers/common_helper.php:1842 -#: application/helpers/common_helper.php:3059 -#: application/helpers/common_helper.php:3160 -#: application/helpers/common_helper.php:3270 -#: application/helpers/common_helper.php:3285 -#: application/helpers/common_helper.php:3296 -#: application/helpers/common_helper.php:3307 -#: application/helpers/common_helper.php:3318 -#: application/helpers/common_helper.php:3327 -#: application/helpers/common_helper.php:3338 -#: application/helpers/common_helper.php:3390 -#: application/helpers/common_helper.php:3419 -#: application/helpers/common_helper.php:3430 -#: application/helpers/common_helper.php:3537 -#: application/helpers/common_helper.php:3548 -#: application/helpers/common_helper.php:3568 -#: application/helpers/common_helper.php:3580 -#: application/helpers/common_helper.php:3610 -#: application/helpers/common_helper.php:3623 -#: application/helpers/common_helper.php:3634 -#: application/helpers/common_helper.php:3645 -#: application/helpers/common_helper.php:3665 -#: application/helpers/common_helper.php:3685 -#: application/helpers/common_helper.php:3722 -#: application/helpers/common_helper.php:3732 -#: application/helpers/common_helper.php:3742 -#: application/helpers/common_helper.php:3761 -#: application/helpers/common_helper.php:3804 -#: application/helpers/common_helper.php:3816 -#: application/helpers/common_helper.php:3830 -#: application/helpers/common_helper.php:3866 -#: application/helpers/common_helper.php:3954 -#: application/helpers/common_helper.php:3964 -#: application/helpers/common_helper.php:4111 -#: application/helpers/common_helper.php:4122 -#: application/helpers/common_helper.php:4182 +#: application/helpers/common_helper.php:3063 +#: application/helpers/common_helper.php:3164 +#: application/helpers/common_helper.php:3274 +#: application/helpers/common_helper.php:3289 +#: application/helpers/common_helper.php:3300 +#: application/helpers/common_helper.php:3311 +#: application/helpers/common_helper.php:3322 +#: application/helpers/common_helper.php:3331 +#: application/helpers/common_helper.php:3342 +#: application/helpers/common_helper.php:3394 +#: application/helpers/common_helper.php:3423 +#: application/helpers/common_helper.php:3434 +#: application/helpers/common_helper.php:3541 +#: application/helpers/common_helper.php:3552 +#: application/helpers/common_helper.php:3572 +#: application/helpers/common_helper.php:3584 +#: application/helpers/common_helper.php:3614 +#: application/helpers/common_helper.php:3627 +#: application/helpers/common_helper.php:3638 +#: application/helpers/common_helper.php:3649 +#: application/helpers/common_helper.php:3669 +#: application/helpers/common_helper.php:3689 +#: application/helpers/common_helper.php:3726 +#: application/helpers/common_helper.php:3736 +#: application/helpers/common_helper.php:3746 +#: application/helpers/common_helper.php:3765 +#: application/helpers/common_helper.php:3808 +#: application/helpers/common_helper.php:3820 +#: application/helpers/common_helper.php:3834 +#: application/helpers/common_helper.php:3870 +#: application/helpers/common_helper.php:3958 +#: application/helpers/common_helper.php:3968 +#: application/helpers/common_helper.php:4115 +#: application/helpers/common_helper.php:4126 +#: application/helpers/common_helper.php:4186 #: application/helpers/export_helper.php:254 #: application/helpers/export_helper.php:258 #: application/helpers/export_helper.php:1331 #: application/helpers/export_helper.php:1350 #: application/helpers/expressions/em_manager_helper.php:2838 #: application/helpers/expressions/em_manager_helper.php:2842 -#: application/helpers/qanda_helper.php:4105 -#: application/helpers/qanda_helper.php:4525 -#: application/helpers/qanda_helper.php:4579 +#: application/helpers/qanda_helper.php:4106 +#: application/helpers/qanda_helper.php:4526 +#: application/helpers/qanda_helper.php:4580 #: application/views/admin/dataentry/content_view.php:528 #: application/views/admin/dataentry/content_view.php:582 #: application/views/admin/dataentry/import.php:24 -#: application/views/admin/export/statistics_view.php:512 -#: application/views/admin/export/statistics_view.php:683 +#: application/views/admin/export/statistics_view.php:549 +#: application/views/admin/export/statistics_view.php:720 #: application/views/admin/globalSettings_view.php:301 #: application/views/admin/globalSettings_view.php:312 #: application/views/admin/globalSettings_view.php:323 #: application/views/admin/globalSettings_view.php:363 #: application/views/admin/globalSettings_view.php:384 -#: application/views/admin/survey/Question/editQuestion_view.php:145 -#: application/views/admin/survey/Question/editQuestion_view.php:165 +#: application/views/admin/survey/Question/editQuestion_view.php:151 +#: application/views/admin/survey/Question/editQuestion_view.php:171 #: application/views/admin/survey/Question/questionbar_view.php:216 #: application/views/admin/survey/Question/questionbar_view.php:231 #: application/views/admin/survey/activateSurvey_view.php:70 @@ -1272,50 +1198,50 @@ msgid "No" msgstr "" #: application/controllers/admin/conditionsaction.php:704 -#: application/controllers/admin/printablesurvey.php:1203 -#: application/controllers/admin/printablesurvey.php:1219 -#: application/controllers/admin/printablesurvey.php:1223 -#: application/helpers/admin/statistics_helper.php:1817 +#: application/controllers/admin/printablesurvey.php:1206 +#: application/controllers/admin/printablesurvey.php:1222 +#: application/controllers/admin/printablesurvey.php:1226 +#: application/helpers/admin/statistics_helper.php:1473 #: application/helpers/common_helper.php:1849 #: application/helpers/export_helper.php:262 #: application/helpers/export_helper.php:1355 #: application/helpers/expressions/em_manager_helper.php:2846 -#: application/helpers/qanda_helper.php:4680 -#: application/helpers/qanda_helper.php:4722 +#: application/helpers/qanda_helper.php:4681 +#: application/helpers/qanda_helper.php:4723 #: application/views/admin/dataentry/content_view.php:598 -#: application/views/admin/export/statistics_view.php:727 +#: application/views/admin/export/statistics_view.php:764 msgid "Increase" msgstr "" #: application/controllers/admin/conditionsaction.php:705 -#: application/controllers/admin/printablesurvey.php:1204 -#: application/controllers/admin/printablesurvey.php:1220 +#: application/controllers/admin/printablesurvey.php:1207 #: application/controllers/admin/printablesurvey.php:1223 -#: application/helpers/admin/statistics_helper.php:1818 +#: application/controllers/admin/printablesurvey.php:1226 +#: application/helpers/admin/statistics_helper.php:1474 #: application/helpers/common_helper.php:1851 #: application/helpers/export_helper.php:263 #: application/helpers/export_helper.php:1355 #: application/helpers/expressions/em_manager_helper.php:2847 -#: application/helpers/qanda_helper.php:4681 -#: application/helpers/qanda_helper.php:4733 +#: application/helpers/qanda_helper.php:4682 +#: application/helpers/qanda_helper.php:4734 #: application/views/admin/dataentry/content_view.php:599 -#: application/views/admin/export/statistics_view.php:732 +#: application/views/admin/export/statistics_view.php:769 msgid "Same" msgstr "" #: application/controllers/admin/conditionsaction.php:706 -#: application/controllers/admin/printablesurvey.php:1205 -#: application/controllers/admin/printablesurvey.php:1221 -#: application/controllers/admin/printablesurvey.php:1223 -#: application/helpers/admin/statistics_helper.php:1819 +#: application/controllers/admin/printablesurvey.php:1208 +#: application/controllers/admin/printablesurvey.php:1224 +#: application/controllers/admin/printablesurvey.php:1226 +#: application/helpers/admin/statistics_helper.php:1475 #: application/helpers/common_helper.php:1850 #: application/helpers/export_helper.php:264 #: application/helpers/export_helper.php:1355 #: application/helpers/expressions/em_manager_helper.php:2848 -#: application/helpers/qanda_helper.php:4682 -#: application/helpers/qanda_helper.php:4745 +#: application/helpers/qanda_helper.php:4683 +#: application/helpers/qanda_helper.php:4746 #: application/views/admin/dataentry/content_view.php:600 -#: application/views/admin/export/statistics_view.php:737 +#: application/views/admin/export/statistics_view.php:774 msgid "Decrease" msgstr "" @@ -1332,41 +1258,41 @@ msgstr "" #: application/controllers/admin/conditionsaction.php:1017 #: application/controllers/admin/conditionsaction.php:1460 #: application/controllers/admin/dataentry.php:1315 -#: application/helpers/admin/statistics_helper.php:939 -#: application/helpers/admin/statistics_helper.php:1000 -#: application/helpers/admin/statistics_helper.php:2053 -#: application/helpers/admin/statistics_helper.php:2262 -#: application/helpers/admin/statistics_helper.php:2748 -#: application/helpers/admin/statistics_helper.php:2762 -#: application/helpers/admin/statistics_helper.php:2823 -#: application/helpers/admin/statistics_helper.php:2886 -#: application/helpers/admin/statistics_helper.php:2953 +#: application/helpers/admin/statistics_helper.php:599 +#: application/helpers/admin/statistics_helper.php:660 +#: application/helpers/admin/statistics_helper.php:1709 +#: application/helpers/admin/statistics_helper.php:1940 +#: application/helpers/admin/statistics_helper.php:2434 +#: application/helpers/admin/statistics_helper.php:2448 +#: application/helpers/admin/statistics_helper.php:2509 +#: application/helpers/admin/statistics_helper.php:2572 +#: application/helpers/admin/statistics_helper.php:2639 #: application/helpers/common_helper.php:1827 #: application/helpers/common_helper.php:1835 #: application/helpers/qanda_helper.php:986 -#: application/helpers/qanda_helper.php:1516 -#: application/helpers/qanda_helper.php:1823 -#: application/helpers/qanda_helper.php:1956 -#: application/helpers/qanda_helper.php:2019 -#: application/helpers/qanda_helper.php:4116 -#: application/helpers/qanda_helper.php:4160 -#: application/helpers/qanda_helper.php:4252 -#: application/helpers/qanda_helper.php:4314 -#: application/helpers/qanda_helper.php:4405 -#: application/helpers/qanda_helper.php:4450 -#: application/helpers/qanda_helper.php:4528 -#: application/helpers/qanda_helper.php:4599 -#: application/helpers/qanda_helper.php:4685 -#: application/helpers/qanda_helper.php:4763 -#: application/helpers/qanda_helper.php:4868 -#: application/helpers/qanda_helper.php:4951 -#: application/helpers/qanda_helper.php:5083 -#: application/helpers/qanda_helper.php:5874 +#: application/helpers/qanda_helper.php:1517 +#: application/helpers/qanda_helper.php:1824 +#: application/helpers/qanda_helper.php:1957 +#: application/helpers/qanda_helper.php:2020 +#: application/helpers/qanda_helper.php:4117 +#: application/helpers/qanda_helper.php:4161 +#: application/helpers/qanda_helper.php:4253 +#: application/helpers/qanda_helper.php:4315 +#: application/helpers/qanda_helper.php:4406 +#: application/helpers/qanda_helper.php:4451 +#: application/helpers/qanda_helper.php:4529 +#: application/helpers/qanda_helper.php:4600 +#: application/helpers/qanda_helper.php:4686 +#: application/helpers/qanda_helper.php:4764 +#: application/helpers/qanda_helper.php:4869 +#: application/helpers/qanda_helper.php:4952 +#: application/helpers/qanda_helper.php:5084 #: application/helpers/qanda_helper.php:5875 -#: application/helpers/qanda_helper.php:6167 -#: application/helpers/qanda_helper.php:6328 -#: application/helpers/qanda_helper.php:6529 -#: application/helpers/qanda_helper.php:6583 +#: application/helpers/qanda_helper.php:5876 +#: application/helpers/qanda_helper.php:6168 +#: application/helpers/qanda_helper.php:6329 +#: application/helpers/qanda_helper.php:6530 +#: application/helpers/qanda_helper.php:6584 #: application/views/admin/dataentry/content_view.php:29 msgid "No answer" msgstr "" @@ -1389,65 +1315,65 @@ msgstr "" #: application/controllers/admin/conditionsaction.php:950 #: application/controllers/admin/dataentry.php:746 -#: application/controllers/admin/printablesurvey.php:715 -#: application/controllers/admin/printablesurvey.php:720 +#: application/controllers/admin/printablesurvey.php:718 +#: application/controllers/admin/printablesurvey.php:723 #: application/controllers/admin/quotas.php:451 -#: application/helpers/admin/statistics_helper.php:1924 +#: application/helpers/admin/statistics_helper.php:1579 #: application/helpers/common_helper.php:1834 #: application/helpers/export_helper.php:249 #: application/helpers/export_helper.php:1335 #: application/helpers/expressions/em_manager_helper.php:2834 -#: application/helpers/qanda_helper.php:4142 +#: application/helpers/qanda_helper.php:4143 #: application/views/admin/dataentry/content_view.php:54 -#: application/views/admin/export/statistics_view.php:488 +#: application/views/admin/export/statistics_view.php:525 msgid "Female" msgstr "" #: application/controllers/admin/conditionsaction.php:951 #: application/controllers/admin/dataentry.php:747 -#: application/controllers/admin/printablesurvey.php:716 -#: application/controllers/admin/printablesurvey.php:720 +#: application/controllers/admin/printablesurvey.php:719 +#: application/controllers/admin/printablesurvey.php:723 #: application/controllers/admin/quotas.php:450 -#: application/helpers/admin/statistics_helper.php:1925 +#: application/helpers/admin/statistics_helper.php:1580 #: application/helpers/common_helper.php:1833 #: application/helpers/export_helper.php:250 #: application/helpers/export_helper.php:1335 #: application/helpers/expressions/em_manager_helper.php:2833 -#: application/helpers/qanda_helper.php:4150 +#: application/helpers/qanda_helper.php:4151 #: application/views/admin/dataentry/content_view.php:55 -#: application/views/admin/export/statistics_view.php:494 +#: application/views/admin/export/statistics_view.php:531 msgid "Male" msgstr "" #: application/controllers/admin/conditionsaction.php:1011 #: application/controllers/admin/dataentry.php:833 -#: application/helpers/admin/statistics_helper.php:893 -#: application/helpers/admin/statistics_helper.php:2041 -#: application/helpers/admin/statistics_helper.php:2130 -#: application/helpers/admin/statistics_helper.php:2266 +#: application/helpers/admin/statistics_helper.php:563 +#: application/helpers/admin/statistics_helper.php:1697 +#: application/helpers/admin/statistics_helper.php:1809 +#: application/helpers/admin/statistics_helper.php:1944 #: application/helpers/common_helper.php:1811 #: application/helpers/common_helper.php:1874 -#: application/helpers/common_helper.php:2415 -#: application/helpers/common_helper.php:2675 -#: application/helpers/common_helper.php:3576 -#: application/helpers/common_helper.php:3590 -#: application/helpers/common_helper.php:3606 -#: application/helpers/common_helper.php:3662 -#: application/helpers/common_helper.php:3682 -#: application/helpers/common_helper.php:3896 -#: application/helpers/common_helper.php:3909 -#: application/helpers/common_helper.php:3919 -#: application/helpers/common_helper.php:4131 -#: application/helpers/common_helper.php:4140 -#: application/helpers/common_helper.php:4149 -#: application/helpers/common_helper.php:4158 +#: application/helpers/common_helper.php:2419 +#: application/helpers/common_helper.php:2679 +#: application/helpers/common_helper.php:3580 +#: application/helpers/common_helper.php:3594 +#: application/helpers/common_helper.php:3610 +#: application/helpers/common_helper.php:3666 +#: application/helpers/common_helper.php:3686 +#: application/helpers/common_helper.php:3900 +#: application/helpers/common_helper.php:3913 +#: application/helpers/common_helper.php:3923 +#: application/helpers/common_helper.php:4135 +#: application/helpers/common_helper.php:4144 +#: application/helpers/common_helper.php:4153 +#: application/helpers/common_helper.php:4162 #: application/helpers/export_helper.php:928 #: application/helpers/export_helper.php:937 #: application/helpers/export_helper.php:1033 #: application/helpers/export_helper.php:1048 -#: application/helpers/qanda_helper.php:1789 -#: application/helpers/qanda_helper.php:2367 -#: application/helpers/qanda_helper.php:2697 +#: application/helpers/qanda_helper.php:1790 +#: application/helpers/qanda_helper.php:2368 +#: application/helpers/qanda_helper.php:2698 #: application/views/admin/dataentry/content_view.php:103 #: application/views/admin/dataentry/content_view.php:108 #: application/views/admin/dataentry/content_view.php:123 @@ -1469,7 +1395,7 @@ msgid "Current" msgstr "" #: application/controllers/admin/conditionsaction.php:1066 -#: application/views/admin/survey/Question/editQuestion_view.php:195 +#: application/views/admin/survey/Question/editQuestion_view.php:201 msgid "After" msgstr "" @@ -1589,28 +1515,28 @@ msgid "Comparison operator" msgstr "" #: application/controllers/admin/conditionsaction.php:1788 -#: application/helpers/admin/statistics_helper.php:938 -#: application/helpers/admin/statistics_helper.php:999 -#: application/helpers/admin/statistics_helper.php:2288 -#: application/helpers/admin/statistics_helper.php:2324 -#: application/helpers/admin/statistics_helper.php:2327 -#: application/helpers/admin/statistics_helper.php:2336 -#: application/helpers/admin/statistics_helper.php:2341 -#: application/helpers/admin/statistics_helper.php:2366 -#: application/helpers/admin/statistics_helper.php:2369 -#: application/helpers/admin/statistics_helper.php:2378 -#: application/helpers/admin/statistics_helper.php:2383 -#: application/helpers/admin/statistics_helper.php:2473 -#: application/helpers/admin/statistics_helper.php:2476 -#: application/helpers/admin/statistics_helper.php:2484 -#: application/helpers/admin/statistics_helper.php:2489 -#: application/helpers/qanda_helper.php:1237 -#: application/helpers/qanda_helper.php:3695 -#: application/helpers/qanda_helper.php:3796 -#: application/helpers/qanda_helper.php:3888 -#: application/helpers/qanda_helper.php:3989 +#: application/helpers/admin/statistics_helper.php:598 +#: application/helpers/admin/statistics_helper.php:659 +#: application/helpers/admin/statistics_helper.php:1967 +#: application/helpers/admin/statistics_helper.php:2002 +#: application/helpers/admin/statistics_helper.php:2005 +#: application/helpers/admin/statistics_helper.php:2014 +#: application/helpers/admin/statistics_helper.php:2019 +#: application/helpers/admin/statistics_helper.php:2042 +#: application/helpers/admin/statistics_helper.php:2045 +#: application/helpers/admin/statistics_helper.php:2054 +#: application/helpers/admin/statistics_helper.php:2059 +#: application/helpers/admin/statistics_helper.php:2148 +#: application/helpers/admin/statistics_helper.php:2151 +#: application/helpers/admin/statistics_helper.php:2159 +#: application/helpers/admin/statistics_helper.php:2164 +#: application/helpers/qanda_helper.php:1238 +#: application/helpers/qanda_helper.php:3696 +#: application/helpers/qanda_helper.php:3797 +#: application/helpers/qanda_helper.php:3889 #: application/helpers/qanda_helper.php:3990 -#: application/helpers/qanda_helper.php:4064 +#: application/helpers/qanda_helper.php:3991 +#: application/helpers/qanda_helper.php:4065 msgid "Answer" msgstr "" @@ -1658,76 +1584,75 @@ msgid "Update condition" msgstr "" #: application/controllers/admin/conditionsaction.php:1916 -#: application/views/admin/export/statistics_view.php:128 -#: application/views/admin/export/statistics_view.php:1246 +#: application/views/admin/export/statistics_view.php:137 +#: application/views/admin/export/statistics_view.php:1284 msgid "Clear" msgstr "" -#: application/controllers/admin/database.php:70 -#: application/controllers/admin/database.php:779 -#: application/controllers/admin/database.php:843 -#: application/views/admin/database/database_view.php:4 -#: application/views/admin/database/database_view.php:58 -#: application/views/admin/database/database_view.php:71 -msgid "Question could not be updated" -msgstr "" - -#: application/controllers/admin/database.php:125 +#: application/controllers/admin/database.php:121 msgid "Default value settings were successfully saved." msgstr "" -#: application/controllers/admin/database.php:205 +#: application/controllers/admin/database.php:201 #: application/views/admin/database/database_view.php:10 msgid "Failed to update answers" msgstr "" -#: application/controllers/admin/database.php:218 +#: application/controllers/admin/database.php:214 #: application/views/admin/database/database_view.php:16 msgid "Answers with a code of 0 (zero) or blank code are not allowed, and will not be saved" msgstr "" -#: application/controllers/admin/database.php:219 +#: application/controllers/admin/database.php:215 #: application/views/admin/database/database_view.php:22 msgid "Duplicate codes found, these entries won't be updated" msgstr "" -#: application/controllers/admin/database.php:221 +#: application/controllers/admin/database.php:217 msgid "Answer options were successfully saved." msgstr "" -#: application/controllers/admin/database.php:264 +#: application/controllers/admin/database.php:260 #: application/views/admin/database/database_view.php:28 msgid "Failed to delete answer" msgstr "" -#: application/controllers/admin/database.php:353 +#: application/controllers/admin/database.php:349 msgid "Subquestions were successfully saved." msgstr "" -#: application/controllers/admin/database.php:373 +#: application/controllers/admin/database.php:369 msgid "The question could not be added. You must enter at least a question code." msgstr "" -#: application/controllers/admin/database.php:466 +#: application/controllers/admin/database.php:462 #: application/views/admin/database/database_view.php:40 msgid "Question in language %s could not be created." msgstr "" -#: application/controllers/admin/database.php:475 +#: application/controllers/admin/database.php:471 #: application/views/admin/database/database_view.php:46 msgid "Question could not be created." msgstr "" -#: application/controllers/admin/database.php:549 +#: application/controllers/admin/database.php:545 msgid "Question was successfully added." msgstr "" -#: application/controllers/admin/database.php:696 +#: application/controllers/admin/database.php:692 #: application/views/admin/database/database_view.php:52 msgid "Question could not be updated. There are conditions for other questions that rely on the answers to this question and changing the type will cause problems. You must delete these conditions before you can change the type of this question." msgstr "" -#: application/controllers/admin/database.php:806 +#: application/controllers/admin/database.php:775 +#: application/controllers/admin/database.php:839 +#: application/views/admin/database/database_view.php:4 +#: application/views/admin/database/database_view.php:58 +#: application/views/admin/database/database_view.php:71 +msgid "Question could not be updated" +msgstr "" + +#: application/controllers/admin/database.php:802 msgid "Question was successfully saved." msgstr "" @@ -1758,7 +1683,7 @@ msgstr "" #: application/controllers/admin/dataentry.php:306 #: application/controllers/admin/labels.php:103 #: application/controllers/admin/labels.php:136 -#: application/controllers/admin/participantsaction.php:1355 +#: application/controllers/admin/participantsaction.php:1358 #: application/controllers/admin/question.php:55 #: application/controllers/admin/questiongroup.php:55 #: application/controllers/admin/surveyadmin.php:204 @@ -1777,8 +1702,8 @@ msgid "Please select..." msgstr "" #: application/controllers/admin/dataentry.php:400 -#: application/controllers/admin/statistics.php:176 -#: application/helpers/admin/statistics_helper.php:449 +#: application/controllers/admin/statistics.php:177 +#: application/helpers/admin/statistics_helper.php:3227 msgid "Quick statistics" msgstr "" @@ -1791,9 +1716,9 @@ msgid "%s old response(s) and according timings were successfully imported." msgstr "" #: application/controllers/admin/dataentry.php:515 -#: application/controllers/admin/dataentry.php:1495 -#: application/controllers/admin/dataentry.php:1623 -#: application/controllers/admin/dataentry.php:2611 +#: application/controllers/admin/dataentry.php:1497 +#: application/controllers/admin/dataentry.php:1625 +#: application/controllers/admin/dataentry.php:2613 #: application/views/admin/dataentry/caption_view.php:1 #: application/views/admin/dataentry/dataentry_header_view.php:1 #: application/views/admin/dataentry/delete.php:1 @@ -1806,8 +1731,8 @@ msgstr "" #: application/controllers/admin/dataentry.php:844 #: application/controllers/admin/dataentry.php:1067 #: application/controllers/admin/dataentry.php:1184 -#: application/helpers/qanda_helper.php:1530 -#: application/helpers/qanda_helper.php:5063 +#: application/helpers/qanda_helper.php:1531 +#: application/helpers/qanda_helper.php:5064 #: application/views/admin/dataentry/content_view.php:53 #: application/views/admin/dataentry/content_view.php:118 #: application/views/admin/dataentry/content_view.php:136 @@ -1822,19 +1747,19 @@ msgid "Please choose" msgstr "" #: application/controllers/admin/dataentry.php:978 -#: application/controllers/admin/dataentry.php:2296 +#: application/controllers/admin/dataentry.php:2298 msgid "Remove this item" msgstr "" #: application/controllers/admin/dataentry.php:1000 -#: application/helpers/common_helper.php:3914 -#: application/helpers/qanda_helper.php:2142 +#: application/helpers/common_helper.php:3918 +#: application/helpers/qanda_helper.php:2143 msgid "Your Choices" msgstr "" #: application/controllers/admin/dataentry.php:1005 -#: application/helpers/common_helper.php:3924 -#: application/helpers/qanda_helper.php:2150 +#: application/helpers/common_helper.php:3928 +#: application/helpers/qanda_helper.php:2151 msgid "Your Ranking" msgstr "" @@ -1845,7 +1770,9 @@ msgstr "" #: application/views/admin/emailtemplates/emailtemplates_view.php:145 #: application/views/admin/labels/editlabel_view.php:50 #: application/views/admin/survey/Question/answerOptions_view.php:184 -#: application/views/admin/survey/Question/editdefaultvalues_view.php:182 +#: application/views/admin/survey/Question/editQuestion_view.php:37 +#: application/views/admin/survey/Question/editQuestion_view.php:254 +#: application/views/admin/survey/Question/editdefaultvalues_view.php:186 #: application/views/admin/survey/Question/subQuestion_view.php:183 #: application/views/admin/survey/QuestionGroups/editGroup_view.php:41 #: application/views/admin/survey/editLocalSettings_main_view.php:8 @@ -1859,9 +1786,9 @@ msgstr "" msgid "Save" msgstr "" -#: application/controllers/admin/dataentry.php:1585 -#: application/controllers/admin/tokens.php:721 -#: application/controllers/admin/tokens.php:887 +#: application/controllers/admin/dataentry.php:1587 +#: application/controllers/admin/tokens.php:844 +#: application/controllers/admin/tokens.php:1010 #: application/controllers/admin/useraction.php:149 #: application/views/admin/dataentry/insert.php:73 #: application/views/admin/dataentry/iteratesurvey.php:5 @@ -1886,86 +1813,96 @@ msgstr "" msgid "Success" msgstr "" -#: application/controllers/admin/dataentry.php:1586 +#: application/controllers/admin/dataentry.php:1588 msgid "Record has been updated." msgstr "" -#: application/controllers/admin/dataentry.php:1587 +#: application/controllers/admin/dataentry.php:1589 msgid "View This Record" msgstr "" -#: application/controllers/admin/dataentry.php:1670 +#: application/controllers/admin/dataentry.php:1590 +#: application/controllers/admin/responses.php:68 +#: application/controllers/admin/responses.php:77 +#: application/controllers/admin/responses.php:940 +#: application/views/admin/dataentry/delete.php:5 +#: application/views/admin/dataentry/vvimport_upload.php:22 +#: application/views/admin/responses/browseallfiltered_view.php:3 +msgid "Browse responses" +msgstr "" + +#: application/controllers/admin/dataentry.php:1672 msgid "This is a closed-access survey, so you must supply a valid token. Please contact the administrator for assistance." msgstr "" -#: application/controllers/admin/dataentry.php:1675 +#: application/controllers/admin/dataentry.php:1677 msgid "The token you have provided is not valid or has already been used." msgstr "" -#: application/controllers/admin/dataentry.php:1680 +#: application/controllers/admin/dataentry.php:1682 msgid "There is already a recorded answer for this token" msgstr "" -#: application/controllers/admin/dataentry.php:1684 +#: application/controllers/admin/dataentry.php:1686 msgid "Follow the following link to update it" msgstr "" -#: application/controllers/admin/dataentry.php:1687 -#: application/views/admin/browse/browseidheader_view.php:9 -#: application/views/admin/browse/browseidheader_view.php:10 +#: application/controllers/admin/dataentry.php:1689 +#: application/views/admin/responses/browseidheader_view.php:9 +#: application/views/admin/responses/browseidheader_view.php:10 msgid "Edit this entry" msgstr "" -#: application/controllers/admin/dataentry.php:1691 +#: application/controllers/admin/dataentry.php:1693 msgid "This surveys uses anonymized responses, so you can't update your response." msgstr "" -#: application/controllers/admin/dataentry.php:1716 +#: application/controllers/admin/dataentry.php:1718 #: application/libraries/Save.php:115 msgid "You must supply a name for this saved session." msgstr "" -#: application/controllers/admin/dataentry.php:1717 +#: application/controllers/admin/dataentry.php:1719 #: application/libraries/Save.php:116 msgid "You must supply a password for this saved session." msgstr "" -#: application/controllers/admin/dataentry.php:1718 +#: application/controllers/admin/dataentry.php:1720 #: application/libraries/Save.php:118 msgid "Your passwords do not match." msgstr "" -#: application/controllers/admin/dataentry.php:1903 +#: application/controllers/admin/dataentry.php:1905 msgid "Your survey responses have been saved successfully. You will be sent a confirmation e-mail. Please make sure to save your password, since we will not be able to retrieve it for you." msgstr "" -#: application/controllers/admin/dataentry.php:1933 +#: application/controllers/admin/dataentry.php:1935 msgid "A token entry for the saved survey has been created too." msgstr "" -#: application/controllers/admin/dataentry.php:1943 +#: application/controllers/admin/dataentry.php:1945 #: application/libraries/Save.php:195 application/libraries/Save.php:236 msgid "Saved Survey Details" msgstr "" -#: application/controllers/admin/dataentry.php:1944 +#: application/controllers/admin/dataentry.php:1946 #: application/libraries/Save.php:196 msgid "Thank you for saving your survey in progress. The following details can be used to return to this survey and continue where you left off. Please keep this e-mail for your reference - we cannot retrieve the password for you." msgstr "" -#: application/controllers/admin/dataentry.php:1946 -#: application/helpers/replacements_helper.php:553 +#: application/controllers/admin/dataentry.php:1948 +#: application/helpers/replacements_helper.php:552 #: application/libraries/Save.php:198 msgid "Name" msgstr "" -#: application/controllers/admin/dataentry.php:1947 +#: application/controllers/admin/dataentry.php:1949 #: application/controllers/admin/useraction.php:129 #: application/controllers/admin/useraction.php:133 #: application/controllers/admin/useraction.php:362 #: application/controllers/admin/useraction.php:380 -#: application/helpers/replacements_helper.php:559 -#: application/helpers/replacements_helper.php:592 +#: application/helpers/replacements_helper.php:558 +#: application/helpers/replacements_helper.php:591 #: application/libraries/Save.php:199 #: application/views/admin/authentication/login.php:8 #: application/views/admin/user/modifyuser.php:7 @@ -1973,256 +1910,256 @@ msgstr "" msgid "Password" msgstr "" -#: application/controllers/admin/dataentry.php:1948 +#: application/controllers/admin/dataentry.php:1950 #: application/libraries/Save.php:200 application/libraries/Save.php:238 msgid "Reload your survey by clicking on the following link (or pasting it into your browser):" msgstr "" -#: application/controllers/admin/dataentry.php:1956 +#: application/controllers/admin/dataentry.php:1958 msgid "An email has been sent with details about your saved survey" msgstr "" -#: application/controllers/admin/dataentry.php:2079 +#: application/controllers/admin/dataentry.php:2081 msgid "Only answer this if the following conditions are met:" msgstr "" -#: application/controllers/admin/dataentry.php:2085 +#: application/controllers/admin/dataentry.php:2087 msgid "The answer(s) must meet these validation criteria:" msgstr "" -#: application/controllers/admin/dataentry.php:2091 +#: application/controllers/admin/dataentry.php:2093 msgid "The answer(s) must meet these array_filter criteria:" msgstr "" -#: application/controllers/admin/dataentry.php:2493 -#: application/controllers/admin/tokens.php:1645 +#: application/controllers/admin/dataentry.php:2495 +#: application/controllers/admin/tokens.php:1768 #: application/views/admin/participants/importCSV_view.php:17 msgid "ARMSCII-8 Armenian" msgstr "" -#: application/controllers/admin/dataentry.php:2494 -#: application/controllers/admin/tokens.php:1646 +#: application/controllers/admin/dataentry.php:2496 +#: application/controllers/admin/tokens.php:1769 #: application/views/admin/participants/importCSV_view.php:18 msgid "US ASCII" msgstr "" -#: application/controllers/admin/dataentry.php:2495 -#: application/controllers/admin/tokens.php:1647 +#: application/controllers/admin/dataentry.php:2497 +#: application/controllers/admin/tokens.php:1770 #: application/views/admin/participants/importCSV_view.php:19 msgid "Automatic" msgstr "" -#: application/controllers/admin/dataentry.php:2496 -#: application/controllers/admin/tokens.php:1648 +#: application/controllers/admin/dataentry.php:2498 +#: application/controllers/admin/tokens.php:1771 #: application/views/admin/participants/importCSV_view.php:20 msgid "Big5 Traditional Chinese" msgstr "" -#: application/controllers/admin/dataentry.php:2497 -#: application/controllers/admin/tokens.php:1649 +#: application/controllers/admin/dataentry.php:2499 +#: application/controllers/admin/tokens.php:1772 #: application/views/admin/participants/importCSV_view.php:21 msgid "Binary pseudo charset" msgstr "" -#: application/controllers/admin/dataentry.php:2498 -#: application/controllers/admin/tokens.php:1650 +#: application/controllers/admin/dataentry.php:2500 +#: application/controllers/admin/tokens.php:1773 #: application/views/admin/participants/importCSV_view.php:22 msgid "Windows Central European" msgstr "" -#: application/controllers/admin/dataentry.php:2499 -#: application/controllers/admin/tokens.php:1651 +#: application/controllers/admin/dataentry.php:2501 +#: application/controllers/admin/tokens.php:1774 #: application/views/admin/participants/importCSV_view.php:23 msgid "Windows Cyrillic" msgstr "" -#: application/controllers/admin/dataentry.php:2500 -#: application/controllers/admin/tokens.php:1652 +#: application/controllers/admin/dataentry.php:2502 +#: application/controllers/admin/tokens.php:1775 #: application/views/admin/participants/importCSV_view.php:24 msgid "Windows Arabic" msgstr "" -#: application/controllers/admin/dataentry.php:2501 -#: application/controllers/admin/tokens.php:1653 +#: application/controllers/admin/dataentry.php:2503 +#: application/controllers/admin/tokens.php:1776 #: application/views/admin/participants/importCSV_view.php:25 msgid "Windows Baltic" msgstr "" -#: application/controllers/admin/dataentry.php:2502 -#: application/controllers/admin/tokens.php:1654 +#: application/controllers/admin/dataentry.php:2504 +#: application/controllers/admin/tokens.php:1777 #: application/views/admin/participants/importCSV_view.php:26 msgid "DOS West European" msgstr "" -#: application/controllers/admin/dataentry.php:2503 -#: application/controllers/admin/tokens.php:1655 +#: application/controllers/admin/dataentry.php:2505 +#: application/controllers/admin/tokens.php:1778 #: application/views/admin/participants/importCSV_view.php:27 msgid "DOS Central European" msgstr "" -#: application/controllers/admin/dataentry.php:2504 -#: application/controllers/admin/tokens.php:1656 +#: application/controllers/admin/dataentry.php:2506 +#: application/controllers/admin/tokens.php:1779 #: application/views/admin/participants/importCSV_view.php:28 msgid "DOS Russian" msgstr "" -#: application/controllers/admin/dataentry.php:2505 -#: application/controllers/admin/tokens.php:1657 +#: application/controllers/admin/dataentry.php:2507 +#: application/controllers/admin/tokens.php:1780 #: application/views/admin/participants/importCSV_view.php:29 msgid "SJIS for Windows Japanese" msgstr "" -#: application/controllers/admin/dataentry.php:2506 -#: application/controllers/admin/tokens.php:1658 +#: application/controllers/admin/dataentry.php:2508 +#: application/controllers/admin/tokens.php:1781 #: application/views/admin/participants/importCSV_view.php:30 msgid "DEC West European" msgstr "" -#: application/controllers/admin/dataentry.php:2507 -#: application/controllers/admin/tokens.php:1659 +#: application/controllers/admin/dataentry.php:2509 +#: application/controllers/admin/tokens.php:1782 #: application/views/admin/participants/importCSV_view.php:31 msgid "UJIS for Windows Japanese" msgstr "" -#: application/controllers/admin/dataentry.php:2508 -#: application/controllers/admin/tokens.php:1660 +#: application/controllers/admin/dataentry.php:2510 +#: application/controllers/admin/tokens.php:1783 #: application/views/admin/participants/importCSV_view.php:32 msgid "EUC-KR Korean" msgstr "" -#: application/controllers/admin/dataentry.php:2509 -#: application/controllers/admin/tokens.php:1661 +#: application/controllers/admin/dataentry.php:2511 +#: application/controllers/admin/tokens.php:1784 #: application/views/admin/participants/importCSV_view.php:33 msgid "GB2312 Simplified Chinese" msgstr "" -#: application/controllers/admin/dataentry.php:2510 -#: application/controllers/admin/tokens.php:1662 +#: application/controllers/admin/dataentry.php:2512 +#: application/controllers/admin/tokens.php:1785 #: application/views/admin/participants/importCSV_view.php:34 msgid "GBK Simplified Chinese" msgstr "" -#: application/controllers/admin/dataentry.php:2511 -#: application/controllers/admin/tokens.php:1663 +#: application/controllers/admin/dataentry.php:2513 +#: application/controllers/admin/tokens.php:1786 #: application/views/admin/participants/importCSV_view.php:35 msgid "GEOSTD8 Georgian" msgstr "" -#: application/controllers/admin/dataentry.php:2512 -#: application/controllers/admin/tokens.php:1664 +#: application/controllers/admin/dataentry.php:2514 +#: application/controllers/admin/tokens.php:1787 #: application/views/admin/participants/importCSV_view.php:36 msgid "ISO 8859-7 Greek" msgstr "" -#: application/controllers/admin/dataentry.php:2513 -#: application/controllers/admin/tokens.php:1665 +#: application/controllers/admin/dataentry.php:2515 +#: application/controllers/admin/tokens.php:1788 #: application/views/admin/participants/importCSV_view.php:37 msgid "ISO 8859-8 Hebrew" msgstr "" -#: application/controllers/admin/dataentry.php:2514 -#: application/controllers/admin/tokens.php:1666 +#: application/controllers/admin/dataentry.php:2516 +#: application/controllers/admin/tokens.php:1789 #: application/views/admin/participants/importCSV_view.php:38 msgid "HP West European" msgstr "" -#: application/controllers/admin/dataentry.php:2515 -#: application/controllers/admin/tokens.php:1667 +#: application/controllers/admin/dataentry.php:2517 +#: application/controllers/admin/tokens.php:1790 #: application/views/admin/participants/importCSV_view.php:39 msgid "DOS Kamenicky Czech-Slovak" msgstr "" -#: application/controllers/admin/dataentry.php:2516 -#: application/controllers/admin/tokens.php:1668 +#: application/controllers/admin/dataentry.php:2518 +#: application/controllers/admin/tokens.php:1791 #: application/views/admin/participants/importCSV_view.php:40 msgid "KOI8-R Relcom Russian" msgstr "" -#: application/controllers/admin/dataentry.php:2517 -#: application/controllers/admin/tokens.php:1669 +#: application/controllers/admin/dataentry.php:2519 +#: application/controllers/admin/tokens.php:1792 #: application/views/admin/participants/importCSV_view.php:41 msgid "KOI8-U Ukrainian" msgstr "" -#: application/controllers/admin/dataentry.php:2518 -#: application/controllers/admin/tokens.php:1670 +#: application/controllers/admin/dataentry.php:2520 +#: application/controllers/admin/tokens.php:1793 #: application/views/admin/participants/importCSV_view.php:42 msgid "cp1252 West European" msgstr "" -#: application/controllers/admin/dataentry.php:2519 -#: application/controllers/admin/tokens.php:1671 +#: application/controllers/admin/dataentry.php:2521 +#: application/controllers/admin/tokens.php:1794 #: application/views/admin/participants/importCSV_view.php:43 msgid "ISO 8859-2 Central European" msgstr "" -#: application/controllers/admin/dataentry.php:2520 -#: application/controllers/admin/tokens.php:1672 +#: application/controllers/admin/dataentry.php:2522 +#: application/controllers/admin/tokens.php:1795 #: application/views/admin/participants/importCSV_view.php:44 msgid "ISO 8859-9 Turkish" msgstr "" -#: application/controllers/admin/dataentry.php:2521 -#: application/controllers/admin/tokens.php:1673 +#: application/controllers/admin/dataentry.php:2523 +#: application/controllers/admin/tokens.php:1796 #: application/views/admin/participants/importCSV_view.php:45 msgid "ISO 8859-13 Baltic" msgstr "" -#: application/controllers/admin/dataentry.php:2522 -#: application/controllers/admin/tokens.php:1674 +#: application/controllers/admin/dataentry.php:2524 +#: application/controllers/admin/tokens.php:1797 #: application/views/admin/participants/importCSV_view.php:46 msgid "Mac Central European" msgstr "" -#: application/controllers/admin/dataentry.php:2523 -#: application/controllers/admin/tokens.php:1675 +#: application/controllers/admin/dataentry.php:2525 +#: application/controllers/admin/tokens.php:1798 #: application/views/admin/participants/importCSV_view.php:47 msgid "Mac West European" msgstr "" -#: application/controllers/admin/dataentry.php:2524 -#: application/controllers/admin/tokens.php:1676 +#: application/controllers/admin/dataentry.php:2526 +#: application/controllers/admin/tokens.php:1799 #: application/views/admin/participants/importCSV_view.php:48 msgid "Shift-JIS Japanese" msgstr "" -#: application/controllers/admin/dataentry.php:2525 -#: application/controllers/admin/tokens.php:1677 +#: application/controllers/admin/dataentry.php:2527 +#: application/controllers/admin/tokens.php:1800 #: application/views/admin/participants/importCSV_view.php:49 msgid "7bit Swedish" msgstr "" -#: application/controllers/admin/dataentry.php:2526 -#: application/controllers/admin/tokens.php:1678 +#: application/controllers/admin/dataentry.php:2528 +#: application/controllers/admin/tokens.php:1801 #: application/views/admin/participants/importCSV_view.php:50 msgid "TIS620 Thai" msgstr "" -#: application/controllers/admin/dataentry.php:2527 -#: application/controllers/admin/tokens.php:1679 +#: application/controllers/admin/dataentry.php:2529 +#: application/controllers/admin/tokens.php:1802 #: application/views/admin/participants/importCSV_view.php:51 msgid "UCS-2 Unicode" msgstr "" -#: application/controllers/admin/dataentry.php:2528 -#: application/controllers/admin/tokens.php:1680 +#: application/controllers/admin/dataentry.php:2530 +#: application/controllers/admin/tokens.php:1803 #: application/views/admin/participants/importCSV_view.php:52 msgid "EUC-JP Japanese" msgstr "" -#: application/controllers/admin/dataentry.php:2529 -#: application/controllers/admin/tokens.php:1681 +#: application/controllers/admin/dataentry.php:2531 +#: application/controllers/admin/tokens.php:1804 #: application/views/admin/participants/importCSV_view.php:53 msgid "UTF-8 Unicode" msgstr "" -#: application/controllers/admin/dataentry.php:2586 -#: application/controllers/admin/printablesurvey.php:1949 +#: application/controllers/admin/dataentry.php:2588 +#: application/controllers/admin/printablesurvey.php:1952 msgid "Only answer this question for the items you selected in question %s ('%s')" msgstr "" -#: application/controllers/admin/dataentry.php:2594 -#: application/controllers/admin/printablesurvey.php:1957 +#: application/controllers/admin/dataentry.php:2596 +#: application/controllers/admin/printablesurvey.php:1960 msgid "Only answer this question for the items you did not select in question %s ('%s')" msgstr "" @@ -2438,106 +2375,110 @@ msgstr "" msgid "Assessment group score" msgstr "" -#: application/controllers/admin/participantsaction.php:287 +#: application/controllers/admin/participantsaction.php:286 #: application/views/admin/participants/attributeControl_view.php:5 #: application/views/admin/participants/attributeControl_view.php:6 msgid "Drop-down list" msgstr "" -#: application/controllers/admin/participantsaction.php:288 +#: application/controllers/admin/participantsaction.php:287 #: application/views/admin/participants/attributeControl_view.php:5 #: application/views/admin/participants/attributeControl_view.php:6 msgid "Date" msgstr "" -#: application/controllers/admin/participantsaction.php:289 +#: application/controllers/admin/participantsaction.php:288 #: application/views/admin/participants/attributeControl_view.php:5 #: application/views/admin/participants/attributeControl_view.php:6 msgid "Text box" msgstr "" -#: application/controllers/admin/participantsaction.php:527 -#: application/controllers/admin/participantsaction.php:547 +#: application/controllers/admin/participantsaction.php:344 +msgid "Attribute display setting updated" +msgstr "" + +#: application/controllers/admin/participantsaction.php:530 +#: application/controllers/admin/participantsaction.php:550 msgid "Export %s participant(s) to CSV" msgstr "" -#: application/controllers/admin/participantsaction.php:648 -#: application/controllers/admin/participantsaction.php:662 +#: application/controllers/admin/participantsaction.php:651 +#: application/controllers/admin/participantsaction.php:665 msgid "%s participant(s) are to be copied " msgstr "" -#: application/controllers/admin/participantsaction.php:1716 +#: application/controllers/admin/participantsaction.php:1721 msgid "%s participants have been shared" msgstr "" -#: application/controllers/admin/participantsaction.php:1736 +#: application/controllers/admin/participantsaction.php:1741 msgid "%s participants have been copied to the central participants table" msgstr "" -#: application/controllers/admin/participantsaction.php:1739 -#: application/controllers/admin/participantsaction.php:1763 -#: application/controllers/admin/participantsaction.php:1793 +#: application/controllers/admin/participantsaction.php:1744 +#: application/controllers/admin/participantsaction.php:1768 +#: application/controllers/admin/participantsaction.php:1798 msgid "%s entries were not copied because they already existed" msgstr "" -#: application/controllers/admin/participantsaction.php:1743 +#: application/controllers/admin/participantsaction.php:1748 msgid "Attribute values for existing participants have been updated from the token records" msgstr "" -#: application/controllers/admin/participantsaction.php:1760 -#: application/controllers/admin/participantsaction.php:1790 +#: application/controllers/admin/participantsaction.php:1765 +#: application/controllers/admin/participantsaction.php:1795 msgid "%s participants have been copied to the survey token table" msgstr "" -#: application/controllers/admin/participantsaction.php:1767 -#: application/controllers/admin/participantsaction.php:1797 +#: application/controllers/admin/participantsaction.php:1772 +#: application/controllers/admin/participantsaction.php:1802 msgid "Attribute values for existing participants have been updated from the participants records" msgstr "" -#: application/controllers/admin/printablesurvey.php:128 +#: application/controllers/admin/printablesurvey.php:131 msgid "Database" msgstr "" -#: application/controllers/admin/printablesurvey.php:128 +#: application/controllers/admin/printablesurvey.php:131 msgid "table" msgstr "" -#: application/controllers/admin/printablesurvey.php:142 -#: application/controllers/admin/printablesurvey.php:1778 +#: application/controllers/admin/printablesurvey.php:145 +#: application/controllers/admin/printablesurvey.php:1781 msgid "Submit Your Survey." msgstr "" -#: application/controllers/admin/printablesurvey.php:144 -#: application/controllers/admin/printablesurvey.php:1778 +#: application/controllers/admin/printablesurvey.php:147 +#: application/controllers/admin/printablesurvey.php:1781 #: application/controllers/admin/templates.php:1064 msgid "Thank you for completing this survey." msgstr "" -#: application/controllers/admin/printablesurvey.php:155 +#: application/controllers/admin/printablesurvey.php:158 #: application/controllers/admin/templates.php:1060 msgid "Please fax your completed survey to:" msgstr "" -#: application/controllers/admin/printablesurvey.php:161 -#: application/controllers/admin/printablesurvey.php:1772 +#: application/controllers/admin/printablesurvey.php:164 +#: application/controllers/admin/printablesurvey.php:1775 #: application/controllers/admin/templates.php:1063 msgid "Please submit by %s" msgstr "" -#: application/controllers/admin/printablesurvey.php:607 +#: application/controllers/admin/printablesurvey.php:610 msgid "Only answer this question if the following conditions are met:" msgstr "" -#: application/controllers/admin/printablesurvey.php:626 +#: application/controllers/admin/printablesurvey.php:629 msgid "ID:" msgstr "" -#: application/controllers/admin/printablesurvey.php:627 +#: application/controllers/admin/printablesurvey.php:630 msgid "Question code:" msgstr "" -#: application/controllers/admin/printablesurvey.php:652 -#: application/controllers/admin/printablesurvey.php:654 +#: application/controllers/admin/printablesurvey.php:655 +#: application/controllers/admin/printablesurvey.php:657 #: application/controllers/admin/templates.php:941 #: application/controllers/admin/templates.php:1037 #: application/helpers/qanda_helper.php:306 @@ -2545,108 +2486,108 @@ msgstr "" msgid "*" msgstr "" -#: application/controllers/admin/printablesurvey.php:687 -#: application/controllers/admin/printablesurvey.php:688 -#: application/controllers/admin/printablesurvey.php:712 -#: application/controllers/admin/printablesurvey.php:719 -#: application/controllers/admin/printablesurvey.php:745 +#: application/controllers/admin/printablesurvey.php:690 +#: application/controllers/admin/printablesurvey.php:691 +#: application/controllers/admin/printablesurvey.php:715 +#: application/controllers/admin/printablesurvey.php:722 #: application/controllers/admin/printablesurvey.php:748 -#: application/controllers/admin/printablesurvey.php:812 -#: application/controllers/admin/printablesurvey.php:813 -#: application/controllers/admin/printablesurvey.php:1042 -#: application/controllers/admin/printablesurvey.php:1046 +#: application/controllers/admin/printablesurvey.php:751 +#: application/controllers/admin/printablesurvey.php:815 +#: application/controllers/admin/printablesurvey.php:816 +#: application/controllers/admin/printablesurvey.php:1045 +#: application/controllers/admin/printablesurvey.php:1049 #: application/controllers/admin/templates.php:1041 msgid "Please choose *only one* of the following:" msgstr "" -#: application/controllers/admin/printablesurvey.php:704 -#: application/controllers/admin/printablesurvey.php:706 +#: application/controllers/admin/printablesurvey.php:707 +#: application/controllers/admin/printablesurvey.php:709 msgid "Please enter a date:" msgstr "" -#: application/controllers/admin/printablesurvey.php:824 -#: application/controllers/admin/printablesurvey.php:826 -#: application/helpers/qanda_helper.php:2679 +#: application/controllers/admin/printablesurvey.php:827 +#: application/controllers/admin/printablesurvey.php:829 #: application/helpers/qanda_helper.php:2680 -#: application/helpers/qanda_helper.php:2711 -#: application/helpers/qanda_helper.php:2714 +#: application/helpers/qanda_helper.php:2681 +#: application/helpers/qanda_helper.php:2712 +#: application/helpers/qanda_helper.php:2715 msgid "Make a comment on your choice here:" msgstr "" -#: application/controllers/admin/printablesurvey.php:838 +#: application/controllers/admin/printablesurvey.php:841 msgid "Please number each box in order of preference from 1 to" msgstr "" -#: application/controllers/admin/printablesurvey.php:840 +#: application/controllers/admin/printablesurvey.php:843 msgid "Please number each box in order of preference from 1 to " msgstr "" -#: application/controllers/admin/printablesurvey.php:861 -#: application/controllers/admin/printablesurvey.php:862 +#: application/controllers/admin/printablesurvey.php:864 +#: application/controllers/admin/printablesurvey.php:865 msgid "Please choose *all* that apply:" msgstr "" -#: application/controllers/admin/printablesurvey.php:913 -#: application/controllers/admin/printablesurvey.php:914 +#: application/controllers/admin/printablesurvey.php:916 +#: application/controllers/admin/printablesurvey.php:917 msgid "Please choose all that apply and provide a comment:" msgstr "" -#: application/controllers/admin/printablesurvey.php:931 +#: application/controllers/admin/printablesurvey.php:934 #: application/helpers/expressions/em_manager_helper.php:2966 -#: application/helpers/expressions/em_manager_helper.php:5503 -#: application/helpers/qanda_helper.php:1349 -#: application/helpers/qanda_helper.php:1675 -#: application/helpers/qanda_helper.php:2210 -#: application/helpers/qanda_helper.php:2571 +#: application/helpers/expressions/em_manager_helper.php:5505 +#: application/helpers/qanda_helper.php:1350 +#: application/helpers/qanda_helper.php:1676 +#: application/helpers/qanda_helper.php:2211 +#: application/helpers/qanda_helper.php:2572 msgid "Other:" msgstr "" -#: application/controllers/admin/printablesurvey.php:952 -#: application/controllers/admin/printablesurvey.php:967 +#: application/controllers/admin/printablesurvey.php:955 +#: application/controllers/admin/printablesurvey.php:970 msgid "Please write your answer(s) here:" msgstr "" -#: application/controllers/admin/printablesurvey.php:989 -#: application/controllers/admin/printablesurvey.php:991 -#: application/controllers/admin/printablesurvey.php:998 +#: application/controllers/admin/printablesurvey.php:992 +#: application/controllers/admin/printablesurvey.php:994 #: application/controllers/admin/printablesurvey.php:1001 -#: application/controllers/admin/printablesurvey.php:1011 +#: application/controllers/admin/printablesurvey.php:1004 #: application/controllers/admin/printablesurvey.php:1014 -#: application/controllers/admin/printablesurvey.php:1032 +#: application/controllers/admin/printablesurvey.php:1017 #: application/controllers/admin/printablesurvey.php:1035 +#: application/controllers/admin/printablesurvey.php:1038 msgid "Please write your answer here:" msgstr "" -#: application/controllers/admin/printablesurvey.php:1056 -#: application/controllers/admin/printablesurvey.php:1073 -#: application/controllers/admin/printablesurvey.php:1119 -#: application/controllers/admin/printablesurvey.php:1128 -#: application/controllers/admin/printablesurvey.php:1155 -#: application/controllers/admin/printablesurvey.php:1170 -#: application/controllers/admin/printablesurvey.php:1195 -#: application/controllers/admin/printablesurvey.php:1210 -#: application/controllers/admin/printablesurvey.php:1419 -#: application/controllers/admin/printablesurvey.php:1429 -#: application/controllers/admin/printablesurvey.php:1524 -#: application/controllers/admin/printablesurvey.php:1527 -#: application/controllers/admin/printablesurvey.php:1635 -#: application/controllers/admin/printablesurvey.php:1636 +#: application/controllers/admin/printablesurvey.php:1059 +#: application/controllers/admin/printablesurvey.php:1076 +#: application/controllers/admin/printablesurvey.php:1122 +#: application/controllers/admin/printablesurvey.php:1131 +#: application/controllers/admin/printablesurvey.php:1158 +#: application/controllers/admin/printablesurvey.php:1173 +#: application/controllers/admin/printablesurvey.php:1198 +#: application/controllers/admin/printablesurvey.php:1213 +#: application/controllers/admin/printablesurvey.php:1423 +#: application/controllers/admin/printablesurvey.php:1433 +#: application/controllers/admin/printablesurvey.php:1528 +#: application/controllers/admin/printablesurvey.php:1531 +#: application/controllers/admin/printablesurvey.php:1639 +#: application/controllers/admin/printablesurvey.php:1640 msgid "Please choose the appropriate response for each item:" msgstr "" -#: application/controllers/admin/printablesurvey.php:1694 +#: application/controllers/admin/printablesurvey.php:1698 msgid "There are {NUMBEROFQUESTIONS} questions in this survey" msgstr "" -#: application/controllers/admin/printablesurvey.php:1776 +#: application/controllers/admin/printablesurvey.php:1779 msgid "Please fax your completed survey to: %s" msgstr "" -#: application/controllers/admin/printablesurvey.php:1857 +#: application/controllers/admin/printablesurvey.php:1860 msgid "Please choose at least %s items." msgstr "" -#: application/controllers/admin/printablesurvey.php:1860 +#: application/controllers/admin/printablesurvey.php:1863 msgid "Please choose no more than %s items." msgstr "" @@ -2663,32 +2604,32 @@ msgstr "" msgid "Unknown file extension" msgstr "" -#: application/controllers/admin/question.php:200 -#: application/views/admin/survey/Question/editdefaultvalues_view.php:36 +#: application/controllers/admin/question.php:195 +#: application/views/admin/survey/Question/editdefaultvalues_view.php:37 msgid "" msgstr "" -#: application/controllers/admin/question.php:200 +#: application/controllers/admin/question.php:195 msgid "Checked" msgstr "" -#: application/controllers/admin/question.php:311 +#: application/controllers/admin/question.php:320 msgid "Some example answer option" msgstr "" -#: application/controllers/admin/question.php:473 +#: application/controllers/admin/question.php:482 msgid "Some example subquestion" msgstr "" -#: application/controllers/admin/question.php:858 +#: application/controllers/admin/question.php:867 msgid "Question could not be deleted. There are conditions for other questions that rely on this question. You cannot delete this question until those conditions are removed" msgstr "" -#: application/controllers/admin/question.php:885 +#: application/controllers/admin/question.php:894 msgid "Question was successfully deleted." msgstr "" -#: application/controllers/admin/question.php:891 +#: application/controllers/admin/question.php:900 msgid "You are not authorized to delete questions." msgstr "" @@ -2708,7 +2649,7 @@ msgstr "" #: application/views/admin/assessments_view.php:94 #: application/views/admin/emailtemplates/emailtemplates_view.php:15 #: application/views/admin/quotas/newquota_view.php:27 -#: application/views/admin/survey/Question/editQuestion_view.php:23 +#: application/views/admin/survey/Question/editQuestion_view.php:24 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:7 #: application/views/admin/token/email.php:18 #: application/views/admin/token/remind.php:18 @@ -2735,25 +2676,107 @@ msgstr "" msgid "Remaining" msgstr "" +#: application/controllers/admin/responses.php:69 +msgid "This survey has not been activated. There are no results to browse." +msgstr "" + +#: application/controllers/admin/responses.php:129 +#: application/controllers/admin/responses.php:464 +#: application/views/admin/participants/displayParticipants_view.php:86 +msgid "Token ID" +msgstr "" + +#: application/controllers/admin/responses.php:130 +#: application/controllers/admin/responses.php:465 +#: application/helpers/common_helper.php:5315 +#: application/helpers/replacements_helper.php:628 +#: application/views/admin/export/exportresults_view.php:119 +#: application/views/admin/participants/displayParticipants_view.php:63 +#: application/views/admin/participants/displayParticipants_view.php:154 +#: application/views/admin/participants/displayParticipants_view.php:173 +#: application/views/admin/participants/sharePanel_view.php:7 +#: application/views/admin/token/browse.php:75 +#: application/views/admin/token/browse.php:131 +#: application/views/admin/token/dummytokenform.php:13 +#: application/views/admin/token/tokenform.php:30 +msgid "First name" +msgstr "" + +#: application/controllers/admin/responses.php:131 +#: application/controllers/admin/responses.php:466 +#: application/helpers/common_helper.php:5316 +#: application/helpers/replacements_helper.php:635 +#: application/views/admin/export/exportresults_view.php:120 +#: application/views/admin/participants/displayParticipants_view.php:64 +#: application/views/admin/participants/displayParticipants_view.php:154 +#: application/views/admin/participants/displayParticipants_view.php:174 +#: application/views/admin/participants/sharePanel_view.php:8 +#: application/views/admin/token/browse.php:75 +#: application/views/admin/token/browse.php:132 +#: application/views/admin/token/dummytokenform.php:15 +#: application/views/admin/token/tokenform.php:35 +msgid "Last name" +msgstr "" + +#: application/controllers/admin/responses.php:132 +#: application/controllers/admin/responses.php:467 +#: application/controllers/admin/useraction.php:146 +#: application/views/admin/authentication/forgotpassword.php:9 +#: application/views/admin/participants/displayParticipants_view.php:62 +#: application/views/admin/participants/displayParticipants_view.php:154 +#: application/views/admin/participants/displayParticipants_view.php:175 +#: application/views/admin/token/dummytokenform.php:17 +#: application/views/admin/token/tokenform.php:40 +#: application/views/admin/user/editusers.php:8 +#: application/views/admin/user/modifyuser.php:5 +#: application/views/admin/usergroup/viewUserGroup_view.php:35 +msgid "Email" +msgstr "" + +#: application/controllers/admin/responses.php:134 +#: application/views/admin/export/statistics_view.php:96 +msgid "Submission date" +msgstr "" + +#: application/controllers/admin/responses.php:356 +msgid "Response ID %s was successfully deleted." +msgstr "" + +#: application/controllers/admin/responses.php:399 +msgid "%s response was successfully deleted." +msgid_plural "%s responses were successfully deleted." +msgstr[0] "" +msgstr[1] "" + +#: application/controllers/admin/responses.php:647 +#: application/helpers/common_helper.php:2819 +msgid "Total time" +msgstr "" + +#: application/controllers/admin/responses.php:649 +#: application/views/admin/assessments_view.php:65 +msgid "Group" +msgstr "" + #: application/controllers/admin/saved.php:57 #: application/controllers/admin/saved.php:58 msgid "Couldn't delete" msgstr "" -#: application/controllers/admin/statistics.php:238 -#: application/views/admin/export/statistics_view.php:16 +#: application/controllers/admin/statistics.php:239 +#: application/views/admin/export/statistics_view.php:26 msgid "You do not have the GD Library installed. Showing charts requires the GD library to function properly." msgstr "" -#: application/controllers/admin/statistics.php:239 -#: application/controllers/admin/statistics.php:244 -#: application/views/admin/export/statistics_view.php:17 -#: application/views/admin/export/statistics_view.php:21 +#: application/controllers/admin/statistics.php:240 +#: application/controllers/admin/statistics.php:245 +#: application/views/admin/export/statistics_view.php:27 +#: application/views/admin/export/statistics_view.php:31 msgid "visit http://us2.php.net/manual/en/ref.image.php for more information" msgstr "" -#: application/controllers/admin/statistics.php:243 -#: application/views/admin/export/statistics_view.php:20 +#: application/controllers/admin/statistics.php:244 +#: application/views/admin/export/statistics_view.php:30 msgid "You do not have the Freetype Library installed. Showing charts requires the Freetype library to function properly." msgstr "" @@ -2849,10 +2872,12 @@ msgid "This survey is currently not active." msgstr "" #: application/controllers/admin/surveyadmin.php:598 +#: application/views/admin/survey/listSurveys_view.php:36 msgid "Closed" msgstr "" #: application/controllers/admin/surveyadmin.php:602 +#: application/views/admin/survey/listSurveys_view.php:35 msgid "Open" msgstr "" @@ -2900,7 +2925,7 @@ msgstr "" #: application/controllers/admin/surveyadmin.php:1286 #: application/views/admin/labels/labelview_view.php:136 #: application/views/admin/labels/labelview_view.php:148 -#: application/views/admin/survey/Question/editQuestion_view.php:262 +#: application/views/admin/survey/Question/editQuestion_view.php:269 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:54 #: application/views/admin/survey/subview/tabImport_view.php:2 #: application/views/admin/survey/subview/tabResourceManagement_view.php:18 @@ -2981,10 +3006,10 @@ msgid "Delete" msgstr "" #: application/controllers/admin/surveypermission.php:109 -#: application/controllers/admin/tokens.php:395 -#: application/controllers/admin/tokens.php:2265 +#: application/controllers/admin/tokens.php:398 +#: application/controllers/admin/tokens.php:475 #: application/views/admin/assessments_view.php:32 -#: application/views/admin/browse/browseidheader_view.php:14 +#: application/views/admin/responses/browseidheader_view.php:14 #: application/views/admin/saved/savedlist_view.php:29 #: application/views/admin/user/editusers.php:24 #: application/views/admin/user/editusers.php:93 @@ -3100,7 +3125,7 @@ msgid "Export" msgstr "" #: application/controllers/admin/surveypermission.php:439 -#: application/helpers/replacements_helper.php:582 +#: application/helpers/replacements_helper.php:581 #: application/views/admin/user/setuserrights.php:119 msgid "Save Now" msgstr "" @@ -3143,12 +3168,12 @@ msgid "This file is not a valid ZIP file archive. Import failed." msgstr "" #: application/controllers/admin/templates.php:124 -#: application/core/Survey_Common_Action.php:963 +#: application/core/Survey_Common_Action.php:962 msgid "Copy failed" msgstr "" #: application/controllers/admin/templates.php:129 -#: application/core/Survey_Common_Action.php:970 +#: application/core/Survey_Common_Action.php:969 #: application/views/admin/participants/attributeMapCSV_view.php:18 #: application/views/admin/participants/displayParticipants_view.php:123 #: application/views/admin/participants/participantsPanel_view.php:5 @@ -3158,7 +3183,7 @@ msgid "OK" msgstr "" #: application/controllers/admin/templates.php:135 -#: application/core/Survey_Common_Action.php:979 +#: application/core/Survey_Common_Action.php:978 msgid "Forbidden Extension" msgstr "" @@ -3336,256 +3361,255 @@ msgstr "" msgid "The survey you selected does not exist" msgstr "" -#: application/controllers/admin/tokens.php:219 +#: application/controllers/admin/tokens.php:222 msgid "%s messages were scanned out of which %s were marked as bounce by the system." msgstr "" -#: application/controllers/admin/tokens.php:223 +#: application/controllers/admin/tokens.php:226 msgid "%s messages were scanned, none were marked as bounce by the system." msgstr "" -#: application/controllers/admin/tokens.php:228 +#: application/controllers/admin/tokens.php:231 msgid "Please check your settings" msgstr "" -#: application/controllers/admin/tokens.php:233 +#: application/controllers/admin/tokens.php:236 #: application/controllers/survey/index.php:83 #: application/controllers/survey/index.php:96 msgid "We are sorry but you don't have permissions to do this." msgstr "" -#: application/controllers/admin/tokens.php:387 -#: application/controllers/admin/tokens.php:2256 +#: application/controllers/admin/tokens.php:390 +#: application/controllers/admin/tokens.php:466 msgid "Do survey" msgstr "" -#: application/controllers/admin/tokens.php:391 -#: application/controllers/admin/tokens.php:2260 -#: application/views/admin/browse/browseallrow_view.php:4 -#: application/views/admin/browse/browsetimerow_view.php:4 +#: application/controllers/admin/tokens.php:394 +#: application/controllers/admin/tokens.php:470 +#: application/views/admin/responses/browseallrow_view.php:4 +#: application/views/admin/responses/browsetimerow_view.php:4 msgid "View response details" msgstr "" -#: application/controllers/admin/tokens.php:395 -#: application/controllers/admin/tokens.php:2265 +#: application/controllers/admin/tokens.php:398 +#: application/controllers/admin/tokens.php:475 msgid "Delete token entry" msgstr "" -#: application/controllers/admin/tokens.php:400 -#: application/controllers/admin/tokens.php:2269 -#: application/views/admin/token/actions.php:19 -#: application/views/admin/token/actions.php:20 -#: application/views/admin/token/browse.php:69 -msgid "Send invitation emails to the selected entries (if they have not yet been sent an invitation email)" +#: application/controllers/admin/tokens.php:404 +#: application/controllers/admin/tokens.php:481 +msgid "Send invitation email to this person (if they have not yet been sent an invitation email)" msgstr "" -#: application/controllers/admin/tokens.php:402 -#: application/controllers/admin/tokens.php:2271 -#: application/views/admin/token/actions.php:23 -#: application/views/admin/token/actions.php:24 -#: application/views/admin/token/browse.php:70 -msgid "Send reminder email to the selected entries (if they have already received the invitation email)" +#: application/controllers/admin/tokens.php:406 +#: application/controllers/admin/tokens.php:483 +msgid "Send reminder email to this person (if they have already received the invitation email)" msgstr "" -#: application/controllers/admin/tokens.php:404 -#: application/controllers/admin/tokens.php:2273 +#: application/controllers/admin/tokens.php:413 +#: application/controllers/admin/tokens.php:488 #: application/views/admin/token/tokenform.php:5 msgid "Edit token entry" msgstr "" -#: application/controllers/admin/tokens.php:469 -#: application/controllers/admin/tokens.php:500 -#: application/controllers/admin/tokens.php:606 -#: application/controllers/admin/tokens.php:711 +#: application/controllers/admin/tokens.php:415 +#: application/controllers/admin/tokens.php:490 +msgid "View this person in the central participants database" +msgstr "" + +#: application/controllers/admin/tokens.php:592 +#: application/controllers/admin/tokens.php:623 +#: application/controllers/admin/tokens.php:729 #: application/controllers/admin/tokens.php:834 +#: application/controllers/admin/tokens.php:957 msgid "%s cannot be empty" msgstr "" -#: application/controllers/admin/tokens.php:722 +#: application/controllers/admin/tokens.php:845 msgid "The token entry was successfully updated." msgstr "" -#: application/controllers/admin/tokens.php:723 -#: application/controllers/admin/tokens.php:889 -#: application/controllers/admin/tokens.php:900 +#: application/controllers/admin/tokens.php:846 +#: application/controllers/admin/tokens.php:1012 +#: application/controllers/admin/tokens.php:1023 #: application/views/admin/token/addtokenpost.php:7 #: application/views/admin/token/addtokenpost.php:14 #: application/views/admin/token/tokenbar.php:12 msgid "Display tokens" msgstr "" -#: application/controllers/admin/tokens.php:729 -#: application/controllers/admin/tokens.php:896 +#: application/controllers/admin/tokens.php:852 +#: application/controllers/admin/tokens.php:1019 #: application/views/admin/token/addtokenpost.php:12 #: application/views/admin/token/ldappost.php:5 msgid "Failed" msgstr "" -#: application/controllers/admin/tokens.php:730 +#: application/controllers/admin/tokens.php:853 #: application/views/admin/token/addtokenpost.php:13 msgid "There is already an entry with that exact token in the table. The same token cannot be used in multiple entries." msgstr "" -#: application/controllers/admin/tokens.php:731 +#: application/controllers/admin/tokens.php:854 msgid "Show this token entry" msgstr "" -#: application/controllers/admin/tokens.php:888 +#: application/controllers/admin/tokens.php:1011 msgid "New dummy tokens were added." msgstr "" -#: application/controllers/admin/tokens.php:897 +#: application/controllers/admin/tokens.php:1020 msgid "Only %s new dummy tokens were added after %s trials." msgstr "" -#: application/controllers/admin/tokens.php:898 +#: application/controllers/admin/tokens.php:1021 msgid "Try with a bigger token length." msgstr "" -#: application/controllers/admin/tokens.php:998 +#: application/controllers/admin/tokens.php:1121 msgid "%s field(s) were successfully added." msgstr "" -#: application/controllers/admin/tokens.php:999 -#: application/controllers/admin/tokens.php:1050 +#: application/controllers/admin/tokens.php:1122 +#: application/controllers/admin/tokens.php:1173 msgid "Back to attribute field management." msgstr "" -#: application/controllers/admin/tokens.php:1049 +#: application/controllers/admin/tokens.php:1172 msgid "Token attribute descriptions were successfully updated." msgstr "" -#: application/controllers/admin/tokens.php:1242 +#: application/controllers/admin/tokens.php:1365 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) delayed: Token is not yet valid." msgstr "" -#: application/controllers/admin/tokens.php:1246 +#: application/controllers/admin/tokens.php:1369 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) skipped: Token is not valid anymore." msgstr "" -#: application/controllers/admin/tokens.php:1256 +#: application/controllers/admin/tokens.php:1379 msgid "Invitation sent to:" msgstr "" -#: application/controllers/admin/tokens.php:1261 +#: application/controllers/admin/tokens.php:1384 msgid "Reminder sent to:" msgstr "" -#: application/controllers/admin/tokens.php:1279 +#: application/controllers/admin/tokens.php:1402 msgid "Email to {FIRSTNAME} {LASTNAME} ({EMAIL}) failed. Error Message:" msgstr "" -#: application/controllers/admin/tokens.php:1311 +#: application/controllers/admin/tokens.php:1434 msgid "There were no eligible emails to send. This will be because none satisfied the criteria of:" msgstr "" -#: application/controllers/admin/tokens.php:1312 +#: application/controllers/admin/tokens.php:1435 msgid "having a valid email address" msgstr "" -#: application/controllers/admin/tokens.php:1313 +#: application/controllers/admin/tokens.php:1436 msgid "not having been sent an invitation already" msgstr "" -#: application/controllers/admin/tokens.php:1314 +#: application/controllers/admin/tokens.php:1437 msgid "having already completed the survey" msgstr "" -#: application/controllers/admin/tokens.php:1315 +#: application/controllers/admin/tokens.php:1438 msgid "having a token" msgstr "" -#: application/controllers/admin/tokens.php:1397 +#: application/controllers/admin/tokens.php:1520 msgid "Uploading LDAP Query" msgstr "" -#: application/controllers/admin/tokens.php:1610 +#: application/controllers/admin/tokens.php:1733 msgid "Can't bind to the LDAP directory" msgstr "" -#: application/controllers/admin/tokens.php:1617 +#: application/controllers/admin/tokens.php:1740 msgid "Can't connect to the LDAP directory" msgstr "" -#: application/controllers/admin/tokens.php:1951 -#: application/controllers/admin/tokens.php:1978 +#: application/controllers/admin/tokens.php:2074 +#: application/controllers/admin/tokens.php:2101 msgid "Create tokens" msgstr "" -#: application/controllers/admin/tokens.php:1952 +#: application/controllers/admin/tokens.php:2075 msgid "Clicking 'Yes' will generate tokens for all those in this token list that have not been issued one. Continue?" msgstr "" -#: application/controllers/admin/tokens.php:1969 +#: application/controllers/admin/tokens.php:2092 msgid "Only %s token has been created." msgid_plural "Only %s tokens have been created." msgstr[0] "" msgstr[1] "" -#: application/controllers/admin/tokens.php:1970 +#: application/controllers/admin/tokens.php:2093 msgid "Need %s token." msgid_plural "Need %s tokens." msgstr[0] "" msgstr[1] "" -#: application/controllers/admin/tokens.php:1975 +#: application/controllers/admin/tokens.php:2098 msgid "%s token has been created." msgid_plural "%s tokens have been created." msgstr[0] "" msgstr[1] "" -#: application/controllers/admin/tokens.php:2011 -#: application/controllers/admin/tokens.php:2033 +#: application/controllers/admin/tokens.php:2134 +#: application/controllers/admin/tokens.php:2156 msgid "Delete Tokens Table" msgstr "" -#: application/controllers/admin/tokens.php:2012 +#: application/controllers/admin/tokens.php:2135 msgid "If you delete this table tokens will no longer be required to access this survey." msgstr "" -#: application/controllers/admin/tokens.php:2012 +#: application/controllers/admin/tokens.php:2135 msgid "A backup of this table will be made if you proceed. Your system administrator will be able to access this table." msgstr "" -#: application/controllers/admin/tokens.php:2015 +#: application/controllers/admin/tokens.php:2138 msgid "Delete Tokens" msgstr "" -#: application/controllers/admin/tokens.php:2034 +#: application/controllers/admin/tokens.php:2157 msgid "The tokens table has now been removed and tokens are no longer required to access this survey." msgstr "" -#: application/controllers/admin/tokens.php:2034 +#: application/controllers/admin/tokens.php:2157 msgid "A backup of this table has been made and can be accessed by your system administrator." msgstr "" -#: application/controllers/admin/tokens.php:2079 +#: application/controllers/admin/tokens.php:2202 #: application/views/admin/globalSettings_view.php:10 #: application/views/admin/token/bounce.php:1 #: application/views/admin/token/tokenbar.php:78 msgid "Bounce settings" msgstr "" -#: application/controllers/admin/tokens.php:2080 +#: application/controllers/admin/tokens.php:2203 msgid "Bounce settings have been saved." msgstr "" -#: application/controllers/admin/tokens.php:2153 +#: application/controllers/admin/tokens.php:2276 #: application/views/admin/export/exportresults_view.php:115 #: application/views/admin/token/tokenbar.php:3 #: application/views/admin/token/tokenwarning.php:3 msgid "Token control" msgstr "" -#: application/controllers/admin/tokens.php:2154 +#: application/controllers/admin/tokens.php:2277 msgid "A token table has been created for this survey." msgstr "" -#: application/controllers/admin/tokens.php:2188 +#: application/controllers/admin/tokens.php:2311 msgid "Import old tokens" msgstr "" -#: application/controllers/admin/tokens.php:2189 +#: application/controllers/admin/tokens.php:2312 msgid "A token table has been created for this survey and the old tokens were imported." msgstr "" @@ -3595,11 +3619,11 @@ msgid "Translate survey" msgstr "" #: application/controllers/admin/translate.php:260 -#: application/views/admin/browse/browsemenubar_view.php:8 #: application/views/admin/conditions/conditionshead_view.php:8 #: application/views/admin/dataentry/insert.php:81 #: application/views/admin/dataentry/vvimport.php:50 #: application/views/admin/labels/labelsetsbar_view.php:8 +#: application/views/admin/responses/browsemenubar_view.php:8 #: application/views/admin/saved/savedbar_view.php:9 #: application/views/admin/saved/savedbar_view.php:10 #: application/views/admin/templates/templateeditorbar_view.php:55 @@ -3608,17 +3632,17 @@ msgid "Return to survey administration" msgstr "" #: application/controllers/admin/translate.php:306 -#: application/core/Survey_Common_Action.php:542 +#: application/core/Survey_Common_Action.php:541 msgid "Test this survey" msgstr "" #: application/controllers/admin/translate.php:306 -#: application/core/Survey_Common_Action.php:546 +#: application/core/Survey_Common_Action.php:545 msgid "Execute this survey" msgstr "" #: application/controllers/admin/translate.php:341 -#: application/views/admin/browse/browsemenubar_view.php:26 +#: application/views/admin/responses/browsemenubar_view.php:26 #: application/views/admin/survey/Question/questionbar_view.php:2 msgid "Please select a language:" msgstr "" @@ -3632,15 +3656,15 @@ msgstr "" #: application/helpers/common_helper.php:621 #: application/helpers/common_helper.php:1274 #: application/helpers/common_helper.php:1344 -#: application/helpers/common_helper.php:6964 -#: application/helpers/common_helper.php:7001 -#: application/helpers/common_helper.php:7397 -#: application/helpers/common_helper.php:7440 -#: application/helpers/qanda_helper.php:1312 -#: application/helpers/qanda_helper.php:1492 -#: application/helpers/qanda_helper.php:2103 -#: application/helpers/qanda_helper.php:6509 -#: application/helpers/qanda_helper.php:6563 +#: application/helpers/common_helper.php:6971 +#: application/helpers/common_helper.php:7008 +#: application/helpers/common_helper.php:7404 +#: application/helpers/common_helper.php:7447 +#: application/helpers/qanda_helper.php:1313 +#: application/helpers/qanda_helper.php:1493 +#: application/helpers/qanda_helper.php:2104 +#: application/helpers/qanda_helper.php:6510 +#: application/helpers/qanda_helper.php:6564 #: application/views/admin/dataentry/content_view.php:84 #: application/views/admin/dataentry/content_view.php:94 #: application/views/admin/labels/labelsetsbar_view.php:22 @@ -3652,7 +3676,7 @@ msgid "Survey title and description" msgstr "" #: application/controllers/admin/translate.php:464 -#: application/helpers/expressions/em_manager_helper.php:8047 +#: application/helpers/expressions/em_manager_helper.php:8049 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:33 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:35 #: application/views/admin/survey/QuestionGroups/editGroup_view.php:19 @@ -3673,7 +3697,7 @@ msgid "Welcome and end text" msgstr "" #: application/controllers/admin/translate.php:494 -#: application/helpers/expressions/em_manager_helper.php:8061 +#: application/helpers/expressions/em_manager_helper.php:8063 #: application/views/admin/survey/editLocalSettings_view.php:13 #: application/views/admin/survey/editLocalSettings_view.php:15 #: application/views/admin/survey/subview/tabGeneralNewSurvey_view.php:29 @@ -3986,25 +4010,25 @@ msgstr "" #: application/controllers/survey/index.php:440 #: application/controllers/survey/index.php:444 -#: application/helpers/replacements_helper.php:442 -#: application/helpers/replacements_helper.php:454 +#: application/helpers/replacements_helper.php:441 +#: application/helpers/replacements_helper.php:453 msgid "Load unfinished survey" msgstr "" #: application/controllers/survey/index.php:484 -#: application/helpers/frontend_helper.php:1488 -#: application/helpers/frontend_helper.php:1562 -#: application/helpers/frontend_helper.php:1607 -#: application/helpers/frontend_helper.php:1646 +#: application/helpers/frontend_helper.php:1486 +#: application/helpers/frontend_helper.php:1560 +#: application/helpers/frontend_helper.php:1605 +#: application/helpers/frontend_helper.php:1644 #: application/views/entertoken_view.php:8 msgid "This is a controlled survey. You need a valid token to participate." msgstr "" #: application/controllers/survey/index.php:485 #: application/controllers/survey/index.php:516 -#: application/helpers/frontend_helper.php:1564 -#: application/helpers/frontend_helper.php:1609 -#: application/helpers/frontend_helper.php:1800 +#: application/helpers/frontend_helper.php:1562 +#: application/helpers/frontend_helper.php:1607 +#: application/helpers/frontend_helper.php:1798 msgid "For further information please contact %s" msgstr "" @@ -4016,113 +4040,113 @@ msgstr "" msgid "Your token seems to be valid but can be used only during a certain time period." msgstr "" -#: application/controllers/survey/index.php:678 +#: application/controllers/survey/index.php:680 msgid "Your responses were successfully saved." msgstr "" -#: application/core/Survey_Common_Action.php:619 +#: application/core/Survey_Common_Action.php:618 #: application/helpers/common_helper.php:428 #: application/helpers/common_helper.php:431 #: application/helpers/common_helper.php:625 #: application/helpers/common_helper.php:1275 #: application/helpers/common_helper.php:1345 -#: application/helpers/common_helper.php:3887 -#: application/helpers/common_helper.php:7398 -#: application/helpers/common_helper.php:7441 +#: application/helpers/common_helper.php:3891 +#: application/helpers/common_helper.php:7405 +#: application/helpers/common_helper.php:7448 #: application/views/admin/token/bounce.php:14 #: application/views/admin/token/bounce.php:57 msgid "None" msgstr "" -#: application/core/Survey_Common_Action.php:671 +#: application/core/Survey_Common_Action.php:670 #: application/views/admin/survey/subview/tabTokens_view.php:24 msgid "Responses to this survey are anonymized." msgstr "" -#: application/core/Survey_Common_Action.php:675 +#: application/core/Survey_Common_Action.php:674 #: application/views/admin/survey/subview/tabTokens_view.php:22 msgid "Responses to this survey are NOT anonymized." msgstr "" -#: application/core/Survey_Common_Action.php:679 +#: application/core/Survey_Common_Action.php:678 msgid "It is presented question by question." msgstr "" -#: application/core/Survey_Common_Action.php:683 +#: application/core/Survey_Common_Action.php:682 msgid "It is presented group by group." msgstr "" -#: application/core/Survey_Common_Action.php:687 +#: application/core/Survey_Common_Action.php:686 msgid "It is presented on one single page." msgstr "" -#: application/core/Survey_Common_Action.php:693 +#: application/core/Survey_Common_Action.php:692 msgid "No question index will be shown with this format." msgstr "" -#: application/core/Survey_Common_Action.php:697 +#: application/core/Survey_Common_Action.php:696 msgid "A question index will be shown; participants will be able to jump between viewed questions." msgstr "" -#: application/core/Survey_Common_Action.php:702 +#: application/core/Survey_Common_Action.php:701 #: application/views/admin/survey/subview/tabNotification_view.php:22 msgid "Responses will be date stamped." msgstr "" -#: application/core/Survey_Common_Action.php:706 +#: application/core/Survey_Common_Action.php:705 msgid "IP Addresses will be logged" msgstr "" -#: application/core/Survey_Common_Action.php:710 +#: application/core/Survey_Common_Action.php:709 msgid "Referrer URL will be saved." msgstr "" -#: application/core/Survey_Common_Action.php:714 +#: application/core/Survey_Common_Action.php:713 msgid "It uses cookies for access control." msgstr "" -#: application/core/Survey_Common_Action.php:718 +#: application/core/Survey_Common_Action.php:717 msgid "If tokens are used, the public may register for this survey" msgstr "" -#: application/core/Survey_Common_Action.php:722 +#: application/core/Survey_Common_Action.php:721 msgid "Participants can save partially finished surveys" msgstr "" -#: application/core/Survey_Common_Action.php:726 +#: application/core/Survey_Common_Action.php:725 msgid "Basic email notification is sent to:" msgstr "" -#: application/core/Survey_Common_Action.php:730 +#: application/core/Survey_Common_Action.php:729 msgid "Detailed email notification with response data is sent to:" msgstr "" -#: application/core/Survey_Common_Action.php:735 +#: application/core/Survey_Common_Action.php:734 msgid "Regenerate question codes:" msgstr "" -#: application/core/Survey_Common_Action.php:737 -#: application/core/Survey_Common_Action.php:740 +#: application/core/Survey_Common_Action.php:736 +#: application/core/Survey_Common_Action.php:739 msgid "Are you sure you want regenerate the question codes?" msgstr "" -#: application/core/Survey_Common_Action.php:738 +#: application/core/Survey_Common_Action.php:737 msgid "Straight" msgstr "" -#: application/core/Survey_Common_Action.php:741 +#: application/core/Survey_Common_Action.php:740 msgid "By Group" msgstr "" -#: application/core/Survey_Common_Action.php:839 +#: application/core/Survey_Common_Action.php:838 msgid "Survey cannot be activated yet." msgstr "" -#: application/core/Survey_Common_Action.php:842 +#: application/core/Survey_Common_Action.php:841 msgid "You need to add question groups" msgstr "" -#: application/core/Survey_Common_Action.php:846 +#: application/core/Survey_Common_Action.php:845 msgid "You need to add questions" msgstr "" @@ -4135,7 +4159,7 @@ msgid "Save your responses so far" msgstr "" #: application/helpers/SurveyRuntimeHelper.php:374 -#: application/helpers/frontend_helper.php:1333 +#: application/helpers/frontend_helper.php:1331 msgid "Did Not Save" msgstr "" @@ -4166,52 +4190,52 @@ msgstr "" msgid "View the statistics for this survey." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:531 +#: application/helpers/SurveyRuntimeHelper.php:533 msgid "Sorry. There is no matching survey." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:548 +#: application/helpers/SurveyRuntimeHelper.php:550 msgid "Invalid group number for this survey: " msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:554 +#: application/helpers/SurveyRuntimeHelper.php:556 msgid "This group contains no questions. You must add questions to this group before you can preview it" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:572 +#: application/helpers/SurveyRuntimeHelper.php:574 msgid "Submit your answers" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:573 +#: application/helpers/SurveyRuntimeHelper.php:575 msgid "There are no more questions. Please press the button to finish this survey." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:888 +#: application/helpers/SurveyRuntimeHelper.php:890 #: application/helpers/qanda_helper.php:494 msgid "One or more mandatory questions have not been answered. You cannot proceed until these have been completed." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:894 +#: application/helpers/SurveyRuntimeHelper.php:896 #: application/helpers/qanda_helper.php:524 msgid "One or more questions have not been answered in a valid manner. You cannot proceed until these answers are valid." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:900 +#: application/helpers/SurveyRuntimeHelper.php:902 msgid "One or more uploaded files are not in proper format/size. You cannot proceed until these files are valid." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1038 -#: application/helpers/frontend_helper.php:2761 +#: application/helpers/SurveyRuntimeHelper.php:1040 +#: application/helpers/frontend_helper.php:2759 msgid "This survey is currently not active. You will not be able to save your responses." msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1046 +#: application/helpers/SurveyRuntimeHelper.php:1048 msgid "Question index" msgstr "" -#: application/helpers/SurveyRuntimeHelper.php:1114 -#: application/helpers/frontend_helper.php:2232 -#: application/helpers/replacements_helper.php:385 +#: application/helpers/SurveyRuntimeHelper.php:1116 +#: application/helpers/frontend_helper.php:2230 +#: application/helpers/replacements_helper.php:384 #: application/views/admin/dataentry/active_html_view.php:67 #: application/views/admin/dataentry/includes/editdata/editdata.php:57 #: application/views/admin/dataentry/insert.php:41 @@ -4379,241 +4403,202 @@ msgstr "" msgid "Can't update labels because you are using duplicated codes" msgstr "" -#: application/helpers/admin/statistics_helper.php:163 -#: application/helpers/admin/statistics_helper.php:2046 -#: application/helpers/admin/statistics_helper.php:2266 +#: application/helpers/admin/statistics_helper.php:161 +#: application/helpers/admin/statistics_helper.php:1702 +#: application/helpers/admin/statistics_helper.php:1944 msgid "Comments" msgstr "" -#: application/helpers/admin/statistics_helper.php:427 -msgid "Page" -msgstr "" - -#: application/helpers/admin/statistics_helper.php:449 -#: application/helpers/admin/statistics_helper.php:771 -#: application/helpers/admin/statistics_helper.php:3411 -#: application/helpers/admin/statistics_helper.php:3412 -#: application/helpers/admin/statistics_helper.php:3415 -#: application/views/admin/participants/displayParticipants_view.php:281 -#: application/views/admin/survey/listSurveys_view.php:11 -#: application/views/admin/survey/surveybar_view.php:3 -msgid "Survey" -msgstr "" - -#: application/helpers/admin/statistics_helper.php:743 -#: application/helpers/admin/statistics_helper.php:762 -#: application/helpers/admin/statistics_helper.php:781 -msgid "Number of records in this query:" -msgstr "" - -#: application/helpers/admin/statistics_helper.php:746 -#: application/helpers/admin/statistics_helper.php:763 -#: application/helpers/admin/statistics_helper.php:783 -msgid "Total records in survey:" -msgstr "" - -#: application/helpers/admin/statistics_helper.php:752 -#: application/helpers/admin/statistics_helper.php:766 -#: application/helpers/admin/statistics_helper.php:790 -msgid "Percentage of total:" -msgstr "" - -#: application/helpers/admin/statistics_helper.php:770 -#: application/helpers/admin/statistics_helper.php:771 -#: application/helpers/admin/statistics_helper.php:780 -msgid "Results" -msgstr "" - -#: application/helpers/admin/statistics_helper.php:817 -#: application/helpers/admin/statistics_helper.php:2274 -#: application/helpers/admin/statistics_helper.php:2295 -msgid "Browse" -msgstr "" - -#: application/helpers/admin/statistics_helper.php:1021 +#: application/helpers/admin/statistics_helper.php:681 #: application/helpers/common_helper.php:168 msgid "Ranking" msgstr "" -#: application/helpers/admin/statistics_helper.php:1080 +#: application/helpers/admin/statistics_helper.php:740 msgid "Total number of files" msgstr "" -#: application/helpers/admin/statistics_helper.php:1081 +#: application/helpers/admin/statistics_helper.php:741 msgid "Average no. of files per respondent" msgstr "" -#: application/helpers/admin/statistics_helper.php:1105 +#: application/helpers/admin/statistics_helper.php:765 msgid "Total size of files" msgstr "" -#: application/helpers/admin/statistics_helper.php:1106 +#: application/helpers/admin/statistics_helper.php:766 msgid "Average file size" msgstr "" -#: application/helpers/admin/statistics_helper.php:1107 +#: application/helpers/admin/statistics_helper.php:767 msgid "Average size per respondent" msgstr "" -#: application/helpers/admin/statistics_helper.php:1131 -#: application/helpers/admin/statistics_helper.php:1153 -#: application/helpers/admin/statistics_helper.php:1163 -#: application/helpers/admin/statistics_helper.php:1262 -#: application/helpers/admin/statistics_helper.php:1284 -#: application/helpers/admin/statistics_helper.php:1293 -#: application/helpers/admin/statistics_helper.php:2073 -#: application/helpers/admin/statistics_helper.php:2091 -#: application/helpers/admin/statistics_helper.php:2107 +#: application/helpers/admin/statistics_helper.php:791 +#: application/helpers/admin/statistics_helper.php:812 +#: application/helpers/admin/statistics_helper.php:822 +#: application/helpers/admin/statistics_helper.php:921 +#: application/helpers/admin/statistics_helper.php:943 +#: application/helpers/admin/statistics_helper.php:952 +#: application/helpers/admin/statistics_helper.php:1752 +#: application/helpers/admin/statistics_helper.php:1770 +#: application/helpers/admin/statistics_helper.php:1786 msgid "Field summary for %s" msgstr "" -#: application/helpers/admin/statistics_helper.php:1141 -#: application/helpers/admin/statistics_helper.php:1143 -#: application/helpers/admin/statistics_helper.php:1156 -#: application/helpers/admin/statistics_helper.php:1167 -#: application/helpers/admin/statistics_helper.php:1272 -#: application/helpers/admin/statistics_helper.php:1274 -#: application/helpers/admin/statistics_helper.php:1287 -#: application/helpers/admin/statistics_helper.php:1297 +#: application/helpers/admin/statistics_helper.php:801 +#: application/helpers/admin/statistics_helper.php:803 +#: application/helpers/admin/statistics_helper.php:815 +#: application/helpers/admin/statistics_helper.php:826 +#: application/helpers/admin/statistics_helper.php:931 +#: application/helpers/admin/statistics_helper.php:933 +#: application/helpers/admin/statistics_helper.php:946 +#: application/helpers/admin/statistics_helper.php:956 msgid "Calculation" msgstr "" -#: application/helpers/admin/statistics_helper.php:1141 -#: application/helpers/admin/statistics_helper.php:1144 -#: application/helpers/admin/statistics_helper.php:1156 -#: application/helpers/admin/statistics_helper.php:1169 -#: application/helpers/admin/statistics_helper.php:1272 -#: application/helpers/admin/statistics_helper.php:1275 -#: application/helpers/admin/statistics_helper.php:1287 -#: application/helpers/admin/statistics_helper.php:1299 +#: application/helpers/admin/statistics_helper.php:801 +#: application/helpers/admin/statistics_helper.php:804 +#: application/helpers/admin/statistics_helper.php:815 +#: application/helpers/admin/statistics_helper.php:828 +#: application/helpers/admin/statistics_helper.php:931 +#: application/helpers/admin/statistics_helper.php:934 +#: application/helpers/admin/statistics_helper.php:946 +#: application/helpers/admin/statistics_helper.php:958 msgid "Result" msgstr "" -#: application/helpers/admin/statistics_helper.php:1378 -#: application/helpers/admin/statistics_helper.php:2324 -#: application/helpers/admin/statistics_helper.php:2330 -#: application/helpers/admin/statistics_helper.php:2336 -#: application/helpers/admin/statistics_helper.php:2347 -#: application/helpers/admin/statistics_helper.php:3042 -#: application/helpers/admin/statistics_helper.php:3046 -#: application/helpers/admin/statistics_helper.php:3058 -#: application/helpers/admin/statistics_helper.php:3064 +#: application/helpers/admin/statistics_helper.php:1036 +#: application/helpers/admin/statistics_helper.php:2002 +#: application/helpers/admin/statistics_helper.php:2008 +#: application/helpers/admin/statistics_helper.php:2014 +#: application/helpers/admin/statistics_helper.php:2025 +#: application/helpers/admin/statistics_helper.php:2728 +#: application/helpers/admin/statistics_helper.php:2732 +#: application/helpers/admin/statistics_helper.php:2744 +#: application/helpers/admin/statistics_helper.php:2750 msgid "Sum" msgstr "" -#: application/helpers/admin/statistics_helper.php:1379 -#: application/helpers/admin/statistics_helper.php:3219 -#: application/helpers/admin/statistics_helper.php:3226 -#: application/helpers/admin/statistics_helper.php:3233 -#: application/helpers/admin/statistics_helper.php:3240 +#: application/helpers/admin/statistics_helper.php:1037 +#: application/helpers/admin/statistics_helper.php:2909 +#: application/helpers/admin/statistics_helper.php:2916 +#: application/helpers/admin/statistics_helper.php:2923 +#: application/helpers/admin/statistics_helper.php:2930 msgid "Standard deviation" msgstr "" -#: application/helpers/admin/statistics_helper.php:1380 +#: application/helpers/admin/statistics_helper.php:1038 msgid "Average" msgstr "" -#: application/helpers/admin/statistics_helper.php:1426 -#: application/helpers/admin/statistics_helper.php:2288 -#: application/helpers/admin/statistics_helper.php:2305 -#: application/helpers/admin/statistics_helper.php:2324 -#: application/helpers/admin/statistics_helper.php:2328 -#: application/helpers/admin/statistics_helper.php:2336 -#: application/helpers/admin/statistics_helper.php:2343 -#: application/helpers/admin/statistics_helper.php:2366 -#: application/helpers/admin/statistics_helper.php:2370 -#: application/helpers/admin/statistics_helper.php:2378 -#: application/helpers/admin/statistics_helper.php:2385 -#: application/helpers/admin/statistics_helper.php:2473 -#: application/helpers/admin/statistics_helper.php:2477 -#: application/helpers/admin/statistics_helper.php:2484 -#: application/helpers/admin/statistics_helper.php:2491 +#: application/helpers/admin/statistics_helper.php:1084 +#: application/helpers/admin/statistics_helper.php:1967 +#: application/helpers/admin/statistics_helper.php:1983 +#: application/helpers/admin/statistics_helper.php:2002 +#: application/helpers/admin/statistics_helper.php:2006 +#: application/helpers/admin/statistics_helper.php:2014 +#: application/helpers/admin/statistics_helper.php:2021 +#: application/helpers/admin/statistics_helper.php:2042 +#: application/helpers/admin/statistics_helper.php:2046 +#: application/helpers/admin/statistics_helper.php:2054 +#: application/helpers/admin/statistics_helper.php:2061 +#: application/helpers/admin/statistics_helper.php:2148 +#: application/helpers/admin/statistics_helper.php:2152 +#: application/helpers/admin/statistics_helper.php:2159 +#: application/helpers/admin/statistics_helper.php:2166 msgid "Count" msgstr "" -#: application/helpers/admin/statistics_helper.php:1463 -#: application/helpers/admin/statistics_helper.php:1473 +#: application/helpers/admin/statistics_helper.php:1121 +#: application/helpers/admin/statistics_helper.php:1131 msgid "1st quartile (Q1)" msgstr "" -#: application/helpers/admin/statistics_helper.php:1494 +#: application/helpers/admin/statistics_helper.php:1152 msgid "2nd quartile (Median)" msgstr "" -#: application/helpers/admin/statistics_helper.php:1505 +#: application/helpers/admin/statistics_helper.php:1163 msgid "Median value" msgstr "" -#: application/helpers/admin/statistics_helper.php:1535 -#: application/helpers/admin/statistics_helper.php:1545 +#: application/helpers/admin/statistics_helper.php:1193 +#: application/helpers/admin/statistics_helper.php:1202 msgid "3rd quartile (Q3)" msgstr "" -#: application/helpers/admin/statistics_helper.php:1592 -#: application/helpers/admin/statistics_helper.php:1596 -#: application/helpers/admin/statistics_helper.php:1602 -#: application/helpers/admin/statistics_helper.php:1618 +#: application/helpers/admin/statistics_helper.php:1249 +#: application/helpers/admin/statistics_helper.php:1253 +#: application/helpers/admin/statistics_helper.php:1259 +#: application/helpers/admin/statistics_helper.php:1275 msgid "Null values are ignored in calculations" msgstr "" -#: application/helpers/admin/statistics_helper.php:1594 -#: application/helpers/admin/statistics_helper.php:1597 -#: application/helpers/admin/statistics_helper.php:1603 -#: application/helpers/admin/statistics_helper.php:1619 +#: application/helpers/admin/statistics_helper.php:1251 +#: application/helpers/admin/statistics_helper.php:1254 +#: application/helpers/admin/statistics_helper.php:1260 +#: application/helpers/admin/statistics_helper.php:1276 msgid "Q1 and Q3 calculated using %s" msgstr "" -#: application/helpers/admin/statistics_helper.php:1594 -#: application/helpers/admin/statistics_helper.php:1597 -#: application/helpers/admin/statistics_helper.php:1603 -#: application/helpers/admin/statistics_helper.php:1619 +#: application/helpers/admin/statistics_helper.php:1251 +#: application/helpers/admin/statistics_helper.php:1254 +#: application/helpers/admin/statistics_helper.php:1260 +#: application/helpers/admin/statistics_helper.php:1276 msgid "minitab method" msgstr "" -#: application/helpers/admin/statistics_helper.php:1644 -#: application/helpers/admin/statistics_helper.php:1647 -#: application/helpers/admin/statistics_helper.php:1655 -#: application/helpers/admin/statistics_helper.php:1667 +#: application/helpers/admin/statistics_helper.php:1301 +#: application/helpers/admin/statistics_helper.php:1304 +#: application/helpers/admin/statistics_helper.php:1312 +#: application/helpers/admin/statistics_helper.php:1324 msgid "Not enough values for calculation" msgstr "" -#: application/helpers/admin/statistics_helper.php:1982 -#: application/helpers/admin/statistics_helper.php:2004 +#: application/helpers/admin/statistics_helper.php:1638 +#: application/helpers/admin/statistics_helper.php:1660 #: application/views/admin/dataentry/content_view.php:75 msgid "Label %s" msgstr "" -#: application/helpers/admin/statistics_helper.php:2288 -#: application/helpers/admin/statistics_helper.php:2307 -#: application/helpers/admin/statistics_helper.php:2324 -#: application/helpers/admin/statistics_helper.php:2329 -#: application/helpers/admin/statistics_helper.php:2336 -#: application/helpers/admin/statistics_helper.php:2345 -#: application/helpers/admin/statistics_helper.php:2366 -#: application/helpers/admin/statistics_helper.php:2371 -#: application/helpers/admin/statistics_helper.php:2378 -#: application/helpers/admin/statistics_helper.php:2387 -#: application/helpers/admin/statistics_helper.php:2473 -#: application/helpers/admin/statistics_helper.php:2478 -#: application/helpers/admin/statistics_helper.php:2484 -#: application/helpers/admin/statistics_helper.php:2493 +#: application/helpers/admin/statistics_helper.php:1953 +#: application/helpers/admin/statistics_helper.php:1974 +#: application/helpers/admin/statistics_helper.php:3397 +msgid "Browse" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:1967 +#: application/helpers/admin/statistics_helper.php:1985 +#: application/helpers/admin/statistics_helper.php:2002 +#: application/helpers/admin/statistics_helper.php:2007 +#: application/helpers/admin/statistics_helper.php:2014 +#: application/helpers/admin/statistics_helper.php:2023 +#: application/helpers/admin/statistics_helper.php:2042 +#: application/helpers/admin/statistics_helper.php:2047 +#: application/helpers/admin/statistics_helper.php:2054 +#: application/helpers/admin/statistics_helper.php:2063 +#: application/helpers/admin/statistics_helper.php:2148 +#: application/helpers/admin/statistics_helper.php:2153 +#: application/helpers/admin/statistics_helper.php:2159 +#: application/helpers/admin/statistics_helper.php:2168 msgid "Percentage" msgstr "" -#: application/helpers/admin/statistics_helper.php:2605 -#: application/helpers/admin/statistics_helper.php:2637 +#: application/helpers/admin/statistics_helper.php:2280 +#: application/helpers/admin/statistics_helper.php:2312 msgid "Not completed or Not displayed" msgstr "" -#: application/helpers/admin/statistics_helper.php:2609 -#: application/helpers/admin/statistics_helper.php:2641 +#: application/helpers/admin/statistics_helper.php:2284 +#: application/helpers/admin/statistics_helper.php:2316 msgid "Not displayed" msgstr "" -#: application/helpers/admin/statistics_helper.php:3042 -#: application/helpers/admin/statistics_helper.php:3046 -#: application/helpers/admin/statistics_helper.php:3058 -#: application/helpers/admin/statistics_helper.php:3064 +#: application/helpers/admin/statistics_helper.php:2728 +#: application/helpers/admin/statistics_helper.php:2732 +#: application/helpers/admin/statistics_helper.php:2744 +#: application/helpers/admin/statistics_helper.php:2750 #: application/views/admin/quotas/viewquotasrow_view.php:48 #: application/views/admin/survey/Question/import_view.php:11 #: application/views/admin/survey/QuestionGroups/import_view.php:12 @@ -4622,20 +4607,59 @@ msgstr "" msgid "Answers" msgstr "" -#: application/helpers/admin/statistics_helper.php:3043 -#: application/helpers/admin/statistics_helper.php:3051 -#: application/helpers/admin/statistics_helper.php:3059 -#: application/helpers/admin/statistics_helper.php:3070 +#: application/helpers/admin/statistics_helper.php:2729 +#: application/helpers/admin/statistics_helper.php:2737 +#: application/helpers/admin/statistics_helper.php:2745 +#: application/helpers/admin/statistics_helper.php:2756 msgid "Number of cases" msgstr "" -#: application/helpers/admin/statistics_helper.php:3218 -#: application/helpers/admin/statistics_helper.php:3222 -#: application/helpers/admin/statistics_helper.php:3232 -#: application/helpers/admin/statistics_helper.php:3238 +#: application/helpers/admin/statistics_helper.php:2908 +#: application/helpers/admin/statistics_helper.php:2912 +#: application/helpers/admin/statistics_helper.php:2922 +#: application/helpers/admin/statistics_helper.php:2928 msgid "Arithmetic mean" msgstr "" +#: application/helpers/admin/statistics_helper.php:3205 +msgid "Page" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:3227 +#: application/helpers/admin/statistics_helper.php:3349 +#: application/helpers/admin/statistics_helper.php:3469 +#: application/helpers/admin/statistics_helper.php:3470 +#: application/helpers/admin/statistics_helper.php:3473 +#: application/views/admin/participants/displayParticipants_view.php:281 +#: application/views/admin/survey/listSurveys_view.php:11 +#: application/views/admin/survey/surveybar_view.php:3 +msgid "Survey" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:3321 +#: application/helpers/admin/statistics_helper.php:3340 +#: application/helpers/admin/statistics_helper.php:3359 +msgid "Number of records in this query:" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:3324 +#: application/helpers/admin/statistics_helper.php:3341 +#: application/helpers/admin/statistics_helper.php:3361 +msgid "Total records in survey:" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:3330 +#: application/helpers/admin/statistics_helper.php:3344 +#: application/helpers/admin/statistics_helper.php:3368 +msgid "Percentage of total:" +msgstr "" + +#: application/helpers/admin/statistics_helper.php:3348 +#: application/helpers/admin/statistics_helper.php:3349 +#: application/helpers/admin/statistics_helper.php:3358 +msgid "Results" +msgstr "" + #: application/helpers/common_helper.php:52 msgid "Arrays" msgstr "" @@ -4770,14 +4794,17 @@ msgstr "" #: application/helpers/common_helper.php:408 #: application/views/admin/quotas/viewquotasrow_view.php:10 +#: application/views/admin/survey/listSurveys_view.php:31 msgid "Active" msgstr "" #: application/helpers/common_helper.php:413 +#: application/views/admin/survey/listSurveys_view.php:29 msgid "Expired" msgstr "" #: application/helpers/common_helper.php:418 +#: application/views/admin/survey/listSurveys_view.php:30 msgid "Inactive" msgstr "" @@ -4950,25 +4977,25 @@ msgstr "" msgid "File count" msgstr "" -#: application/helpers/common_helper.php:2189 -#: application/views/admin/export/statistics_view.php:67 +#: application/helpers/common_helper.php:2193 +#: application/views/admin/export/statistics_view.php:77 msgid "Response ID" msgstr "" -#: application/helpers/common_helper.php:2197 +#: application/helpers/common_helper.php:2201 msgid "Date submitted" msgstr "" -#: application/helpers/common_helper.php:2205 +#: application/helpers/common_helper.php:2209 msgid "Last page" msgstr "" -#: application/helpers/common_helper.php:2213 +#: application/helpers/common_helper.php:2217 msgid "Start language" msgstr "" -#: application/helpers/common_helper.php:2232 -#: application/helpers/frontend_helper.php:1666 +#: application/helpers/common_helper.php:2236 +#: application/helpers/frontend_helper.php:1664 #: application/views/admin/dataentry/caption_view.php:29 #: application/views/admin/export/exportresults_view.php:122 #: application/views/admin/participants/attributeMap_view.php:95 @@ -4979,415 +5006,416 @@ msgstr "" msgid "Token" msgstr "" -#: application/helpers/common_helper.php:2247 +#: application/helpers/common_helper.php:2251 msgid "Date started" msgstr "" -#: application/helpers/common_helper.php:2260 +#: application/helpers/common_helper.php:2264 msgid "Date last action" msgstr "" -#: application/helpers/common_helper.php:2276 +#: application/helpers/common_helper.php:2280 #: application/views/admin/dataentry/caption_view.php:74 #: application/views/admin/saved/savedlist_view.php:8 msgid "IP address" msgstr "" -#: application/helpers/common_helper.php:2287 +#: application/helpers/common_helper.php:2291 msgid "Referrer URL" msgstr "" -#: application/helpers/common_helper.php:2521 +#: application/helpers/common_helper.php:2525 msgid "Scale 1" msgstr "" -#: application/helpers/common_helper.php:2538 +#: application/helpers/common_helper.php:2542 msgid "Scale 2" msgstr "" -#: application/helpers/common_helper.php:2563 +#: application/helpers/common_helper.php:2567 msgid "Rank %s" msgstr "" -#: application/helpers/common_helper.php:2693 +#: application/helpers/common_helper.php:2697 msgid "Other comment" msgstr "" -#: application/helpers/common_helper.php:2822 +#: application/helpers/common_helper.php:2826 msgid "Group time" msgstr "" -#: application/helpers/common_helper.php:2829 +#: application/helpers/common_helper.php:2833 msgid "Question time" msgstr "" -#: application/helpers/common_helper.php:3056 -#: application/helpers/common_helper.php:3067 -#: application/helpers/common_helper.php:3077 -#: application/helpers/common_helper.php:3122 -#: application/helpers/common_helper.php:3138 -#: application/helpers/common_helper.php:3149 -#: application/helpers/common_helper.php:3157 -#: application/helpers/common_helper.php:3168 -#: application/helpers/common_helper.php:3176 -#: application/helpers/common_helper.php:3184 -#: application/helpers/common_helper.php:3193 -#: application/helpers/common_helper.php:3201 -#: application/helpers/common_helper.php:3210 -#: application/helpers/common_helper.php:3416 -#: application/helpers/common_helper.php:3427 -#: application/helpers/common_helper.php:3510 -#: application/helpers/common_helper.php:3518 -#: application/helpers/common_helper.php:3526 -#: application/helpers/common_helper.php:3534 -#: application/helpers/common_helper.php:3545 -#: application/helpers/common_helper.php:3620 -#: application/helpers/common_helper.php:3653 -#: application/helpers/common_helper.php:3673 -#: application/helpers/common_helper.php:3693 -#: application/helpers/common_helper.php:3719 -#: application/helpers/common_helper.php:3729 -#: application/helpers/common_helper.php:3739 -#: application/helpers/common_helper.php:3750 -#: application/helpers/common_helper.php:3812 -#: application/helpers/common_helper.php:3846 -#: application/helpers/common_helper.php:3855 -#: application/helpers/common_helper.php:3863 -#: application/helpers/common_helper.php:3875 -#: application/helpers/common_helper.php:3884 -#: application/helpers/common_helper.php:4096 +#: application/helpers/common_helper.php:3060 +#: application/helpers/common_helper.php:3071 +#: application/helpers/common_helper.php:3081 +#: application/helpers/common_helper.php:3126 +#: application/helpers/common_helper.php:3142 +#: application/helpers/common_helper.php:3153 +#: application/helpers/common_helper.php:3161 +#: application/helpers/common_helper.php:3172 +#: application/helpers/common_helper.php:3180 +#: application/helpers/common_helper.php:3188 +#: application/helpers/common_helper.php:3197 +#: application/helpers/common_helper.php:3205 +#: application/helpers/common_helper.php:3214 +#: application/helpers/common_helper.php:3420 +#: application/helpers/common_helper.php:3431 +#: application/helpers/common_helper.php:3514 +#: application/helpers/common_helper.php:3522 +#: application/helpers/common_helper.php:3530 +#: application/helpers/common_helper.php:3538 +#: application/helpers/common_helper.php:3549 +#: application/helpers/common_helper.php:3624 +#: application/helpers/common_helper.php:3657 +#: application/helpers/common_helper.php:3677 +#: application/helpers/common_helper.php:3697 +#: application/helpers/common_helper.php:3723 +#: application/helpers/common_helper.php:3733 +#: application/helpers/common_helper.php:3743 +#: application/helpers/common_helper.php:3754 +#: application/helpers/common_helper.php:3816 +#: application/helpers/common_helper.php:3850 +#: application/helpers/common_helper.php:3859 +#: application/helpers/common_helper.php:3867 +#: application/helpers/common_helper.php:3879 +#: application/helpers/common_helper.php:3888 +#: application/helpers/common_helper.php:4100 msgid "Display" msgstr "" -#: application/helpers/common_helper.php:3062 +#: application/helpers/common_helper.php:3066 msgid "Sort the answer options alphabetically" msgstr "" -#: application/helpers/common_helper.php:3063 +#: application/helpers/common_helper.php:3067 msgid "Sort answers alphabetically" msgstr "" -#: application/helpers/common_helper.php:3072 +#: application/helpers/common_helper.php:3076 msgid "Set the percentage width of the answer column (1-100)" msgstr "" -#: application/helpers/common_helper.php:3073 +#: application/helpers/common_helper.php:3077 msgid "Answer width" msgstr "" -#: application/helpers/common_helper.php:3081 +#: application/helpers/common_helper.php:3085 msgid "Repeat headings every X subquestions (Set to 0 to deactivate heading repeat, deactivate minimum repeat headings from config)." msgstr "" -#: application/helpers/common_helper.php:3082 +#: application/helpers/common_helper.php:3086 msgid "Repeat headers" msgstr "" -#: application/helpers/common_helper.php:3086 -#: application/helpers/common_helper.php:3094 -#: application/helpers/common_helper.php:3102 -#: application/helpers/common_helper.php:3113 -#: application/helpers/common_helper.php:3130 -#: application/helpers/common_helper.php:3227 -#: application/helpers/common_helper.php:3235 -#: application/helpers/common_helper.php:3243 -#: application/helpers/common_helper.php:3251 -#: application/helpers/common_helper.php:3259 -#: application/helpers/common_helper.php:3267 -#: application/helpers/common_helper.php:3438 -#: application/helpers/common_helper.php:3478 -#: application/helpers/common_helper.php:3631 -#: application/helpers/common_helper.php:3642 -#: application/helpers/common_helper.php:4167 +#: application/helpers/common_helper.php:3090 +#: application/helpers/common_helper.php:3098 +#: application/helpers/common_helper.php:3106 +#: application/helpers/common_helper.php:3117 +#: application/helpers/common_helper.php:3134 +#: application/helpers/common_helper.php:3231 +#: application/helpers/common_helper.php:3239 +#: application/helpers/common_helper.php:3247 +#: application/helpers/common_helper.php:3255 +#: application/helpers/common_helper.php:3263 +#: application/helpers/common_helper.php:3271 +#: application/helpers/common_helper.php:3442 +#: application/helpers/common_helper.php:3482 +#: application/helpers/common_helper.php:3635 +#: application/helpers/common_helper.php:3646 +#: application/helpers/common_helper.php:4171 msgid "Logic" msgstr "" -#: application/helpers/common_helper.php:3089 +#: application/helpers/common_helper.php:3093 msgid "Enter the code(s) of Multiple choice question(s) (separated by semicolons) to only show the matching answer options in this question." msgstr "" -#: application/helpers/common_helper.php:3090 +#: application/helpers/common_helper.php:3094 msgid "Array filter" msgstr "" -#: application/helpers/common_helper.php:3097 +#: application/helpers/common_helper.php:3101 msgid "Enter the code(s) of Multiple choice question(s) (separated by semicolons) to exclude the matching answer options in this question." msgstr "" -#: application/helpers/common_helper.php:3098 +#: application/helpers/common_helper.php:3102 msgid "Array filter exclusion" msgstr "" -#: application/helpers/common_helper.php:3105 +#: application/helpers/common_helper.php:3109 msgid "Hidden" msgstr "" -#: application/helpers/common_helper.php:3106 +#: application/helpers/common_helper.php:3110 #: application/views/admin/survey/QuestionGroups/questiongroupbar_view.php:105 #: application/views/admin/survey/surveybar_view.php:280 msgid "Disabled" msgstr "" -#: application/helpers/common_helper.php:3108 +#: application/helpers/common_helper.php:3112 msgid "Specify how array-filtered sub-questions should be displayed" msgstr "" -#: application/helpers/common_helper.php:3109 +#: application/helpers/common_helper.php:3113 msgid "Array filter style" msgstr "" -#: application/helpers/common_helper.php:3117 +#: application/helpers/common_helper.php:3121 msgid "If one of the subquestions is marked then for each marked subquestion this value is added as assessment." msgstr "" -#: application/helpers/common_helper.php:3118 +#: application/helpers/common_helper.php:3122 #: application/views/admin/labels/labelview_view.php:39 #: application/views/admin/survey/Question/answerOptions_view.php:22 #: application/views/admin/survey/Question/answerOptions_view.php:68 msgid "Assessment value" msgstr "" -#: application/helpers/common_helper.php:3125 -#: application/helpers/common_helper.php:3126 +#: application/helpers/common_helper.php:3129 +#: application/helpers/common_helper.php:3130 msgid "Category separator" msgstr "" -#: application/helpers/common_helper.php:3133 +#: application/helpers/common_helper.php:3137 msgid "Filter the available answers by this value" msgstr "" -#: application/helpers/common_helper.php:3134 +#: application/helpers/common_helper.php:3138 msgid "Code filter" msgstr "" -#: application/helpers/common_helper.php:3144 +#: application/helpers/common_helper.php:3148 msgid "The answer options will be distributed across the number of columns set here" msgstr "" -#: application/helpers/common_helper.php:3145 +#: application/helpers/common_helper.php:3149 msgid "Display columns" msgstr "" -#: application/helpers/common_helper.php:3152 +#: application/helpers/common_helper.php:3156 msgid "How many rows to display" msgstr "" -#: application/helpers/common_helper.php:3153 +#: application/helpers/common_helper.php:3157 msgid "Display rows" msgstr "" -#: application/helpers/common_helper.php:3163 +#: application/helpers/common_helper.php:3167 msgid "Use accessible dropdown boxes instead of calendar popup" msgstr "" -#: application/helpers/common_helper.php:3164 +#: application/helpers/common_helper.php:3168 msgid "Display dropdown boxes" msgstr "" -#: application/helpers/common_helper.php:3171 +#: application/helpers/common_helper.php:3175 msgid "Minimum year value in calendar" msgstr "" -#: application/helpers/common_helper.php:3172 +#: application/helpers/common_helper.php:3176 msgid "Minimum year" msgstr "" -#: application/helpers/common_helper.php:3179 +#: application/helpers/common_helper.php:3183 msgid "Maximum year value for calendar" msgstr "" -#: application/helpers/common_helper.php:3180 +#: application/helpers/common_helper.php:3184 msgid "Maximum year" msgstr "" -#: application/helpers/common_helper.php:3188 +#: application/helpers/common_helper.php:3192 msgid "Prefix|Suffix for dropdown lists" msgstr "" -#: application/helpers/common_helper.php:3189 +#: application/helpers/common_helper.php:3193 msgid "Dropdown prefix/suffix" msgstr "" -#: application/helpers/common_helper.php:3196 +#: application/helpers/common_helper.php:3200 msgid "Post-Answer-Separator|Inter-Dropdownlist-Separator for dropdown lists" msgstr "" -#: application/helpers/common_helper.php:3197 +#: application/helpers/common_helper.php:3201 msgid "Dropdown separator" msgstr "" -#: application/helpers/common_helper.php:3205 +#: application/helpers/common_helper.php:3209 msgid "Enter a header text for the first scale" msgstr "" -#: application/helpers/common_helper.php:3206 +#: application/helpers/common_helper.php:3210 msgid "Header for first scale" msgstr "" -#: application/helpers/common_helper.php:3214 +#: application/helpers/common_helper.php:3218 msgid "Enter a header text for the second scale" msgstr "" -#: application/helpers/common_helper.php:3215 +#: application/helpers/common_helper.php:3219 msgid "Header for second scale" msgstr "" -#: application/helpers/common_helper.php:3219 -#: application/helpers/common_helper.php:3446 -#: application/helpers/common_helper.php:3454 -#: application/helpers/common_helper.php:3470 -#: application/helpers/common_helper.php:3486 -#: application/helpers/common_helper.php:3494 -#: application/helpers/common_helper.php:3564 -#: application/helpers/common_helper.php:4080 -#: application/helpers/common_helper.php:4088 -#: application/helpers/common_helper.php:4179 +#: application/helpers/common_helper.php:3223 +#: application/helpers/common_helper.php:3450 +#: application/helpers/common_helper.php:3458 +#: application/helpers/common_helper.php:3474 +#: application/helpers/common_helper.php:3490 +#: application/helpers/common_helper.php:3498 +#: application/helpers/common_helper.php:3568 +#: application/helpers/common_helper.php:4084 +#: application/helpers/common_helper.php:4092 +#: application/helpers/common_helper.php:4183 msgid "Input" msgstr "" -#: application/helpers/common_helper.php:3222 +#: application/helpers/common_helper.php:3226 msgid "Multiple numeric inputs sum must equal this value" msgstr "" -#: application/helpers/common_helper.php:3223 +#: application/helpers/common_helper.php:3227 msgid "Equals sum value" msgstr "" -#: application/helpers/common_helper.php:3230 +#: application/helpers/common_helper.php:3234 msgid "Enter a boolean equation to validate the whole question." msgstr "" -#: application/helpers/common_helper.php:3231 +#: application/helpers/common_helper.php:3235 msgid "Question validation equation" msgstr "" -#: application/helpers/common_helper.php:3238 +#: application/helpers/common_helper.php:3242 msgid "This is a hint text that will be shown to the participant describing the question validation equation." msgstr "" -#: application/helpers/common_helper.php:3239 +#: application/helpers/common_helper.php:3243 msgid "Question validation tip" msgstr "" -#: application/helpers/common_helper.php:3246 +#: application/helpers/common_helper.php:3250 msgid "Enter a boolean equation to validate each sub-question." msgstr "" -#: application/helpers/common_helper.php:3247 +#: application/helpers/common_helper.php:3251 msgid "Sub-question validation equation" msgstr "" -#: application/helpers/common_helper.php:3254 +#: application/helpers/common_helper.php:3258 msgid "This is a tip shown to the participant describing the sub-question validation equation." msgstr "" -#: application/helpers/common_helper.php:3255 +#: application/helpers/common_helper.php:3259 msgid "Sub-question validation tip" msgstr "" -#: application/helpers/common_helper.php:3262 +#: application/helpers/common_helper.php:3266 msgid "Excludes all other options if a certain answer is selected - just enter the answer code(s) seperated with a semikolon." msgstr "" -#: application/helpers/common_helper.php:3263 +#: application/helpers/common_helper.php:3267 msgid "Exclusive option" msgstr "" -#: application/helpers/common_helper.php:3273 +#: application/helpers/common_helper.php:3277 msgid "If the participant marks all options, uncheck all and check the option set in the \"Exclusive option\" setting" msgstr "" -#: application/helpers/common_helper.php:3274 +#: application/helpers/common_helper.php:3278 msgid "Auto-check exclusive option if all others are checked" msgstr "" -#: application/helpers/common_helper.php:3281 -#: application/helpers/common_helper.php:3292 -#: application/helpers/common_helper.php:3303 -#: application/helpers/common_helper.php:3314 -#: application/helpers/common_helper.php:3357 -#: application/helpers/common_helper.php:3368 -#: application/helpers/common_helper.php:3377 -#: application/helpers/common_helper.php:3386 -#: application/helpers/common_helper.php:3397 -#: application/helpers/common_helper.php:3405 +#: application/helpers/common_helper.php:3285 +#: application/helpers/common_helper.php:3296 +#: application/helpers/common_helper.php:3307 +#: application/helpers/common_helper.php:3318 +#: application/helpers/common_helper.php:3361 +#: application/helpers/common_helper.php:3372 +#: application/helpers/common_helper.php:3381 +#: application/helpers/common_helper.php:3390 +#: application/helpers/common_helper.php:3401 +#: application/helpers/common_helper.php:3409 msgid "Location" msgstr "" -#: application/helpers/common_helper.php:3286 +#: application/helpers/common_helper.php:3290 msgid "Store the city?" msgstr "" -#: application/helpers/common_helper.php:3287 +#: application/helpers/common_helper.php:3291 msgid "Save city" msgstr "" -#: application/helpers/common_helper.php:3297 +#: application/helpers/common_helper.php:3301 msgid "Store the state?" msgstr "" -#: application/helpers/common_helper.php:3298 +#: application/helpers/common_helper.php:3302 msgid "Save state" msgstr "" -#: application/helpers/common_helper.php:3308 +#: application/helpers/common_helper.php:3312 msgid "Store the postal code?" msgstr "" -#: application/helpers/common_helper.php:3309 +#: application/helpers/common_helper.php:3313 msgid "Save postal code" msgstr "" -#: application/helpers/common_helper.php:3319 +#: application/helpers/common_helper.php:3323 msgid "Store the country?" msgstr "" -#: application/helpers/common_helper.php:3320 +#: application/helpers/common_helper.php:3324 msgid "Save country" msgstr "" -#: application/helpers/common_helper.php:3324 -#: application/helpers/common_helper.php:3335 -#: application/helpers/common_helper.php:3346 +#: application/helpers/common_helper.php:3328 +#: application/helpers/common_helper.php:3339 +#: application/helpers/common_helper.php:3350 #: application/models/Survey_permissions.php:68 +#: application/views/admin/export/statistics_view.php:1293 msgid "Statistics" msgstr "" -#: application/helpers/common_helper.php:3328 +#: application/helpers/common_helper.php:3332 msgid "Show a map in the statistics?" msgstr "" -#: application/helpers/common_helper.php:3329 +#: application/helpers/common_helper.php:3333 msgid "Display map" msgstr "" -#: application/helpers/common_helper.php:3339 +#: application/helpers/common_helper.php:3343 msgid "Display a chart in the statistics?" msgstr "" -#: application/helpers/common_helper.php:3340 +#: application/helpers/common_helper.php:3344 msgid "Display chart" msgstr "" -#: application/helpers/common_helper.php:3349 +#: application/helpers/common_helper.php:3353 msgid "Bar chart" msgstr "" -#: application/helpers/common_helper.php:3349 +#: application/helpers/common_helper.php:3353 msgid "Pie chart" msgstr "" -#: application/helpers/common_helper.php:3350 +#: application/helpers/common_helper.php:3354 msgid "Select the type of chart to be displayed" msgstr "" -#: application/helpers/common_helper.php:3351 +#: application/helpers/common_helper.php:3355 msgid "Chart type" msgstr "" -#: application/helpers/common_helper.php:3360 -#: application/helpers/common_helper.php:3594 -#: application/helpers/common_helper.php:3696 +#: application/helpers/common_helper.php:3364 +#: application/helpers/common_helper.php:3598 +#: application/helpers/common_helper.php:3700 #: application/views/admin/globalSettings_view.php:228 #: application/views/admin/globalSettings_view.php:240 #: application/views/admin/globalSettings_view.php:261 @@ -5397,420 +5425,420 @@ msgstr "" msgid "Off" msgstr "" -#: application/helpers/common_helper.php:3361 +#: application/helpers/common_helper.php:3365 msgid "Google Maps" msgstr "" -#: application/helpers/common_helper.php:3363 +#: application/helpers/common_helper.php:3367 msgid "Activate this to show a map above the input field where the user can select a location" msgstr "" -#: application/helpers/common_helper.php:3364 +#: application/helpers/common_helper.php:3368 msgid "Use mapping service" msgstr "" -#: application/helpers/common_helper.php:3372 +#: application/helpers/common_helper.php:3376 msgid "Width of the map in pixel" msgstr "" -#: application/helpers/common_helper.php:3373 +#: application/helpers/common_helper.php:3377 msgid "Map width" msgstr "" -#: application/helpers/common_helper.php:3381 +#: application/helpers/common_helper.php:3385 msgid "Height of the map in pixel" msgstr "" -#: application/helpers/common_helper.php:3382 +#: application/helpers/common_helper.php:3386 msgid "Map height" msgstr "" -#: application/helpers/common_helper.php:3392 +#: application/helpers/common_helper.php:3396 msgid "Get the default location using the user's IP address?" msgstr "" -#: application/helpers/common_helper.php:3393 +#: application/helpers/common_helper.php:3397 msgid "IP as default location" msgstr "" -#: application/helpers/common_helper.php:3400 +#: application/helpers/common_helper.php:3404 msgid "Default coordinates of the map when the page first loads. Format: latitude [space] longtitude" msgstr "" -#: application/helpers/common_helper.php:3401 +#: application/helpers/common_helper.php:3405 msgid "Default position" msgstr "" -#: application/helpers/common_helper.php:3409 +#: application/helpers/common_helper.php:3413 msgid "Map zoom level" msgstr "" -#: application/helpers/common_helper.php:3410 +#: application/helpers/common_helper.php:3414 msgid "Zoom level" msgstr "" -#: application/helpers/common_helper.php:3422 +#: application/helpers/common_helper.php:3426 msgid "Hide the tip that is normally shown with a question" msgstr "" -#: application/helpers/common_helper.php:3423 +#: application/helpers/common_helper.php:3427 msgid "Hide tip" msgstr "" -#: application/helpers/common_helper.php:3433 +#: application/helpers/common_helper.php:3437 msgid "Hide this question at any time. This is useful for including data using answer prefilling." msgstr "" -#: application/helpers/common_helper.php:3434 +#: application/helpers/common_helper.php:3438 msgid "Always hide this question" msgstr "" -#: application/helpers/common_helper.php:3441 +#: application/helpers/common_helper.php:3445 msgid "Limit the number of possible answers" msgstr "" -#: application/helpers/common_helper.php:3442 +#: application/helpers/common_helper.php:3446 msgid "Maximum answers" msgstr "" -#: application/helpers/common_helper.php:3449 +#: application/helpers/common_helper.php:3453 msgid "Maximum sum value of multiple numeric input" msgstr "" -#: application/helpers/common_helper.php:3450 +#: application/helpers/common_helper.php:3454 msgid "Maximum sum value" msgstr "" -#: application/helpers/common_helper.php:3457 +#: application/helpers/common_helper.php:3461 msgid "Maximum value of the numeric input" msgstr "" -#: application/helpers/common_helper.php:3458 -#: application/helpers/common_helper.php:3514 +#: application/helpers/common_helper.php:3462 +#: application/helpers/common_helper.php:3518 msgid "Maximum value" msgstr "" -#: application/helpers/common_helper.php:3473 +#: application/helpers/common_helper.php:3477 msgid "Maximum characters allowed" msgstr "" -#: application/helpers/common_helper.php:3474 +#: application/helpers/common_helper.php:3478 msgid "Maximum characters" msgstr "" -#: application/helpers/common_helper.php:3481 +#: application/helpers/common_helper.php:3485 msgid "Ensure a minimum number of possible answers (0=No limit)" msgstr "" -#: application/helpers/common_helper.php:3482 +#: application/helpers/common_helper.php:3486 msgid "Minimum answers" msgstr "" -#: application/helpers/common_helper.php:3489 +#: application/helpers/common_helper.php:3493 msgid "The sum of the multiple numeric inputs must be greater than this value" msgstr "" -#: application/helpers/common_helper.php:3490 +#: application/helpers/common_helper.php:3494 msgid "Minimum sum value" msgstr "" -#: application/helpers/common_helper.php:3497 +#: application/helpers/common_helper.php:3501 msgid "Minimum value of the numeric input" msgstr "" -#: application/helpers/common_helper.php:3498 -#: application/helpers/common_helper.php:3522 +#: application/helpers/common_helper.php:3502 +#: application/helpers/common_helper.php:3526 msgid "Minimum value" msgstr "" -#: application/helpers/common_helper.php:3513 +#: application/helpers/common_helper.php:3517 msgid "Maximum value for array(mult-flexible) question type" msgstr "" -#: application/helpers/common_helper.php:3521 +#: application/helpers/common_helper.php:3525 msgid "Minimum value for array(multi-flexible) question type" msgstr "" -#: application/helpers/common_helper.php:3529 -#: application/helpers/common_helper.php:3530 +#: application/helpers/common_helper.php:3533 +#: application/helpers/common_helper.php:3534 msgid "Step value" msgstr "" -#: application/helpers/common_helper.php:3540 +#: application/helpers/common_helper.php:3544 msgid "Use checkbox layout" msgstr "" -#: application/helpers/common_helper.php:3541 +#: application/helpers/common_helper.php:3545 msgid "Checkbox layout" msgstr "" -#: application/helpers/common_helper.php:3551 +#: application/helpers/common_helper.php:3555 msgid "Present answer options in reverse order" msgstr "" -#: application/helpers/common_helper.php:3552 +#: application/helpers/common_helper.php:3556 msgid "Reverse answer order" msgstr "" -#: application/helpers/common_helper.php:3571 +#: application/helpers/common_helper.php:3575 msgid "Restrict input to integer values" msgstr "" -#: application/helpers/common_helper.php:3572 +#: application/helpers/common_helper.php:3576 msgid "Integer only" msgstr "" -#: application/helpers/common_helper.php:3584 +#: application/helpers/common_helper.php:3588 msgid "Allow only numerical input" msgstr "" -#: application/helpers/common_helper.php:3585 +#: application/helpers/common_helper.php:3589 msgid "Numbers only" msgstr "" -#: application/helpers/common_helper.php:3595 +#: application/helpers/common_helper.php:3599 msgid "Rows" msgstr "" -#: application/helpers/common_helper.php:3596 +#: application/helpers/common_helper.php:3600 msgid "Columns" msgstr "" -#: application/helpers/common_helper.php:3597 +#: application/helpers/common_helper.php:3601 msgid "Both rows and columns" msgstr "" -#: application/helpers/common_helper.php:3600 +#: application/helpers/common_helper.php:3604 msgid "Show totals for either rows, columns or both rows and columns" msgstr "" -#: application/helpers/common_helper.php:3601 +#: application/helpers/common_helper.php:3605 msgid "Show totals for" msgstr "" -#: application/helpers/common_helper.php:3614 +#: application/helpers/common_helper.php:3618 msgid "Show grand total for either columns or rows" msgstr "" -#: application/helpers/common_helper.php:3615 +#: application/helpers/common_helper.php:3619 msgid "Show grand total" msgstr "" -#: application/helpers/common_helper.php:3626 +#: application/helpers/common_helper.php:3630 msgid "Present as text input boxes instead of dropdown lists" msgstr "" -#: application/helpers/common_helper.php:3627 +#: application/helpers/common_helper.php:3631 msgid "Text inputs" msgstr "" -#: application/helpers/common_helper.php:3637 +#: application/helpers/common_helper.php:3641 msgid "Make the 'Other:' comment field mandatory when the 'Other:' option is active" msgstr "" -#: application/helpers/common_helper.php:3638 +#: application/helpers/common_helper.php:3642 msgid "'Other:' comment mandatory" msgstr "" -#: application/helpers/common_helper.php:3648 +#: application/helpers/common_helper.php:3652 msgid "Allow only numerical input for 'Other' text" msgstr "" -#: application/helpers/common_helper.php:3649 +#: application/helpers/common_helper.php:3653 msgid "Numbers only for 'Other'" msgstr "" -#: application/helpers/common_helper.php:3657 +#: application/helpers/common_helper.php:3661 msgid "Replaces the label of the 'Other:' answer option with a custom text" msgstr "" -#: application/helpers/common_helper.php:3658 +#: application/helpers/common_helper.php:3662 msgid "Label for 'Other:' option" msgstr "" -#: application/helpers/common_helper.php:3668 +#: application/helpers/common_helper.php:3672 msgid "Insert a page break before this question in printable view by setting this to Yes." msgstr "" -#: application/helpers/common_helper.php:3669 +#: application/helpers/common_helper.php:3673 msgid "Insert page break in printable view" msgstr "" -#: application/helpers/common_helper.php:3677 +#: application/helpers/common_helper.php:3681 msgid "Add a prefix to the answer field" msgstr "" -#: application/helpers/common_helper.php:3678 +#: application/helpers/common_helper.php:3682 msgid "Answer prefix" msgstr "" -#: application/helpers/common_helper.php:3688 +#: application/helpers/common_helper.php:3692 msgid "Show statistics of this question in the public statistics page" msgstr "" -#: application/helpers/common_helper.php:3689 +#: application/helpers/common_helper.php:3693 msgid "Show in public statistics" msgstr "" -#: application/helpers/common_helper.php:3697 +#: application/helpers/common_helper.php:3701 msgid "Randomize on each page load" msgstr "" -#: application/helpers/common_helper.php:3701 +#: application/helpers/common_helper.php:3705 msgid "Present answers in random order" msgstr "" -#: application/helpers/common_helper.php:3702 +#: application/helpers/common_helper.php:3706 msgid "Random answer order" msgstr "" -#: application/helpers/common_helper.php:3725 +#: application/helpers/common_helper.php:3729 msgid "Show javascript alert" msgstr "" -#: application/helpers/common_helper.php:3726 +#: application/helpers/common_helper.php:3730 msgid "Show an alert if answers exceeds the number of max answers" msgstr "" -#: application/helpers/common_helper.php:3735 +#: application/helpers/common_helper.php:3739 msgid "Same height for all choice" msgstr "" -#: application/helpers/common_helper.php:3736 +#: application/helpers/common_helper.php:3740 msgid "Force each choice to have the same height" msgstr "" -#: application/helpers/common_helper.php:3745 +#: application/helpers/common_helper.php:3749 msgid "Same height for lists" msgstr "" -#: application/helpers/common_helper.php:3746 +#: application/helpers/common_helper.php:3750 msgid "Force the choice list and the rank list to have the same height" msgstr "" -#: application/helpers/common_helper.php:3753 +#: application/helpers/common_helper.php:3757 msgid "Get order from previous question" msgstr "" -#: application/helpers/common_helper.php:3754 +#: application/helpers/common_helper.php:3758 msgid "Enter question ID to get subquestion order from a previous question" msgstr "" -#: application/helpers/common_helper.php:3758 -#: application/helpers/common_helper.php:3769 -#: application/helpers/common_helper.php:3777 -#: application/helpers/common_helper.php:3785 -#: application/helpers/common_helper.php:3793 -#: application/helpers/common_helper.php:3801 -#: application/helpers/common_helper.php:3827 -#: application/helpers/common_helper.php:3838 +#: application/helpers/common_helper.php:3762 +#: application/helpers/common_helper.php:3773 +#: application/helpers/common_helper.php:3781 +#: application/helpers/common_helper.php:3789 +#: application/helpers/common_helper.php:3797 +#: application/helpers/common_helper.php:3805 +#: application/helpers/common_helper.php:3831 +#: application/helpers/common_helper.php:3842 msgid "Slider" msgstr "" -#: application/helpers/common_helper.php:3764 -#: application/helpers/common_helper.php:3765 -#: application/helpers/common_helper.php:3821 -#: application/helpers/common_helper.php:3822 +#: application/helpers/common_helper.php:3768 +#: application/helpers/common_helper.php:3769 +#: application/helpers/common_helper.php:3825 +#: application/helpers/common_helper.php:3826 msgid "Use slider layout" msgstr "" -#: application/helpers/common_helper.php:3772 -#: application/helpers/common_helper.php:3773 +#: application/helpers/common_helper.php:3776 +#: application/helpers/common_helper.php:3777 msgid "Slider minimum value" msgstr "" -#: application/helpers/common_helper.php:3780 -#: application/helpers/common_helper.php:3781 +#: application/helpers/common_helper.php:3784 +#: application/helpers/common_helper.php:3785 msgid "Slider maximum value" msgstr "" -#: application/helpers/common_helper.php:3788 -#: application/helpers/common_helper.php:3789 +#: application/helpers/common_helper.php:3792 +#: application/helpers/common_helper.php:3793 msgid "Slider accuracy" msgstr "" -#: application/helpers/common_helper.php:3796 -#: application/helpers/common_helper.php:3797 +#: application/helpers/common_helper.php:3800 +#: application/helpers/common_helper.php:3801 msgid "Slider initial value" msgstr "" -#: application/helpers/common_helper.php:3807 +#: application/helpers/common_helper.php:3811 msgid "The handle is displayed at the middle of the slider (this will not set the initial value)" msgstr "" -#: application/helpers/common_helper.php:3808 +#: application/helpers/common_helper.php:3812 msgid "Slider starts at the middle position" msgstr "" -#: application/helpers/common_helper.php:3817 +#: application/helpers/common_helper.php:3821 msgid "Yes - stars" msgstr "" -#: application/helpers/common_helper.php:3818 +#: application/helpers/common_helper.php:3822 msgid "Yes - slider with emoticon" msgstr "" -#: application/helpers/common_helper.php:3833 +#: application/helpers/common_helper.php:3837 msgid "Display min and max value under the slider" msgstr "" -#: application/helpers/common_helper.php:3834 +#: application/helpers/common_helper.php:3838 msgid "Display slider min and max value" msgstr "" -#: application/helpers/common_helper.php:3841 +#: application/helpers/common_helper.php:3845 msgid "Answer|Left-slider-text|Right-slider-text separator character" msgstr "" -#: application/helpers/common_helper.php:3842 +#: application/helpers/common_helper.php:3846 msgid "Slider left/right text separator" msgstr "" -#: application/helpers/common_helper.php:3850 +#: application/helpers/common_helper.php:3854 msgid "Add a suffix to the answer field" msgstr "" -#: application/helpers/common_helper.php:3851 +#: application/helpers/common_helper.php:3855 msgid "Answer suffix" msgstr "" -#: application/helpers/common_helper.php:3858 +#: application/helpers/common_helper.php:3862 msgid "Width of text input box" msgstr "" -#: application/helpers/common_helper.php:3859 +#: application/helpers/common_helper.php:3863 msgid "Input box width" msgstr "" -#: application/helpers/common_helper.php:3869 +#: application/helpers/common_helper.php:3873 msgid "Present dropdown control(s) instead of list of radio buttons" msgstr "" -#: application/helpers/common_helper.php:3870 +#: application/helpers/common_helper.php:3874 msgid "Use dropdown presentation" msgstr "" -#: application/helpers/common_helper.php:3879 +#: application/helpers/common_helper.php:3883 msgid "For list dropdown boxes, show up to this many rows" msgstr "" -#: application/helpers/common_helper.php:3880 +#: application/helpers/common_helper.php:3884 msgid "Height of dropdown" msgstr "" -#: application/helpers/common_helper.php:3888 +#: application/helpers/common_helper.php:3892 msgid "Order - like 3)" msgstr "" -#: application/helpers/common_helper.php:3891 +#: application/helpers/common_helper.php:3895 msgid "Accelerator keys for list items" msgstr "" -#: application/helpers/common_helper.php:3892 +#: application/helpers/common_helper.php:3896 msgid "Prefix for list items" msgstr "" -#: application/helpers/common_helper.php:3899 +#: application/helpers/common_helper.php:3903 #: application/views/admin/authentication/login.php:12 #: application/views/admin/user/personalsettings.php:29 #: application/views/admin/user/personalsettings.php:41 @@ -5818,325 +5846,325 @@ msgstr "" msgid "Default" msgstr "" -#: application/helpers/common_helper.php:3900 +#: application/helpers/common_helper.php:3904 msgid "Nominal" msgstr "" -#: application/helpers/common_helper.php:3901 +#: application/helpers/common_helper.php:3905 msgid "Ordinal" msgstr "" -#: application/helpers/common_helper.php:3902 +#: application/helpers/common_helper.php:3906 msgid "Scale" msgstr "" -#: application/helpers/common_helper.php:3904 +#: application/helpers/common_helper.php:3908 msgid "Set a specific SPSS export scale type for this question" msgstr "" -#: application/helpers/common_helper.php:3905 +#: application/helpers/common_helper.php:3909 msgid "SPSS export scale type" msgstr "" -#: application/helpers/common_helper.php:3914 +#: application/helpers/common_helper.php:3918 msgid "Replace choice header (default: \"%s\")" msgstr "" -#: application/helpers/common_helper.php:3915 +#: application/helpers/common_helper.php:3919 msgid "Choice header" msgstr "" -#: application/helpers/common_helper.php:3924 +#: application/helpers/common_helper.php:3928 msgid "Replace rank header (default: \"%s\")" msgstr "" -#: application/helpers/common_helper.php:3925 +#: application/helpers/common_helper.php:3929 msgid "Rank header" msgstr "" -#: application/helpers/common_helper.php:3930 -#: application/helpers/common_helper.php:3938 -#: application/helpers/common_helper.php:3950 -#: application/helpers/common_helper.php:3961 -#: application/helpers/common_helper.php:3972 -#: application/helpers/common_helper.php:3981 -#: application/helpers/common_helper.php:3989 -#: application/helpers/common_helper.php:3997 -#: application/helpers/common_helper.php:4006 -#: application/helpers/common_helper.php:4014 -#: application/helpers/common_helper.php:4022 -#: application/helpers/common_helper.php:4030 -#: application/helpers/common_helper.php:4039 -#: application/helpers/common_helper.php:4047 -#: application/helpers/common_helper.php:4055 -#: application/helpers/common_helper.php:4063 -#: application/helpers/common_helper.php:4072 +#: application/helpers/common_helper.php:3934 +#: application/helpers/common_helper.php:3942 +#: application/helpers/common_helper.php:3954 +#: application/helpers/common_helper.php:3965 +#: application/helpers/common_helper.php:3976 +#: application/helpers/common_helper.php:3985 +#: application/helpers/common_helper.php:3993 +#: application/helpers/common_helper.php:4001 +#: application/helpers/common_helper.php:4010 +#: application/helpers/common_helper.php:4018 +#: application/helpers/common_helper.php:4026 +#: application/helpers/common_helper.php:4034 +#: application/helpers/common_helper.php:4043 +#: application/helpers/common_helper.php:4051 +#: application/helpers/common_helper.php:4059 +#: application/helpers/common_helper.php:4067 +#: application/helpers/common_helper.php:4076 msgid "Timer" msgstr "" -#: application/helpers/common_helper.php:3933 +#: application/helpers/common_helper.php:3937 msgid "Limit time to answer question (in seconds)" msgstr "" -#: application/helpers/common_helper.php:3934 +#: application/helpers/common_helper.php:3938 msgid "Time limit" msgstr "" -#: application/helpers/common_helper.php:3941 +#: application/helpers/common_helper.php:3945 msgid "Warn and move on" msgstr "" -#: application/helpers/common_helper.php:3942 +#: application/helpers/common_helper.php:3946 msgid "Move on without warning" msgstr "" -#: application/helpers/common_helper.php:3943 +#: application/helpers/common_helper.php:3947 msgid "Disable only" msgstr "" -#: application/helpers/common_helper.php:3945 +#: application/helpers/common_helper.php:3949 msgid "Action to perform when time limit is up" msgstr "" -#: application/helpers/common_helper.php:3946 +#: application/helpers/common_helper.php:3950 msgid "Time limit action" msgstr "" -#: application/helpers/common_helper.php:3956 +#: application/helpers/common_helper.php:3960 msgid "Disable the next button until time limit expires" msgstr "" -#: application/helpers/common_helper.php:3957 +#: application/helpers/common_helper.php:3961 msgid "Time limit disable next" msgstr "" -#: application/helpers/common_helper.php:3967 +#: application/helpers/common_helper.php:3971 msgid "Disable the prev button until the time limit expires" msgstr "" -#: application/helpers/common_helper.php:3968 +#: application/helpers/common_helper.php:3972 msgid "Time limit disable prev" msgstr "" -#: application/helpers/common_helper.php:3976 +#: application/helpers/common_helper.php:3980 msgid "The text message that displays in the countdown timer during the countdown" msgstr "" -#: application/helpers/common_helper.php:3977 +#: application/helpers/common_helper.php:3981 msgid "Time limit countdown message" msgstr "" -#: application/helpers/common_helper.php:3984 +#: application/helpers/common_helper.php:3988 msgid "CSS Style for the message that displays in the countdown timer during the countdown" msgstr "" -#: application/helpers/common_helper.php:3985 +#: application/helpers/common_helper.php:3989 msgid "Time limit timer CSS style" msgstr "" -#: application/helpers/common_helper.php:3992 +#: application/helpers/common_helper.php:3996 msgid "Display the 'time limit expiry message' for this many seconds before performing the 'time limit action' (defaults to 1 second if left blank)" msgstr "" -#: application/helpers/common_helper.php:3993 +#: application/helpers/common_helper.php:3997 msgid "Time limit expiry message display time" msgstr "" -#: application/helpers/common_helper.php:4001 +#: application/helpers/common_helper.php:4005 msgid "The message to display when the time limit has expired (a default message will display if this setting is left blank)" msgstr "" -#: application/helpers/common_helper.php:4002 +#: application/helpers/common_helper.php:4006 msgid "Time limit expiry message" msgstr "" -#: application/helpers/common_helper.php:4009 +#: application/helpers/common_helper.php:4013 msgid "CSS style for the 'time limit expiry message'" msgstr "" -#: application/helpers/common_helper.php:4010 +#: application/helpers/common_helper.php:4014 msgid "Time limit message CSS style" msgstr "" -#: application/helpers/common_helper.php:4017 +#: application/helpers/common_helper.php:4021 msgid "Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank)" msgstr "" -#: application/helpers/common_helper.php:4018 +#: application/helpers/common_helper.php:4022 msgid "1st time limit warning message timer" msgstr "" -#: application/helpers/common_helper.php:4025 +#: application/helpers/common_helper.php:4029 msgid "The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank)" msgstr "" -#: application/helpers/common_helper.php:4026 +#: application/helpers/common_helper.php:4030 msgid "1st time limit warning message display time" msgstr "" -#: application/helpers/common_helper.php:4034 +#: application/helpers/common_helper.php:4038 msgid "The message to display as a 'time limit warning' (a default warning will display if this is left blank)" msgstr "" -#: application/helpers/common_helper.php:4035 +#: application/helpers/common_helper.php:4039 msgid "1st time limit warning message" msgstr "" -#: application/helpers/common_helper.php:4042 +#: application/helpers/common_helper.php:4046 msgid "CSS style used when the 'time limit warning' message is displayed" msgstr "" -#: application/helpers/common_helper.php:4043 +#: application/helpers/common_helper.php:4047 msgid "1st time limit warning CSS style" msgstr "" -#: application/helpers/common_helper.php:4050 +#: application/helpers/common_helper.php:4054 msgid "Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank)" msgstr "" -#: application/helpers/common_helper.php:4051 +#: application/helpers/common_helper.php:4055 msgid "2nd time limit warning message timer" msgstr "" -#: application/helpers/common_helper.php:4058 +#: application/helpers/common_helper.php:4062 msgid "The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank)" msgstr "" -#: application/helpers/common_helper.php:4059 +#: application/helpers/common_helper.php:4063 msgid "2nd time limit warning message display time" msgstr "" -#: application/helpers/common_helper.php:4067 +#: application/helpers/common_helper.php:4071 msgid "The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank)" msgstr "" -#: application/helpers/common_helper.php:4068 +#: application/helpers/common_helper.php:4072 msgid "2nd time limit warning message" msgstr "" -#: application/helpers/common_helper.php:4075 +#: application/helpers/common_helper.php:4079 msgid "CSS style used when the 2nd 'time limit warning' message is displayed" msgstr "" -#: application/helpers/common_helper.php:4076 +#: application/helpers/common_helper.php:4080 msgid "2nd time limit warning CSS style" msgstr "" -#: application/helpers/common_helper.php:4083 +#: application/helpers/common_helper.php:4087 msgid "Specify a custom date/time format (the d/dd m/mm yy/yyyy H/HH M/MM formats and \"-./: \" characters are allowed for day/month/year/hour/minutes without or with leading zero respectively. Defaults to survey's date format" msgstr "" -#: application/helpers/common_helper.php:4084 +#: application/helpers/common_helper.php:4088 msgid "Date/Time format" msgstr "" -#: application/helpers/common_helper.php:4091 +#: application/helpers/common_helper.php:4095 msgid "Minute step interval when using select boxes" msgstr "" -#: application/helpers/common_helper.php:4092 +#: application/helpers/common_helper.php:4096 msgid "Minute step interval" msgstr "" -#: application/helpers/common_helper.php:4099 +#: application/helpers/common_helper.php:4103 msgid "Short names" msgstr "" -#: application/helpers/common_helper.php:4100 +#: application/helpers/common_helper.php:4104 msgid "Full names" msgstr "" -#: application/helpers/common_helper.php:4101 +#: application/helpers/common_helper.php:4105 msgid "Numbers" msgstr "" -#: application/helpers/common_helper.php:4103 +#: application/helpers/common_helper.php:4107 msgid "Change the display style of the month when using select boxes" msgstr "" -#: application/helpers/common_helper.php:4104 +#: application/helpers/common_helper.php:4108 msgid "Month display style" msgstr "" -#: application/helpers/common_helper.php:4108 -#: application/helpers/common_helper.php:4119 +#: application/helpers/common_helper.php:4112 +#: application/helpers/common_helper.php:4123 msgid "File metadata" msgstr "" -#: application/helpers/common_helper.php:4114 +#: application/helpers/common_helper.php:4118 msgid "Is the participant required to give a title to the uploaded file?" msgstr "" -#: application/helpers/common_helper.php:4115 +#: application/helpers/common_helper.php:4119 msgid "Show title" msgstr "" -#: application/helpers/common_helper.php:4125 +#: application/helpers/common_helper.php:4129 msgid "Is the participant required to give a comment to the uploaded file?" msgstr "" -#: application/helpers/common_helper.php:4126 +#: application/helpers/common_helper.php:4130 msgid "Show comment" msgstr "" -#: application/helpers/common_helper.php:4135 +#: application/helpers/common_helper.php:4139 msgid "The participant cannot upload a single file larger than this size" msgstr "" -#: application/helpers/common_helper.php:4136 +#: application/helpers/common_helper.php:4140 msgid "Maximum file size allowed (in KB)" msgstr "" -#: application/helpers/common_helper.php:4144 +#: application/helpers/common_helper.php:4148 msgid "Maximum number of files that the participant can upload for this question" msgstr "" -#: application/helpers/common_helper.php:4145 +#: application/helpers/common_helper.php:4149 msgid "Max number of files" msgstr "" -#: application/helpers/common_helper.php:4153 +#: application/helpers/common_helper.php:4157 msgid "Minimum number of files that the participant must upload for this question" msgstr "" -#: application/helpers/common_helper.php:4154 +#: application/helpers/common_helper.php:4158 msgid "Min number of files" msgstr "" -#: application/helpers/common_helper.php:4162 +#: application/helpers/common_helper.php:4166 msgid "Allowed file types in comma separated format. e.g. pdf,doc,odt" msgstr "" -#: application/helpers/common_helper.php:4163 +#: application/helpers/common_helper.php:4167 msgid "Allowed file types" msgstr "" -#: application/helpers/common_helper.php:4170 +#: application/helpers/common_helper.php:4174 msgid "Place questions into a specified randomization group, all questions included in the specified group will appear in a random order" msgstr "" -#: application/helpers/common_helper.php:4171 +#: application/helpers/common_helper.php:4175 msgid "Randomization group name" msgstr "" -#: application/helpers/common_helper.php:4185 +#: application/helpers/common_helper.php:4189 msgid "Is no answer (missing) allowed when either 'Equals sum value' or 'Minimum sum value' are set?" msgstr "" -#: application/helpers/common_helper.php:4186 +#: application/helpers/common_helper.php:4190 msgid "Value range allows missing" msgstr "" -#: application/helpers/common_helper.php:4320 +#: application/helpers/common_helper.php:4324 msgid "Email was not sent because demo-mode is activated." msgstr "" -#: application/helpers/common_helper.php:4441 +#: application/helpers/common_helper.php:4445 msgid "SMTP debug output:" msgstr "" -#: application/helpers/common_helper.php:5313 -#: application/helpers/replacements_helper.php:643 +#: application/helpers/common_helper.php:5317 +#: application/helpers/replacements_helper.php:642 #: application/views/admin/export/exportresults_view.php:121 #: application/views/admin/saved/savedlist_view.php:10 #: application/views/admin/token/browse.php:75 @@ -6144,132 +6172,132 @@ msgstr "" msgid "Email address" msgstr "" -#: application/helpers/common_helper.php:5314 +#: application/helpers/common_helper.php:5318 msgid "Token code" msgstr "" -#: application/helpers/common_helper.php:5315 +#: application/helpers/common_helper.php:5319 msgid "Language code" msgstr "" -#: application/helpers/common_helper.php:5316 +#: application/helpers/common_helper.php:5320 msgid "Invitation sent date" msgstr "" -#: application/helpers/common_helper.php:5317 +#: application/helpers/common_helper.php:5321 msgid "Last Reminder sent date" msgstr "" -#: application/helpers/common_helper.php:5318 +#: application/helpers/common_helper.php:5322 msgid "Total numbers of sent reminders" msgstr "" -#: application/helpers/common_helper.php:5319 +#: application/helpers/common_helper.php:5323 #: application/views/admin/token/browse.php:75 #: application/views/admin/token/browse.php:141 msgid "Uses left" msgstr "" -#: application/helpers/common_helper.php:5338 +#: application/helpers/common_helper.php:5342 msgid "Attribute %s" msgstr "" -#: application/helpers/common_helper.php:6216 +#: application/helpers/common_helper.php:6223 msgid "Access denied!" msgstr "" -#: application/helpers/common_helper.php:6221 +#: application/helpers/common_helper.php:6228 msgid "You are not allowed dump the database!" msgstr "" -#: application/helpers/common_helper.php:6226 +#: application/helpers/common_helper.php:6233 msgid "You are not allowed export a label set!" msgstr "" -#: application/helpers/common_helper.php:6231 +#: application/helpers/common_helper.php:6238 msgid "You are not allowed to change user data!" msgstr "" -#: application/helpers/common_helper.php:6236 +#: application/helpers/common_helper.php:6243 msgid "You are not allowed to create new surveys!" msgstr "" -#: application/helpers/common_helper.php:6241 +#: application/helpers/common_helper.php:6248 msgid "You are not allowed to delete this survey!" msgstr "" -#: application/helpers/common_helper.php:6246 +#: application/helpers/common_helper.php:6253 msgid "You are not allowed to add new questions for this survey!" msgstr "" -#: application/helpers/common_helper.php:6251 +#: application/helpers/common_helper.php:6258 msgid "You are not allowed to activate this survey!" msgstr "" -#: application/helpers/common_helper.php:6256 +#: application/helpers/common_helper.php:6263 msgid "You are not allowed to stop this survey!" msgstr "" -#: application/helpers/common_helper.php:6261 +#: application/helpers/common_helper.php:6268 msgid "You are not allowed to add a group to this survey!" msgstr "" -#: application/helpers/common_helper.php:6267 +#: application/helpers/common_helper.php:6274 msgid "You are not allowed to order groups in this survey!" msgstr "" -#: application/helpers/common_helper.php:6273 +#: application/helpers/common_helper.php:6280 msgid "You are not allowed to edit this survey!" msgstr "" -#: application/helpers/common_helper.php:6278 +#: application/helpers/common_helper.php:6285 msgid "You are not allowed to edit groups in this survey!" msgstr "" -#: application/helpers/common_helper.php:6283 +#: application/helpers/common_helper.php:6290 msgid "You are not allowed to browse responses!" msgstr "" -#: application/helpers/common_helper.php:6288 +#: application/helpers/common_helper.php:6295 msgid "You are not allowed to set assessment rules!" msgstr "" -#: application/helpers/common_helper.php:6293 +#: application/helpers/common_helper.php:6300 msgid "You are not allowed to delete this group!" msgstr "" -#: application/helpers/common_helper.php:6298 +#: application/helpers/common_helper.php:6305 msgid "You are not allowed to import a survey!" msgstr "" -#: application/helpers/common_helper.php:6304 +#: application/helpers/common_helper.php:6311 msgid "You are not allowed to import a group!" msgstr "" -#: application/helpers/common_helper.php:6309 +#: application/helpers/common_helper.php:6316 msgid "You are not allowed to to import a question!" msgstr "" -#: application/helpers/common_helper.php:6318 -#: application/helpers/common_helper.php:6323 +#: application/helpers/common_helper.php:6325 +#: application/helpers/common_helper.php:6330 msgid "Security alert" msgstr "" -#: application/helpers/common_helper.php:6318 -#: application/helpers/common_helper.php:6323 +#: application/helpers/common_helper.php:6325 +#: application/helpers/common_helper.php:6330 msgid "Someone may be trying to use your LimeSurvey session (CSRF attack suspected). If you just clicked on a malicious link, please report this to your system administrator." msgstr "" -#: application/helpers/common_helper.php:6318 -#: application/helpers/common_helper.php:6323 +#: application/helpers/common_helper.php:6325 +#: application/helpers/common_helper.php:6330 msgid "Also this problem can occur when you are working/editing in LimeSurvey in several browser windows/tabs at the same time." msgstr "" -#: application/helpers/common_helper.php:6328 +#: application/helpers/common_helper.php:6335 msgid "You are not allowed to perform this operation!" msgstr "" -#: application/helpers/common_helper.php:7075 +#: application/helpers/common_helper.php:7082 msgid "SQL command failed: %s" msgstr "" @@ -6813,217 +6841,217 @@ msgstr "" msgid "Error in SQL update" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:5480 +#: application/helpers/expressions/em_manager_helper.php:5482 msgid "This question is mandatory" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:5494 +#: application/helpers/expressions/em_manager_helper.php:5496 msgid "Please check at least one item." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:5505 +#: application/helpers/expressions/em_manager_helper.php:5507 msgid "If you choose '%s' you must provide a description." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:5527 -#: application/helpers/expressions/em_manager_helper.php:5564 +#: application/helpers/expressions/em_manager_helper.php:5529 +#: application/helpers/expressions/em_manager_helper.php:5566 msgid "Please complete all parts" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:5556 +#: application/helpers/expressions/em_manager_helper.php:5558 msgid "Please check at least one box per row" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:5572 +#: application/helpers/expressions/em_manager_helper.php:5574 msgid "Please rank all items" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8032 +#: application/helpers/expressions/em_manager_helper.php:8034 msgid "Invalid question - probably missing sub-questions or language-specific settings for language %s" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8038 +#: application/helpers/expressions/em_manager_helper.php:8040 msgid "Logic File for Survey # " msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8054 +#: application/helpers/expressions/em_manager_helper.php:8056 #: application/views/admin/survey/editLocalSettings_view.php:11 #: application/views/admin/survey/surveySummary_view.php:40 msgid "Welcome:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8068 +#: application/helpers/expressions/em_manager_helper.php:8070 #: application/views/admin/survey/surveySummary_view.php:117 msgid "End URL" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8072 +#: application/helpers/expressions/em_manager_helper.php:8074 msgid "Name [ID]" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8072 +#: application/helpers/expressions/em_manager_helper.php:8074 msgid "Relevance [Validation] (Default)" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8072 +#: application/helpers/expressions/em_manager_helper.php:8074 msgid "Text [Help] (Tip)" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8124 -#: application/helpers/expressions/em_manager_helper.php:8369 +#: application/helpers/expressions/em_manager_helper.php:8126 +#: application/helpers/expressions/em_manager_helper.php:8371 msgid "Default:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8132 -#: application/views/admin/survey/Question/editQuestion_view.php:44 -#: application/views/admin/survey/Question/editQuestion_view.php:46 -#: application/views/admin/survey/Question/editQuestion_view.php:68 -#: application/views/admin/survey/Question/editQuestion_view.php:70 -#: application/views/admin/survey/Question/editQuestion_view.php:88 -#: application/views/admin/survey/Question/editQuestion_view.php:90 +#: application/helpers/expressions/em_manager_helper.php:8134 +#: application/views/admin/survey/Question/editQuestion_view.php:50 +#: application/views/admin/survey/Question/editQuestion_view.php:52 +#: application/views/admin/survey/Question/editQuestion_view.php:74 +#: application/views/admin/survey/Question/editQuestion_view.php:76 +#: application/views/admin/survey/Question/editQuestion_view.php:94 +#: application/views/admin/survey/Question/editQuestion_view.php:96 #: application/views/admin/survey/Question/questionbar_view.php:172 msgid "Help:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8133 +#: application/helpers/expressions/em_manager_helper.php:8135 msgid "Tip:" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8150 +#: application/helpers/expressions/em_manager_helper.php:8152 msgid "Question Attribute" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8150 +#: application/helpers/expressions/em_manager_helper.php:8152 msgid "Value" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8271 +#: application/helpers/expressions/em_manager_helper.php:8273 msgid "This variable name has already been used." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8283 +#: application/helpers/expressions/em_manager_helper.php:8285 msgid "Starting in 1.92, variable names should only contain letters, numbers, and underscores; and may not start with a number. This variable name is deprecated." msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8441 +#: application/helpers/expressions/em_manager_helper.php:8443 msgid "This question has at least %s error." msgid_plural "This question has at least %s errors." msgstr[0] "" msgstr[1] "" -#: application/helpers/expressions/em_manager_helper.php:8480 +#: application/helpers/expressions/em_manager_helper.php:8482 msgid "%s question contains errors that need to be corrected" msgid_plural "%s questions contain errors that need to be corrected" msgstr[0] "" msgstr[1] "" -#: application/helpers/expressions/em_manager_helper.php:8486 +#: application/helpers/expressions/em_manager_helper.php:8488 msgid "No syntax errors detected in this survey" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8489 +#: application/helpers/expressions/em_manager_helper.php:8491 msgid "This group, by itself, does not contain any syntax errors" msgstr "" -#: application/helpers/expressions/em_manager_helper.php:8492 +#: application/helpers/expressions/em_manager_helper.php:8494 msgid "This question, by itself, does not contain any syntax errors" msgstr "" -#: application/helpers/frontend_helper.php:56 +#: application/helpers/frontend_helper.php:55 msgid "There is no matching saved survey" msgstr "" -#: application/helpers/frontend_helper.php:161 +#: application/helpers/frontend_helper.php:160 msgid "You have completed %s%% of this survey" msgstr "" -#: application/helpers/frontend_helper.php:814 +#: application/helpers/frontend_helper.php:813 msgid "Sorry, the uploaded file (%s) is larger than the allowed filesize of %s KB." msgstr "" -#: application/helpers/frontend_helper.php:827 -#: application/helpers/frontend_helper.php:833 +#: application/helpers/frontend_helper.php:826 +#: application/helpers/frontend_helper.php:832 msgid "Sorry, only %s extensions are allowed!" msgstr "" -#: application/helpers/frontend_helper.php:845 +#: application/helpers/frontend_helper.php:844 msgid "The minimum number of files has not been uploaded." msgstr "" -#: application/helpers/frontend_helper.php:1334 +#: application/helpers/frontend_helper.php:1332 msgid "An unexpected error has occurred and your responses cannot be saved." msgstr "" -#: application/helpers/frontend_helper.php:1337 +#: application/helpers/frontend_helper.php:1335 msgid "Your responses have not been lost and have been emailed to the survey administrator and will be entered into our database at a later point." msgstr "" -#: application/helpers/frontend_helper.php:1342 +#: application/helpers/frontend_helper.php:1340 msgid "An error occurred saving a response to survey id" msgstr "" -#: application/helpers/frontend_helper.php:1343 +#: application/helpers/frontend_helper.php:1341 msgid "DATA TO BE ENTERED" msgstr "" -#: application/helpers/frontend_helper.php:1348 +#: application/helpers/frontend_helper.php:1346 msgid "SQL CODE THAT FAILED" msgstr "" -#: application/helpers/frontend_helper.php:1350 +#: application/helpers/frontend_helper.php:1348 msgid "ERROR MESSAGE" msgstr "" -#: application/helpers/frontend_helper.php:1352 +#: application/helpers/frontend_helper.php:1350 msgid "Error saving results" msgstr "" -#: application/helpers/frontend_helper.php:1359 +#: application/helpers/frontend_helper.php:1357 msgid "Try to submit again" msgstr "" -#: application/helpers/frontend_helper.php:1417 +#: application/helpers/frontend_helper.php:1415 msgid "Please confirm access to survey by answering the security question below and click continue." msgstr "" -#: application/helpers/frontend_helper.php:1441 +#: application/helpers/frontend_helper.php:1439 msgid "Security question:" msgstr "" -#: application/helpers/frontend_helper.php:1489 -#: application/helpers/frontend_helper.php:1651 +#: application/helpers/frontend_helper.php:1487 +#: application/helpers/frontend_helper.php:1649 #: application/views/entertoken_view.php:9 msgid "If you have been issued a token, please enter it in the box below and click continue." msgstr "" -#: application/helpers/frontend_helper.php:1494 -#: application/helpers/frontend_helper.php:1684 +#: application/helpers/frontend_helper.php:1492 +#: application/helpers/frontend_helper.php:1682 msgid "Token:" msgstr "" -#: application/helpers/frontend_helper.php:1519 -#: application/helpers/frontend_helper.php:1692 -#: application/helpers/replacements_helper.php:579 -#: application/helpers/replacements_helper.php:600 -#: application/helpers/replacements_helper.php:663 +#: application/helpers/frontend_helper.php:1517 +#: application/helpers/frontend_helper.php:1690 +#: application/helpers/replacements_helper.php:578 +#: application/helpers/replacements_helper.php:599 +#: application/helpers/replacements_helper.php:662 msgid "Security Question" msgstr "" -#: application/helpers/frontend_helper.php:1563 -#: application/helpers/frontend_helper.php:1608 +#: application/helpers/frontend_helper.php:1561 +#: application/helpers/frontend_helper.php:1606 msgid "The token you have provided is either not valid, or has already been used." msgstr "" -#: application/helpers/frontend_helper.php:1670 +#: application/helpers/frontend_helper.php:1668 msgid "Please confirm the token by answering the security question below and click continue." msgstr "" -#: application/helpers/frontend_helper.php:1799 +#: application/helpers/frontend_helper.php:1797 msgid "This survey does not yet have any questions and cannot be tested or completed." msgstr "" -#: application/helpers/frontend_helper.php:2209 -#: application/helpers/frontend_helper.php:2639 +#: application/helpers/frontend_helper.php:2207 +#: application/helpers/frontend_helper.php:2637 #: application/views/admin/templates/templateeditor_navigator_view.php:5 #: application/views/installer/dbconfig_view.php:87 #: application/views/installer/dbsettings_view.php:29 @@ -7033,9 +7061,9 @@ msgstr "" msgid "Previous" msgstr "" -#: application/helpers/frontend_helper.php:2216 -#: application/helpers/frontend_helper.php:2222 -#: application/helpers/frontend_helper.php:2227 +#: application/helpers/frontend_helper.php:2214 +#: application/helpers/frontend_helper.php:2220 +#: application/helpers/frontend_helper.php:2225 #: application/views/admin/participants/displayParticipants_view.php:114 #: application/views/admin/quotas/newanswer_view.php:33 #: application/views/admin/quotas/newanswertwo_view.php:45 @@ -7069,7 +7097,7 @@ msgstr "" #: application/helpers/qanda_helper.php:201 #: application/helpers/qanda_helper.php:202 -#: application/helpers/qanda_helper.php:1310 +#: application/helpers/qanda_helper.php:1311 msgid "Choose your language" msgstr "" @@ -7113,215 +7141,215 @@ msgstr "" msgid "seconds" msgstr "" -#: application/helpers/qanda_helper.php:1125 #: application/helpers/qanda_helper.php:1126 +#: application/helpers/qanda_helper.php:1127 msgid "Day" msgstr "" -#: application/helpers/qanda_helper.php:1142 #: application/helpers/qanda_helper.php:1143 +#: application/helpers/qanda_helper.php:1144 msgid "Month" msgstr "" -#: application/helpers/qanda_helper.php:1145 +#: application/helpers/qanda_helper.php:1146 msgid "Jan" msgstr "" -#: application/helpers/qanda_helper.php:1146 +#: application/helpers/qanda_helper.php:1147 msgid "Feb" msgstr "" -#: application/helpers/qanda_helper.php:1147 +#: application/helpers/qanda_helper.php:1148 msgid "Mar" msgstr "" -#: application/helpers/qanda_helper.php:1148 +#: application/helpers/qanda_helper.php:1149 msgid "Apr" msgstr "" -#: application/helpers/qanda_helper.php:1149 +#: application/helpers/qanda_helper.php:1150 msgid "May" msgstr "" -#: application/helpers/qanda_helper.php:1150 +#: application/helpers/qanda_helper.php:1151 msgid "Jun" msgstr "" -#: application/helpers/qanda_helper.php:1151 +#: application/helpers/qanda_helper.php:1152 msgid "Jul" msgstr "" -#: application/helpers/qanda_helper.php:1152 +#: application/helpers/qanda_helper.php:1153 msgid "Aug" msgstr "" -#: application/helpers/qanda_helper.php:1153 +#: application/helpers/qanda_helper.php:1154 msgid "Sep" msgstr "" -#: application/helpers/qanda_helper.php:1154 +#: application/helpers/qanda_helper.php:1155 msgid "Oct" msgstr "" -#: application/helpers/qanda_helper.php:1155 +#: application/helpers/qanda_helper.php:1156 msgid "Nov" msgstr "" -#: application/helpers/qanda_helper.php:1156 +#: application/helpers/qanda_helper.php:1157 msgid "Dec" msgstr "" -#: application/helpers/qanda_helper.php:1172 #: application/helpers/qanda_helper.php:1173 +#: application/helpers/qanda_helper.php:1174 msgid "Year" msgstr "" -#: application/helpers/qanda_helper.php:1283 +#: application/helpers/qanda_helper.php:1284 msgid "Date picker" msgstr "" -#: application/helpers/qanda_helper.php:1284 -#: application/helpers/qanda_helper.php:1291 +#: application/helpers/qanda_helper.php:1285 +#: application/helpers/qanda_helper.php:1292 #: application/views/admin/token/dummytokenform.php:38 #: application/views/admin/token/tokenform.php:148 msgid "Format: %s" msgstr "" -#: application/helpers/qanda_helper.php:1570 +#: application/helpers/qanda_helper.php:1571 msgid "Other answer" msgstr "" -#: application/helpers/qanda_helper.php:1923 +#: application/helpers/qanda_helper.php:1924 msgid "Please enter your comment here" msgstr "" -#: application/helpers/qanda_helper.php:2095 +#: application/helpers/qanda_helper.php:2096 msgid "First choice" msgstr "" -#: application/helpers/qanda_helper.php:2097 +#: application/helpers/qanda_helper.php:2098 msgid "Next choice" msgstr "" -#: application/helpers/qanda_helper.php:2793 +#: application/helpers/qanda_helper.php:2794 msgid "Upload files" msgstr "" -#: application/helpers/qanda_helper.php:2805 +#: application/helpers/qanda_helper.php:2806 msgid "Upload your files" msgstr "" -#: application/helpers/qanda_helper.php:2806 +#: application/helpers/qanda_helper.php:2807 msgid "Return to survey" msgstr "" -#: application/helpers/qanda_helper.php:2809 +#: application/helpers/qanda_helper.php:2810 msgid "File name" msgstr "" -#: application/helpers/qanda_helper.php:2985 -#: application/helpers/qanda_helper.php:3304 -#: application/helpers/qanda_helper.php:4535 -#: application/helpers/qanda_helper.php:6380 +#: application/helpers/qanda_helper.php:2986 +#: application/helpers/qanda_helper.php:3305 +#: application/helpers/qanda_helper.php:4536 +#: application/helpers/qanda_helper.php:6381 msgid "Error: This question has no answers." msgstr "" -#: application/helpers/qanda_helper.php:3447 +#: application/helpers/qanda_helper.php:3448 msgid "Only numbers may be entered in these fields" msgstr "" -#: application/helpers/qanda_helper.php:3486 +#: application/helpers/qanda_helper.php:3487 msgid "Remaining: " msgstr "" -#: application/helpers/qanda_helper.php:3494 +#: application/helpers/qanda_helper.php:3495 msgid "Total: " msgstr "" -#: application/helpers/qanda_helper.php:3696 #: application/helpers/qanda_helper.php:3697 -#: application/helpers/qanda_helper.php:3701 +#: application/helpers/qanda_helper.php:3698 +#: application/helpers/qanda_helper.php:3702 #: application/views/admin/dataentry/content_view.php:408 msgid "Only numbers may be entered in this field" msgstr "" -#: application/helpers/qanda_helper.php:3880 #: application/helpers/qanda_helper.php:3881 +#: application/helpers/qanda_helper.php:3882 msgid "Drag and drop the pin to the desired location. You may also right click on the map to move the pin." msgstr "" -#: application/helpers/qanda_helper.php:5107 -#: application/helpers/qanda_helper.php:5485 -#: application/helpers/qanda_helper.php:5841 -#: application/helpers/qanda_helper.php:5989 -#: application/helpers/qanda_helper.php:6609 +#: application/helpers/qanda_helper.php:5108 +#: application/helpers/qanda_helper.php:5486 +#: application/helpers/qanda_helper.php:5842 +#: application/helpers/qanda_helper.php:5990 +#: application/helpers/qanda_helper.php:6610 msgid "Error: There are no answer options for this question and/or they don't exist in this language." msgstr "" -#: application/helpers/qanda_helper.php:5758 +#: application/helpers/qanda_helper.php:5759 msgid "..." msgstr "" -#: application/helpers/qanda_helper.php:5983 +#: application/helpers/qanda_helper.php:5984 msgid "Error: There are no answers defined for this question." msgstr "" -#: application/helpers/replacements_helper.php:341 +#: application/helpers/replacements_helper.php:340 msgid "There are no questions in this survey" msgstr "" -#: application/helpers/replacements_helper.php:345 +#: application/helpers/replacements_helper.php:344 msgid "There is 1 question in this survey" msgstr "" -#: application/helpers/replacements_helper.php:349 +#: application/helpers/replacements_helper.php:348 msgid "There are {NUMBEROFQUESTIONS} questions in this survey." msgstr "" -#: application/helpers/replacements_helper.php:413 +#: application/helpers/replacements_helper.php:412 msgid "Exit and Clear Survey" msgstr "" -#: application/helpers/replacements_helper.php:414 +#: application/helpers/replacements_helper.php:413 msgid "Are you sure you want to clear all your responses?" msgstr "" -#: application/helpers/replacements_helper.php:443 -#: application/helpers/replacements_helper.php:447 -#: application/helpers/replacements_helper.php:467 +#: application/helpers/replacements_helper.php:442 +#: application/helpers/replacements_helper.php:446 +#: application/helpers/replacements_helper.php:466 msgid "Resume later" msgstr "" -#: application/helpers/replacements_helper.php:506 +#: application/helpers/replacements_helper.php:505 msgid "If you want to check any of the answers you have made, and/or change them, you can do that now by clicking on the [<< prev] button and browsing through your responses." msgstr "" -#: application/helpers/replacements_helper.php:513 -#: application/helpers/replacements_helper.php:522 +#: application/helpers/replacements_helper.php:512 +#: application/helpers/replacements_helper.php:521 msgid "Restart this Survey" msgstr "" -#: application/helpers/replacements_helper.php:531 +#: application/helpers/replacements_helper.php:530 msgid "To remain anonymous please use a pseudonym as your username, also an email address is not required." msgstr "" -#: application/helpers/replacements_helper.php:545 +#: application/helpers/replacements_helper.php:544 msgid "Return To Survey" msgstr "" -#: application/helpers/replacements_helper.php:565 +#: application/helpers/replacements_helper.php:564 msgid "Repeat Password" msgstr "" -#: application/helpers/replacements_helper.php:571 +#: application/helpers/replacements_helper.php:570 msgid "Your Email" msgstr "" -#: application/helpers/replacements_helper.php:586 +#: application/helpers/replacements_helper.php:585 msgid "Saved name" msgstr "" -#: application/helpers/replacements_helper.php:603 +#: application/helpers/replacements_helper.php:602 msgid "Load Now" msgstr "" @@ -7760,11 +7788,11 @@ msgstr "" msgid "Please be patient..." msgstr "" -#: application/helpers/update/updatedb_helper.php:388 +#: application/helpers/update/updatedb_helper.php:369 msgid "Moving user templates to new location at %s..." msgstr "" -#: application/helpers/update/updatedb_helper.php:1019 +#: application/helpers/update/updatedb_helper.php:1000 msgid "Database update finished (%s)" msgstr "" @@ -7912,10 +7940,10 @@ msgid "ID" msgstr "" #: application/views/admin/assessments_view.php:9 -#: application/views/admin/browse/browseallheader_view.php:78 -#: application/views/admin/browse/browsetimeheader_view.php:55 #: application/views/admin/participants/attributeControl_view.php:4 #: application/views/admin/participants/displayParticipants_view.php:93 +#: application/views/admin/responses/browseallheader_view.php:78 +#: application/views/admin/responses/browsetimeheader_view.php:55 #: application/views/admin/saved/savedlist_view.php:6 #: application/views/admin/survey/Question/answerOptions_view.php:77 msgid "Actions" @@ -7990,294 +8018,8 @@ msgstr "" msgid "Language" msgstr "" -#: application/views/admin/authentication/login.php:27 -msgid "Login" -msgstr "" - -#: application/views/admin/browse/browseallfiltered_view.php:11 -msgid "Showing Filtered Results" -msgstr "" - -#: application/views/admin/browse/browseallfiltered_view.php:12 -#: application/views/admin/labels/editlabel_view.php:3 -#: application/views/admin/participants/displayParticipants_view.php:105 -msgid "Close" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:2 -#: application/views/admin/browse/browsetimeheader_view.php:3 -msgid "Do you really want to delete this response?" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:3 -#: application/views/admin/browse/browsetimeheader_view.php:4 -msgid "Do you really want to delete all marked responses?" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:4 -msgid "Please select at least one file for deletion" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:5 -msgid "Please select at least one file for download" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:9 -#: application/views/admin/browse/browsetimeheader_view.php:8 -msgid "Data view control" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:15 -#: application/views/admin/browse/browsetimeheader_view.php:13 -#: application/views/admin/browse/browsetimeheader_view.php:14 -msgid "Show start..." -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:17 -#: application/views/admin/browse/browsetimeheader_view.php:16 -#: application/views/admin/browse/browsetimeheader_view.php:17 -msgid "Show previous.." -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:20 -#: application/views/admin/browse/browseidheader_view.php:33 -#: application/views/admin/browse/browseidheader_view.php:34 -#: application/views/admin/browse/browsetimeheader_view.php:20 -msgid "Show next..." -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:21 -#: application/views/admin/browse/browsetimeheader_view.php:21 -msgid "Show next.." -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:22 -#: application/views/admin/browse/browsetimeheader_view.php:23 -msgid "Show last..." -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:23 -#: application/views/admin/browse/browsetimeheader_view.php:24 -msgid "Show last.." -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:46 -#: application/views/admin/browse/browsetimeheader_view.php:31 -msgid "Records displayed:" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:47 -#: application/views/admin/browse/browsetimeheader_view.php:32 -msgid "Starting from:" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:48 -#: application/views/admin/browse/browsetimeheader_view.php:33 -msgid "Show" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:49 -msgid "Display:" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:50 -#: application/views/admin/export/exportresults_view.php:15 -#: application/views/admin/export/r_view.php:5 -#: application/views/admin/export/spss_view.php:6 -#: application/views/admin/export/statistics_view.php:30 -#: application/views/admin/export/vv_view.php:12 -msgid "All responses" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:51 -#: application/views/admin/export/exportresults_view.php:14 -#: application/views/admin/export/r_view.php:4 -#: application/views/admin/export/spss_view.php:5 -#: application/views/admin/export/statistics_view.php:31 -#: application/views/admin/export/vv_view.php:11 -msgid "Completed responses only" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:52 -#: application/views/admin/export/exportresults_view.php:16 -#: application/views/admin/export/r_view.php:6 -#: application/views/admin/export/spss_view.php:7 -#: application/views/admin/export/statistics_view.php:32 -#: application/views/admin/export/vv_view.php:13 -msgid "Incomplete responses only" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:110 -#: application/views/admin/browse/browsetimeheader_view.php:87 -msgid "Delete marked responses" -msgstr "" - -#: application/views/admin/browse/browseallheader_view.php:113 -msgid "Download marked files" -msgstr "" - -#: application/views/admin/browse/browseallrow_view.php:7 -#: application/views/admin/browse/browsetimerow_view.php:8 -msgid "Edit this response" -msgstr "" - -#: application/views/admin/browse/browseallrow_view.php:11 -msgid "Download all files in this response as a zip file" -msgstr "" - -#: application/views/admin/browse/browseallrow_view.php:15 -#: application/views/admin/browse/browsetimerow_view.php:12 -msgid "Delete this response" -msgstr "" - -#: application/views/admin/browse/browseallrow_view.php:26 -msgid "Edit this token" -msgstr "" - -#: application/views/admin/browse/browseidheader_view.php:2 -msgid "View response ID %d" -msgstr "" - -#: application/views/admin/browse/browseidheader_view.php:14 -#: application/views/admin/browse/browseidheader_view.php:15 -msgid "Delete this entry" -msgstr "" - -#: application/views/admin/browse/browseidheader_view.php:19 -msgid "You don't have permission to delete this entry." -msgstr "" - -#: application/views/admin/browse/browseidheader_view.php:23 -#: application/views/admin/browse/browseidheader_view.php:24 -msgid "Download files for this entry" -msgstr "" - -#: application/views/admin/browse/browseidheader_view.php:27 -#: application/views/admin/browse/browseidheader_view.php:28 -msgid "Export this Response" -msgstr "" - -#: application/views/admin/browse/browseidheader_view.php:31 -#: application/views/admin/browse/browseidheader_view.php:32 -msgid "Show previous..." -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:1 -msgid "Response summary" -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:3 -msgid "Total responses:" -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:5 -msgid "Full responses:" -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:6 -msgid "Incomplete responses:" -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:11 -#: application/views/admin/token/tokensummary.php:2 -msgid "Token summary" -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:12 -#: application/views/admin/token/tokensummary.php:8 -msgid "Total records in this token table" -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:14 -#: application/views/admin/token/tokensummary.php:24 -msgid "Total invitations sent" -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:15 -#: application/views/admin/token/tokensummary.php:40 -msgid "Total surveys completed" -msgstr "" - -#: application/views/admin/browse/browseindex_view.php:16 -#: application/views/admin/token/tokensummary.php:16 -msgid "Total with no unique Token" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:15 -msgid "Show summary information" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:19 -#: application/views/admin/browse/browsemenubar_view.php:24 -msgid "Display Responses" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:34 -msgid "Display Last 50 Responses" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:39 -msgid "Dataentry Screen for Survey" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:44 -msgid "Get statistics from these responses" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:48 -msgid "Get time statistics from these responses" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:55 -msgid "Export results to application" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:58 -msgid "Export results to a SPSS/PASW command file" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:61 -msgid "Export results to a R data file" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:68 -#: application/views/admin/dataentry/import.php:2 -msgid "Import responses from a deactivated survey table" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:75 -msgid "View Saved but not submitted Responses" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:80 -#: application/views/admin/dataentry/vvimport.php:4 -msgid "Import a VV survey file" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:85 -#: application/views/admin/export/vv_view.php:2 -msgid "Export a VV survey file" -msgstr "" - -#: application/views/admin/browse/browsemenubar_view.php:90 -#: application/views/admin/dataentry/iteratesurvey.php:1 -msgid "Iterate survey" -msgstr "" - -#: application/views/admin/browse/browsetimefooter_view.php:6 -msgid "Interview time" -msgstr "" - -#: application/views/admin/browse/browsetimefooter_view.php:9 -msgid "Average interview time:" -msgstr "" - -#: application/views/admin/browse/browsetimefooter_view.php:12 -msgid "Median:" -msgstr "" - -#: application/views/admin/browse/browsetimeheader_view.php:1 -msgid "Time statistics" +#: application/views/admin/authentication/login.php:27 +msgid "Login" msgstr "" #: application/views/admin/checkintegrity/check_view.php:2 @@ -8365,7 +8107,7 @@ msgid "The following answers should be deleted:" msgstr "" #: application/views/admin/checkintegrity/check_view.php:93 -#: application/views/admin/survey/Question/editQuestion_view.php:38 +#: application/views/admin/survey/Question/editQuestion_view.php:44 #: application/views/admin/survey/Question/questionbar_view.php:153 msgid "Code:" msgstr "" @@ -8595,6 +8337,11 @@ msgstr "" msgid "Record Deleted" msgstr "" +#: application/views/admin/dataentry/import.php:2 +#: application/views/admin/responses/browsemenubar_view.php:68 +msgid "Import responses from a deactivated survey table" +msgstr "" + #: application/views/admin/dataentry/import.php:7 msgid "Target survey ID:" msgstr "" @@ -8639,6 +8386,11 @@ msgstr "" msgid "Browse saved responses" msgstr "" +#: application/views/admin/dataentry/iteratesurvey.php:1 +#: application/views/admin/responses/browsemenubar_view.php:90 +msgid "Iterate survey" +msgstr "" + #: application/views/admin/dataentry/iteratesurvey.php:6 msgid "Answers and tokens have been re-opened." msgstr "" @@ -8671,6 +8423,11 @@ msgstr "" msgid "Reset answers and token completed state" msgstr "" +#: application/views/admin/dataentry/vvimport.php:4 +#: application/views/admin/responses/browsemenubar_view.php:80 +msgid "Import a VV survey file" +msgstr "" + #: application/views/admin/dataentry/vvimport.php:8 msgid "File:" msgstr "" @@ -8900,6 +8657,33 @@ msgstr "" msgid "Completion state" msgstr "" +#: application/views/admin/export/exportresults_view.php:14 +#: application/views/admin/export/r_view.php:4 +#: application/views/admin/export/spss_view.php:5 +#: application/views/admin/export/statistics_view.php:41 +#: application/views/admin/export/vv_view.php:11 +#: application/views/admin/responses/browseallheader_view.php:51 +msgid "Completed responses only" +msgstr "" + +#: application/views/admin/export/exportresults_view.php:15 +#: application/views/admin/export/r_view.php:5 +#: application/views/admin/export/spss_view.php:6 +#: application/views/admin/export/statistics_view.php:40 +#: application/views/admin/export/vv_view.php:12 +#: application/views/admin/responses/browseallheader_view.php:50 +msgid "All responses" +msgstr "" + +#: application/views/admin/export/exportresults_view.php:16 +#: application/views/admin/export/r_view.php:6 +#: application/views/admin/export/spss_view.php:7 +#: application/views/admin/export/statistics_view.php:42 +#: application/views/admin/export/vv_view.php:13 +#: application/views/admin/responses/browseallheader_view.php:52 +msgid "Incomplete responses only" +msgstr "" + #: application/views/admin/export/exportresults_view.php:21 msgid "Headings" msgstr "" @@ -9106,127 +8890,136 @@ msgstr "" msgid "Your data should be imported now" msgstr "" -#: application/views/admin/export/statistics_view.php:11 +#: application/views/admin/export/statistics_view.php:16 +#: application/views/admin/export/statistics_view.php:142 +#: application/views/admin/export/statistics_view.php:1292 +msgid "Maximize" +msgstr "" + +#: application/views/admin/export/statistics_view.php:16 +#: application/views/admin/export/statistics_view.php:142 +#: application/views/admin/export/statistics_view.php:1292 +msgid "Minimize" +msgstr "" + +#: application/views/admin/export/statistics_view.php:17 msgid "General filters" msgstr "" -#: application/views/admin/export/statistics_view.php:25 +#: application/views/admin/export/statistics_view.php:35 msgid "Data selection" msgstr "" -#: application/views/admin/export/statistics_view.php:28 +#: application/views/admin/export/statistics_view.php:38 msgid "Include:" msgstr "" -#: application/views/admin/export/statistics_view.php:36 +#: application/views/admin/export/statistics_view.php:46 msgid "View summary of all available fields" msgstr "" -#: application/views/admin/export/statistics_view.php:40 +#: application/views/admin/export/statistics_view.php:50 msgid "Count stats for each question based only on the total number of responses for which the question was displayed" msgstr "" -#: application/views/admin/export/statistics_view.php:40 +#: application/views/admin/export/statistics_view.php:50 msgid "Subtotals based on displayed questions" msgstr "" -#: application/views/admin/export/statistics_view.php:60 +#: application/views/admin/export/statistics_view.php:70 msgid "Statistics report language" msgstr "" -#: application/views/admin/export/statistics_view.php:70 +#: application/views/admin/export/statistics_view.php:80 msgid "Greater than:" msgstr "" -#: application/views/admin/export/statistics_view.php:74 +#: application/views/admin/export/statistics_view.php:84 msgid "Less than:" msgstr "" -#: application/views/admin/export/statistics_view.php:87 +#: application/views/admin/export/statistics_view.php:97 msgid "Equals:" msgstr "" -#: application/views/admin/export/statistics_view.php:91 +#: application/views/admin/export/statistics_view.php:101 msgid "Later than:" msgstr "" -#: application/views/admin/export/statistics_view.php:94 +#: application/views/admin/export/statistics_view.php:104 msgid "Earlier than:" msgstr "" -#: application/views/admin/export/statistics_view.php:105 +#: application/views/admin/export/statistics_view.php:115 msgid "Output options" msgstr "" -#: application/views/admin/export/statistics_view.php:108 +#: application/views/admin/export/statistics_view.php:118 msgid "Show graphs" msgstr "" -#: application/views/admin/export/statistics_view.php:114 +#: application/views/admin/export/statistics_view.php:124 msgid "Select output format" msgstr "" -#: application/views/admin/export/statistics_view.php:127 -#: application/views/admin/export/statistics_view.php:1245 +#: application/views/admin/export/statistics_view.php:136 +#: application/views/admin/export/statistics_view.php:1283 msgid "View stats" msgstr "" -#: application/views/admin/export/statistics_view.php:132 -msgid "Maximize" -msgstr "" - -#: application/views/admin/export/statistics_view.php:132 -msgid "Minimize" -msgstr "" - -#: application/views/admin/export/statistics_view.php:133 +#: application/views/admin/export/statistics_view.php:143 msgid "Response filters" msgstr "" -#: application/views/admin/export/statistics_view.php:250 -#: application/views/admin/export/statistics_view.php:366 +#: application/views/admin/export/statistics_view.php:287 +#: application/views/admin/export/statistics_view.php:403 msgid "Number greater than" msgstr "" -#: application/views/admin/export/statistics_view.php:256 -#: application/views/admin/export/statistics_view.php:372 +#: application/views/admin/export/statistics_view.php:293 +#: application/views/admin/export/statistics_view.php:409 msgid "Number less than" msgstr "" -#: application/views/admin/export/statistics_view.php:297 -#: application/views/admin/export/statistics_view.php:327 -#: application/views/admin/export/statistics_view.php:350 -#: application/views/admin/export/statistics_view.php:768 +#: application/views/admin/export/statistics_view.php:334 +#: application/views/admin/export/statistics_view.php:364 +#: application/views/admin/export/statistics_view.php:387 +#: application/views/admin/export/statistics_view.php:805 msgid "Responses containing" msgstr "" -#: application/views/admin/export/statistics_view.php:390 +#: application/views/admin/export/statistics_view.php:427 msgid "Number of files greater than" msgstr "" -#: application/views/admin/export/statistics_view.php:396 +#: application/views/admin/export/statistics_view.php:433 msgid "Number of files less than" msgstr "" -#: application/views/admin/export/statistics_view.php:441 +#: application/views/admin/export/statistics_view.php:478 msgid "Date (YYYY-MM-DD) equals" msgstr "" -#: application/views/admin/export/statistics_view.php:447 +#: application/views/admin/export/statistics_view.php:484 msgid "Date is" msgstr "" -#: application/views/admin/export/statistics_view.php:453 +#: application/views/admin/export/statistics_view.php:490 msgid "AND/OR Date is" msgstr "" -#: application/views/admin/export/statistics_view.php:1065 -#: application/views/admin/export/statistics_view.php:1151 +#: application/views/admin/export/statistics_view.php:1102 +#: application/views/admin/export/statistics_view.php:1187 #: application/views/admin/survey/Question/answerOptions_view.php:18 #: application/views/admin/survey/Question/subQuestion_view.php:5 msgid "Label" msgstr "" +#: application/views/admin/export/vv_view.php:2 +#: application/views/admin/responses/browsemenubar_view.php:85 +msgid "Export a VV survey file" +msgstr "" + #: application/views/admin/export/vv_view.php:5 msgid "Export survey" msgstr "" @@ -9731,6 +9524,12 @@ msgstr "" msgid "Close Editor" msgstr "" +#: application/views/admin/labels/editlabel_view.php:3 +#: application/views/admin/participants/displayParticipants_view.php:105 +#: application/views/admin/responses/browseallfiltered_view.php:12 +msgid "Close" +msgstr "" + #: application/views/admin/labels/editlabel_view.php:4 #: application/views/admin/labels/labelsetsbar_view.php:36 msgid "Create or import new label set(s)" @@ -10060,7 +9859,7 @@ msgstr "" msgid "Visible in participants panel" msgstr "" -#: application/views/admin/participants/attributeControl_view.php:10 +#: application/views/admin/participants/attributeControl_view.php:21 #: application/views/admin/participants/participantsPanel_view.php:55 #: application/views/admin/participants/participantsPanel_view.php:56 msgid "Attribute management" @@ -10144,7 +9943,7 @@ msgid "Processing..." msgstr "" #: application/views/admin/participants/attributeMapCSV_view.php:79 -#: application/views/admin/survey/Question/editQuestion_view.php:226 +#: application/views/admin/survey/Question/editQuestion_view.php:232 #: application/views/admin/translate/translatetabs_view.php:9 msgid "Loading..." msgstr "" @@ -10901,6 +10700,237 @@ msgstr "" msgid "Not Active" msgstr "" +#: application/views/admin/responses/browseallfiltered_view.php:11 +msgid "Showing Filtered Results" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:2 +#: application/views/admin/responses/browsetimeheader_view.php:3 +msgid "Do you really want to delete this response?" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:3 +#: application/views/admin/responses/browsetimeheader_view.php:4 +msgid "Do you really want to delete all marked responses?" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:4 +msgid "Please select at least one file for deletion" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:5 +msgid "Please select at least one file for download" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:9 +#: application/views/admin/responses/browsetimeheader_view.php:8 +msgid "Data view control" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:15 +#: application/views/admin/responses/browsetimeheader_view.php:13 +#: application/views/admin/responses/browsetimeheader_view.php:14 +msgid "Show start..." +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:17 +#: application/views/admin/responses/browsetimeheader_view.php:16 +#: application/views/admin/responses/browsetimeheader_view.php:17 +msgid "Show previous.." +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:21 +#: application/views/admin/responses/browsetimeheader_view.php:21 +msgid "Show next.." +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:23 +#: application/views/admin/responses/browsetimeheader_view.php:24 +msgid "Show last.." +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:46 +#: application/views/admin/responses/browsetimeheader_view.php:31 +msgid "Records displayed:" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:47 +#: application/views/admin/responses/browsetimeheader_view.php:32 +msgid "Starting from:" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:48 +#: application/views/admin/responses/browsetimeheader_view.php:33 +msgid "Show" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:49 +msgid "Display:" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:110 +#: application/views/admin/responses/browsetimeheader_view.php:87 +msgid "Delete marked responses" +msgstr "" + +#: application/views/admin/responses/browseallheader_view.php:113 +msgid "Download marked files" +msgstr "" + +#: application/views/admin/responses/browseallrow_view.php:7 +#: application/views/admin/responses/browsetimerow_view.php:8 +msgid "Edit this response" +msgstr "" + +#: application/views/admin/responses/browseallrow_view.php:11 +msgid "Download all files in this response as a zip file" +msgstr "" + +#: application/views/admin/responses/browseallrow_view.php:15 +#: application/views/admin/responses/browsetimerow_view.php:12 +msgid "Delete this response" +msgstr "" + +#: application/views/admin/responses/browseallrow_view.php:26 +msgid "Edit this token" +msgstr "" + +#: application/views/admin/responses/browseidheader_view.php:2 +msgid "View response ID %d" +msgstr "" + +#: application/views/admin/responses/browseidheader_view.php:14 +#: application/views/admin/responses/browseidheader_view.php:15 +msgid "Delete this entry" +msgstr "" + +#: application/views/admin/responses/browseidheader_view.php:19 +msgid "You don't have permission to delete this entry." +msgstr "" + +#: application/views/admin/responses/browseidheader_view.php:23 +#: application/views/admin/responses/browseidheader_view.php:24 +msgid "Download files for this entry" +msgstr "" + +#: application/views/admin/responses/browseidheader_view.php:27 +#: application/views/admin/responses/browseidheader_view.php:28 +msgid "Export this Response" +msgstr "" + +#: application/views/admin/responses/browseidheader_view.php:31 +#: application/views/admin/responses/browseidheader_view.php:32 +msgid "Show previous..." +msgstr "" + +#: application/views/admin/responses/browseidheader_view.php:33 +#: application/views/admin/responses/browseidheader_view.php:34 +#: application/views/admin/responses/browsetimeheader_view.php:20 +msgid "Show next..." +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:1 +msgid "Response summary" +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:3 +msgid "Total responses:" +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:5 +msgid "Full responses:" +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:6 +msgid "Incomplete responses:" +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:11 +#: application/views/admin/token/tokensummary.php:2 +msgid "Token summary" +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:12 +#: application/views/admin/token/tokensummary.php:8 +msgid "Total records in this token table" +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:14 +#: application/views/admin/token/tokensummary.php:24 +msgid "Total invitations sent" +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:15 +#: application/views/admin/token/tokensummary.php:40 +msgid "Total surveys completed" +msgstr "" + +#: application/views/admin/responses/browseindex_view.php:16 +#: application/views/admin/token/tokensummary.php:16 +msgid "Total with no unique Token" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:15 +msgid "Show summary information" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:19 +#: application/views/admin/responses/browsemenubar_view.php:24 +msgid "Display Responses" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:34 +msgid "Display Last 50 Responses" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:39 +msgid "Dataentry Screen for Survey" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:44 +msgid "Get statistics from these responses" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:48 +msgid "Get time statistics from these responses" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:55 +msgid "Export results to application" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:58 +msgid "Export results to a SPSS/PASW command file" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:61 +msgid "Export results to a R data file" +msgstr "" + +#: application/views/admin/responses/browsemenubar_view.php:75 +msgid "View Saved but not submitted Responses" +msgstr "" + +#: application/views/admin/responses/browsetimefooter_view.php:6 +msgid "Interview time" +msgstr "" + +#: application/views/admin/responses/browsetimefooter_view.php:9 +msgid "Average interview time:" +msgstr "" + +#: application/views/admin/responses/browsetimefooter_view.php:12 +msgid "Median:" +msgstr "" + +#: application/views/admin/responses/browsetimeheader_view.php:1 +msgid "Time statistics" +msgstr "" + +#: application/views/admin/responses/browsetimeheader_view.php:23 +msgid "Show last..." +msgstr "" + #: application/views/admin/saved/savedbar_view.php:3 msgid "Saved Responses" msgstr "" @@ -11157,7 +11187,7 @@ msgid "Add a new question" msgstr "" #: application/views/admin/survey/Question/editQuestion_view.php:13 -#: application/views/admin/survey/Question/editQuestion_view.php:242 +#: application/views/admin/survey/Question/editQuestion_view.php:247 msgid "Copy question" msgstr "" @@ -11165,115 +11195,116 @@ msgstr "" msgid "Edit question" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:34 +#: application/views/admin/survey/Question/editQuestion_view.php:35 msgid "Error: You have to enter a question code." msgstr "" #: application/views/admin/survey/Question/editQuestion_view.php:38 +#: application/views/admin/survey/Question/editQuestion_view.php:255 +msgid "Save and close" +msgstr "" + +#: application/views/admin/survey/Question/editQuestion_view.php:44 msgid "Note: You MUST enter a new question code!" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:40 -#: application/views/admin/survey/Question/editQuestion_view.php:42 -#: application/views/admin/survey/Question/editQuestion_view.php:64 -#: application/views/admin/survey/Question/editQuestion_view.php:66 -#: application/views/admin/survey/Question/editQuestion_view.php:84 -#: application/views/admin/survey/Question/editQuestion_view.php:86 +#: application/views/admin/survey/Question/editQuestion_view.php:46 +#: application/views/admin/survey/Question/editQuestion_view.php:48 +#: application/views/admin/survey/Question/editQuestion_view.php:70 +#: application/views/admin/survey/Question/editQuestion_view.php:72 +#: application/views/admin/survey/Question/editQuestion_view.php:90 +#: application/views/admin/survey/Question/editQuestion_view.php:92 #: application/views/admin/survey/Question/questionbar_view.php:166 msgid "Question:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:97 +#: application/views/admin/survey/Question/editQuestion_view.php:103 msgid "Question Type:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:110 -#: application/views/admin/survey/Question/editQuestion_view.php:131 -#: application/views/admin/survey/Question/editQuestion_view.php:153 +#: application/views/admin/survey/Question/editQuestion_view.php:116 +#: application/views/admin/survey/Question/editQuestion_view.php:137 +#: application/views/admin/survey/Question/editQuestion_view.php:159 msgid "Cannot be changed (survey is active)" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:121 -#: application/views/admin/survey/Question/editQuestion_view.php:130 +#: application/views/admin/survey/Question/editQuestion_view.php:127 +#: application/views/admin/survey/Question/editQuestion_view.php:136 msgid "Question group:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:136 +#: application/views/admin/survey/Question/editQuestion_view.php:142 #: application/views/admin/survey/Question/questionbar_view.php:210 msgid "Option 'Other':" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:159 +#: application/views/admin/survey/Question/editQuestion_view.php:165 #: application/views/admin/survey/Question/questionbar_view.php:225 msgid "Mandatory:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:172 +#: application/views/admin/survey/Question/editQuestion_view.php:178 #: application/views/admin/survey/Question/questionbar_view.php:239 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:40 #: application/views/admin/survey/QuestionGroups/editGroup_view.php:36 msgid "Relevance equation:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:177 +#: application/views/admin/survey/Question/editQuestion_view.php:183 #: application/views/admin/survey/Question/questionbar_view.php:182 msgid "Validation:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:186 +#: application/views/admin/survey/Question/editQuestion_view.php:192 msgid "Position:" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:188 +#: application/views/admin/survey/Question/editQuestion_view.php:194 msgid "At end" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:189 +#: application/views/admin/survey/Question/editQuestion_view.php:195 msgid "At beginning" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:207 +#: application/views/admin/survey/Question/editQuestion_view.php:213 msgid "Copy subquestions?" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:211 +#: application/views/admin/survey/Question/editQuestion_view.php:217 msgid "Copy answer options?" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:215 +#: application/views/admin/survey/Question/editQuestion_view.php:221 msgid "Copy advanced settings?" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:224 +#: application/views/admin/survey/Question/editQuestion_view.php:230 msgid "Show advanced settings" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:224 +#: application/views/admin/survey/Question/editQuestion_view.php:230 msgid "Hide advanced settings" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:235 +#: application/views/admin/survey/Question/editQuestion_view.php:240 msgid "Add question" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:248 -msgid "Update question" -msgstr "" - -#: application/views/admin/survey/Question/editQuestion_view.php:261 +#: application/views/admin/survey/Question/editQuestion_view.php:268 msgid "...or import a question" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:265 +#: application/views/admin/survey/Question/editQuestion_view.php:272 msgid "Select LimeSurvey question file (*.lsq/*.csv)" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:269 +#: application/views/admin/survey/Question/editQuestion_view.php:276 #: application/views/admin/survey/QuestionGroups/addGroup_view.php:59 msgid "Convert resource links?" msgstr "" -#: application/views/admin/survey/Question/editQuestion_view.php:274 +#: application/views/admin/survey/Question/editQuestion_view.php:281 #: application/views/admin/survey/Question/import_view.php:1 msgid "Import Question" msgstr "" @@ -11282,20 +11313,24 @@ msgstr "" msgid "Edit default answer values" msgstr "" -#: application/views/admin/survey/Question/editdefaultvalues_view.php:30 -#: application/views/admin/survey/Question/editdefaultvalues_view.php:74 +#: application/views/admin/survey/Question/editdefaultvalues_view.php:31 +#: application/views/admin/survey/Question/editdefaultvalues_view.php:75 msgid "Default answer for scale %s:" msgstr "" -#: application/views/admin/survey/Question/editdefaultvalues_view.php:30 +#: application/views/admin/survey/Question/editdefaultvalues_view.php:31 msgid "Default answer value:" msgstr "" -#: application/views/admin/survey/Question/editdefaultvalues_view.php:54 +#: application/views/admin/survey/Question/editdefaultvalues_view.php:55 msgid "Default value for option 'Other':" msgstr "" -#: application/views/admin/survey/Question/editdefaultvalues_view.php:165 +#: application/views/admin/survey/Question/editdefaultvalues_view.php:154 +msgid "Default value:" +msgstr "" + +#: application/views/admin/survey/Question/editdefaultvalues_view.php:169 msgid "Use same default value across languages:" msgstr "" @@ -12008,6 +12043,11 @@ msgstr "" msgid "Response rate" msgstr "" +#: application/views/admin/survey/listSurveys_view.php:28 +#: application/views/admin/survey/listSurveys_view.php:34 +msgid "Any" +msgstr "" + #: application/views/admin/survey/newSurvey_view.php:10 msgid "Create, import, or copy survey" msgstr "" @@ -12871,6 +12911,18 @@ msgstr "" msgid "Are you sure you want to delete the selected entries?" msgstr "" +#: application/views/admin/token/actions.php:19 +#: application/views/admin/token/actions.php:20 +#: application/views/admin/token/browse.php:69 +msgid "Send invitation emails to the selected entries (if they have not yet been sent an invitation email)" +msgstr "" + +#: application/views/admin/token/actions.php:23 +#: application/views/admin/token/actions.php:24 +#: application/views/admin/token/browse.php:70 +msgid "Send reminder email to the selected entries (if they have already received the invitation email)" +msgstr "" + #: application/views/admin/token/addtokenpost.php:1 #: application/views/admin/token/tokenform.php:13 #: application/views/admin/token/tokenform.php:178 diff --git a/locale/cs/LC_MESSAGES/cs.mo b/locale/cs/LC_MESSAGES/cs.mo index 6340b0e8b4821871c78f2018d2df252d335ac784..44ef55c60b70de021b6bec204daa7e2b17c22004 100644 GIT binary patch delta 54373 zcmYJ+cl^%P-@x(fJCMDS?61A|-h0o?GO{8>l7xy2r8Ll>qN4RnMYPdUltQwiQbM9M zk+ivAuj`!0 z_Wu^5_#gG6Sm5>WTor6gy(3n@Sy%&~#Gbed+heKqi9{BT#11$QYvG4jK9NW!&QWN` zh2k3$iDozqv+!ZO1~;MutGF?dsD$mX0glJQxB?5}%SeNX_v8KVu_pCWZ-jw%$AQ#u z#e8@Wi_?GNB!xU&$b6HBu^2fJVq>XXohZ$)RY6dm}}=n}nzIq`k; zxlhm;AHnOe@jHn`WqcOxcejqD&}UO3F$7=6CYbMCu3=}ajSpjE{0NNx>OBg?6wWo$+?`!NXVw|3F`; z@GsBI<{b*#? zpfh?m*7u>$e}@j}9A?ABM}!r!V=tV6PT)h#z};vve~OhcbDO)2^{+v}5MPdlurBr1(JAQrPoYclDb~lo&~|F>2q)qoba(v^-A!L(efm#a@^R>( z8=6E@uo))N7v4Ze{2S)N5<5e~mC&{CgVpgGbYKs~>)Wsz^=~l;=Kmx_vM9EqUJa8o zD2%6Ihu>g!EVU~nTLtvRR=5B=VRPJt4lMWX5TOoe1g7E`d>SWUu07$*pN6ja8)&ZV zLi;(shxq5A@DmsE;$N5#bLz68DA3iD%+SRabMHvt{s^k@=&?hZ6!51|LpCNxrq zu|NKeEwT4L;%{;++!sc49~$C^@gjT*bK@E;i5u`H+>Z^g&!^$rFdsX3A3do4!-m*@ ze~8dsSfBbvtc^dTOI9j*AgobWti^>JqEF#q>U+@$)ch>WtT~$P-LWWMhL_-Yblc5A zBd`*EZyjEWZ^!EgumJTFXatjgP_Ti_&qH#QK-Z>LtT#mOcZv1kco+5S(T4tu=KCT< zs!X&xI-tgAM+4DzN2Bdc2-lN|xfC4nBD@$^pgHhLyuKL=QQsS{ACK41Ml%nFNL`Hm zcy2QK{1&_v4`31e6^(GVFT;{Iz)bgl6AE_N5*uO~4x(BwOf z1@SK|in+fEKSau73F@6O6Gx->$Hn_|th@i8reFhap`rN%?f5vlhQCJtLkF7sP?%Zq zXnpkH>4AoLN^}OAyh${v??xl?AUctCm^36GP$-3Gu{##}It=Ja>_PoHG^B5%4emx8 z`U;J}?`VVnp#v^_I9L{4+S-_ft+6!365i4Non%)-%F9&f{D_$)fJW9X9pfG*9yn1yAJg^t^yksF+(U}#6-3Y>=J z@ZxXz#fy#6wHt;laU9mhXV6F;KtuX7`rJjwLvj{I2V4amaD#Zg75ZF1bjgxeQg8q_ zpby@GHh3Qzfi-9dKSkFv{X`gfAuLV3I99}_=&l%!W$}i1|3Ne-Uc)-L1x@0!Sf2h9 z8Q+D5Dq|&XbV3I(2@B%_wBbiF8@_}#upS-IR!l_#ozc(O0W-c&BxYk5bo+jYlkhCs z&Zv`abJl-cszB(`9GHi8`~bR!tD+k*JM|ryiF?rye}*=A3?0}>%z=NR14{f5?q7mA zsg^|VSHg?vKT(TMK}^2;DlJ88J&lDxPEu^ zVXRO6f7k%Oz#*9LXW~DA!i1m08oi6|%b(F1XZt0b*`=``^`6)ZpFo%36dK~+(HZ9c zHN0O8&6&EGA3I@g9Ec@x6#9JfSK{wX7sdx3k2ls}8Lq#9hWa47_CKNxoWa_d|5Vr= ztuCDt>33mq55=3K9jZpX>!jPHxCL?e=XfkGCAjcC#wL}&6B=E8z!!;DIz zGjD`0O+PdTCZgFq4Ljp3^q~3xooUAJA;LMMC9xpaYvaZ4|F#s|?*q{hO^FZ8LL;yk z&GHA)0lg6KZ@?ndw_`p$f=1?7w1W%i01KWAxm6q=pxzm6?@KJ|{y#&Z02gxo5e8BM z8&YqCHZ&0p-RxMuC%PhDe-Zt9zJs>&RlNQ))};OqnhRC`3`yG&jbJy-MgNJ>6rB0B zUcj3$56+L*?~nBrXsB1C9la9ozaQO=zV{Uxk(1~-@+bOy`d^`57&EAs!qomROTn4e z$70wKFU8?#gER1pGzNszari%+-T2wR9IyD#f1$w+7eb`EprId#4tO})-qlzP=b#Z; zeu4O#RIhWP2<}7I@FWhyztE8nN~EP67oCYVbQhXCPorzP37yCREQ{Y`ZOoOHmKsnq zG^g65OWG|hnU>l{mvg}-n1~K!22Q|5vHlkprJg@MEw$E_(E)TsBQzWxz(j0@x1s}o z2Yqi>y#5{br(P~2JU2Z_!I8X-hU8te;jhqvoI_`nCo@bgJb=AwBtL_ z_8!JU_$n6057CK!i4HvZ9R&w)7As(SwzSk)T^XxUAAIwC2r=zB6P;NE=o(CTv=F$`cSNn3(?4I zL`S|49rzJ6+kZi4{2w~tVmU)cEzl(yi8b+2G#R&JBlrI?3N~0gS6b@xSQ*<=?~Pu+ z4;{z~Y=FDa?9R*`I?9V?c^x$LP0)dMMVD?g-ip)Ef&GOJykwrVM1J~DRHI;MnxSiR z85;Uw=*SnK1KEOExEuNDlsJv|V3E9Oi97L0G!ixPg#k9le$+c)Di_f6;8m=L?_jb9 zh0_!aaq0YFhTX6`^&~o@9oQPbLYJsyfwa`m?t1824vqD>m^z@aF4tc{bLKeuUPi&R z)NjRNSc!V;f@#UbXbNMw;I`O~Be6`OwAA&v=!}k|5ju-zbMC@vsUx~H8tVRNN7v#Y zya%1Yx9CTx&c&gfM(FFs5`W)Pc152kR4r8@4X{rASCRbKCfO_G4uJ1*c^769m z|LZACq|gWtqcggsTv+?A=+X>DXE+U=$t~y%7NRHNQgmrn#QRT2Uqd_EiY~=LG{V24 z?G-N1{&#y6FQ1mUfNk(ftq=yZ63x~F*Z}{*`dFu8TIy%@RnZmb_0Q29$WtjCK#gz` z^>OGx51_el7+tELE3yAQa{u6hS(;Hf9J%?>CFzQed?1=s*Ps!Yh33p6bcQR?Bzzff z#81%YI#vny2cq=}=&rgMJzo|jDR_ddMUTjj(6#*b!4G%^SswwDz??F3w z27P{Oy#F6i;i#uI`W;dehhu_Pc#CB zYlM!V!wNOS_Uer`v>5H+ zNp#KMLcgB7(SzzgG!i9ig@HCe547HB1gD_8X#twlPhbxEPi&=N_I~08Os^ddid^Wx z@}V;BlavBu{Y6(?niSbQ7`<4%&N!!H$*MD;0wdi z8D5XA@HVW8Td)?Mj`ghi;j`Kcv$%c(dSWg`pZ^4nZ9W<9VH_Qj4k6FcB0^kB(s7*5DqXby}-JD7&vpNFk+4cgI9=n|$k3K7hS=0Fyj zgiVta>~I)5;@i-*x(6N5L+DyQhBmYo9q?=M`Wvyn10Be2bO{fk?R zErRA$vMdGHtTq~w&S*9dMF(~>_Q5ByCH{u4Y27AaM%~c?jzUksspwI=7#;A#=)_i{ z16YMVzaD8PnfNH)_y!Hl8T7^6O~VU?&?P8`S$H)Xx&>&itigu(PP~2=JwY#R7T#}* z=GbLu5>7=2x*~O-{r5(^upJ%g33ONdf=1*&G_-}9hczyPMxZNJ#?k05xf^}{p?H4{ z`rcM_|L;R5_yhX;BBKRM;Qp^f!L@D>ZHCUU4LXpk(35W}I^#uH0Ut-#@B=iY`_QEP z7G3*4(MV>r4EJ-P11%Bjl`-kanouwYdZQ7z8ePN5Xah6QBub(KxgSlk7jSSIYl%-` zq1GWeUvCp;`X)NDPtkS`qWv93-~Y1>``>+?-ZrdBU9^Lq=z%g0JsEGu!T1I`up;e3 z!=G zP%`mPyiluW2z^&HyN96-%|rL^6KJTnphxR|bO1kM9lWSl*bPn5rRt0hU@&^{T#qi@ zyyyxn<)8oGh!1>@uJ!k54qS-!!o5Si8hXDK+Ry-W4X2<cMyLgPAYF;(#O-K@ zUtkmb4~=M}zTsdRfJr+TMZqSiGb@3^sF%g|n8dcY1)E{E0U?>%paUF%HgsF8 zKaYK=e}Y}G%)oG%jmY+h<5lXnj?qMZ^X}N1pYxkKKZT)14`DVV8hMP8FfNKbS3)rnuL!0 zCUi}2i}hvb+CGI2Xg#`=TjKp4@&0}^awpMq-~!rT89p35pG;Jv(3lJLus%*elWYZ6 z$G6aqzehv%AG!pW3<)8wjGh-Yu^RTpOq_*AU>-V=`_X}{L?iwh=5qgkNWpEf7Y*HM zbjE+9+cI-#7(fYhMpofF`2@nj5_*`VczvC$TTCiC#cw)^~W=JtNWj7<586pdBwjBlzI(xc^sj z!L?e24q!c+&D+uKcpST8juByCm!Y{a8f|bfHo(Ww8SX{b{C70z(np2?mBTFRmC*a0 zM6#C6*hAz=a zbmj}uZTkqCYip2xlZovVoYALfN8h6n_!~V~@{bK8ErHgv&<1Ou?={18?1g6kWoRU3 zqWk@RY=Y0C$#@j~mYl-;?*HmnhX$IvBu9?RkeG_nWd{cmIa^fl~%v-lq_IFP~aB(V4bJ z*Qy`7Pp?9^(;a9oJcMqmSJ89f6U@Ss=zF=Qgou_vBUK(UjU&=mY3lKZu6(9lQ)b!kSq8`n1G**afe_TvO9h|5WUaIG+0V=+gAPA($LN z!EC-3+u~DbsE%Vp%s(ysr0R&CY!6~9Jc`vZ>&EbW4|JQ|h|Y8!R>Y668vcSVX|d@c zXG&uY_kTkQhHMlXnyKhEx;0*38hs{SUynAp4Ly3#qVN41>v?8`CA%0sz#5}V&=Q?_ zw^+X%v%CMtQ1C3Dh#nBr&>7r@4&*WHfa|aip2e=%ac2160~Vu^`5Nu8>P?}&+L()a z6Le|Y$9iW>EdgHQ_kRQhvwu3epKnE9ScWdmV`%91q67L2UHg;h%zr~8k#TcK%G~Hg zDqK$=#m}B?pR<}$f2RL*#Dil@CX;$;5Rr4%g+u+>wQ?0`Z_f9hvM~GY+EDK z1AE}y_!<8M9oPY!i$}05j+zrDcpEmQ{u=uJuXA|7kye-+{)fY+(fe=;*H2K%`q;QqaBY$ zJH88@(K@t&&#-VBf2zgC)Dw4x{oVvk+9~L+xdR>8!7H$^ z`+oujx5aF9g!iH!hgIlEw?)98E`xVg~=zzXA0dK>(*dMbm3fprCdX!&-wz~wK z;47G&{uBEtc%*)X4y455U`=#8wMIMWhGzFjG{o0nN1Pw;??7kx4Z0*b?+x#lL67Qc zXha60_a|d&|Ier3T0eu%_!Df1zhDcja9=n=N1`2Hi#D(TozaR|e;Yj?_C>!!&xhma z#Qux*{P&076_xL2|J!l1cwrR!`JIM#a3}iWO7w($3H?FxHoBd5qaA*YXr3eQqB5UUGT7upYCxunP_4saP-ka7ela(N^e^bwQK! zI&>g6qo3J(VtpC9bk9fMLI?0ktRF|7PbU7LU{Yl+3u{~&9dR|ZgC>|A+oL(r4c&Gl z&<1Zum*g=tyI(?=W;^<;`Y`(bKWGl5FAx3X!W{1ZODGts(y0rqNqnGTyxtb;a=#DS z!8~-0A3?t%7 z>!X`-5cQpCa#egZEKvt^m-IrDc`%wYqtOXYjrDo4em^Enh9@YvRvY7u9hgck^qcTw ztml6$%p?oFUm1PBNv!ulLq8IY)Q#wQvN+b)q3wNy4(zAL*#8#(<$@#3vmz}q3rk>g zT!yaMe(ZvW(B!MMGK8`hnhWF6Y+j7*aSht>DKruV9uNDy7#is^SQG0#o(v6+;DR$+ zfJR~&*2mT8k$V`O(aC7~6CuJ?7oxjhZM^>)I-%s- z6wKBG=m?LY+wm+K+I&xk1E~Qz!@lVGFadpjAv(|%=#sq?um6osEcgGy5@bcIqSxyo zOOZ@;rci|ogVA5Px1uvxfEjo%I-n)-{#rD|ub=~X4_(u}=q@>q=F+L?1vJ$8o(b<& zLPtHN66MbCkv zXl~WV>#!rH_W$b?Oo}aDz@2Ev2eBHSLOUq&Y*^zO=uF$7Gw+T@!<1a?9{>#NY`KR_e?Rg!`sJ&h*e-{_0yqxsf`B`A${PzlYEX3@@Q za`i_;ejWP$JZy~jV-{{lBmE;9(PHbu#FMQkIHE4-fiN5m*$i~%E3qMdh{N$ebmYTc z3|^1^l)3|5vV~Y4m!V7cHkt#6;{Bh{bL3Ao-I*cv@(hNDX}4;$be zXei%8BXJO2ito_m`VXCHftSN`txoA0Mr?|AV@~={d_cj5ccC*mi8gov z9a!$yLj6*-UIAU>y68aKqHEt54eeFf0&hVFxDj2F!&yZ$Xz}AG(x3#OuGVXa76m3-LnH z4I$erqia+fJ&>BB2TTXF!|rHDLof@ki}m}W&!AcUCi>nHw7u^z3s0l(7uv}FcdaXL z3?pubMq&uA!sXZ;+r1HzXEwH>z7hR8{*CUItT)4U>x|>6C((9KVt34ZD$)9-{FIf_Q;XH4yeSTC?C zEMXSfPb2iXaw=dMF%nnXjr93AKr(dW?T zUqbtN3+;F((qA%hh=R#+Dn5|oy>KF4iiWr>_QcNE5tm|X{1UUU#O4sO7HG$pqbKSJ zw4?Fpz-FQ+=$z=1l_;S?q@8a3W^l zVjP4Ipac669l&qs^EuvUVDA5_6kOvvXjZmD50HN7z$RlIoQWRA&!eF{f)4aF8shWl zw#)fJI1kF9yQ=}(ZVz-DkBs%{m@LDEdnokBHR#%>Z4DzWfM$OMbU-7}pV_yd4KG7O z{8IEiG(vmOCH)gSWBw0A$Ai!TPeSkC^dbA-lj}Y%co02>F2URA47Z{85279ageGau zkHX*Sl*F3U$6^g!f}XMH_qt ztKbJ{!@r;d`Um|Z*rnUU8aGCBqIIlyL7(e`c0384;4Cyp?o3i}Mhnq~A4g~Y0=g9M zpvkin4cUIQp`Xx!{flnDd^BMl>lGqR%~qo)gca-+-;?3^R9z`vuUB%c7B~k504&@?0{}m4Y)JfPNgV zLbuy^Y=VpND1L-n@cBZj(8N-rM?au z;8CpS_y3Z;X^Drq&=srUH|UFb_oXGKVq-KXR-=*Ff%Whotb?^a4cl%w8uA&~0v|_n z<`CAv?EAy#xIPZ1J{+&7|HK;FYn)Mw%d+=t206dD{1N9@CRHT4rX4SRhVX8Jz5wtrw- zZ1`2!e$%lx_4m*S6+A>zrSroCjo{^n=>X@UyCnTc`1xHHy}$Yh`@a)~{ao;XDS0$x za}zX+`=KY+G&K3{MxTEYJL5^Lj&;8YGaH6x^?K}vU!xsWJr?TyupRXk=!A|QWB+@h z%(vlRJQ#&G_#PU8pV90deLU>rx#)qj0*%DSXwKw25klS+U5cr(z8)JA{_Q!pE!!y%aYQ%J56X!b5ZufG({`*Zk(G#-uIvuGrK#I0EK zm#_q9u|D+@zlPn=8=F(V2OZEy!DJ%+R9a#z7h0g9eG1(!d+=5~k0Wv3>Co}F=>76% zLPLGfZF(0P`txXe?S2a#KZg$V1P;QgXVVh%a4t4AJu`m~Yu*Z7%L(Yrm!jWL?nKTp8)9 zfpo%J)F)sGT!y*uH7tnlqMzlx8Oik28vn`#*E&aLdTM56(1WBY`rrsO^s~^9)x(${ zS7A0>k4E5a^q@M5KL00XV&QDzxl1uS_0nh#R7_GBO<_Kc$CGG-{j#U0K9^UZp&EsS zaXH%XT69L+&9pK zJ?OyRiN23{sBcF*{0uANPw{%8i^BCXXha&IM|pR2z$1|e^56fVVCe2cm*BPNPW0F8 zarERmj}9m+XNW{y^!bixB!;1p8HYLWR&)vPM&ElG9q<-(pt~`r`~MsTvpSJ0J(Y|# z&`^&=M>-8{a4CAyJ%&c&FdD++=x+E8Gca%NkQ)Wjj>}>-tcUh93{Ap2F(3UW9-(j% zK94r|3fka%n1x@WC)mGeF0{@QvVS_-@DtIGF(>suqG@^4Q$NLWqrWkWMysLyw8Ydu z|KFX0GaZF?JP%!xN6{DGMMJy~&5^IsH9wBd@NaZRx$}jYmqOpG8Eu2!?}wfbW6+4M z%g6q=!S!4)E8juaXlJY+L|;6Ko`C10y zf!-g1wtGD~fZ6CoA5T(n(Nkufxh@HI`ebUB85Uj4bb=6pbd6I-pEb1s>uaEL$=bVRk#>~4;B&=zgDdvqW=labL$=<_qt?UzK?b~zfU zCu4mFcBQ@#ZLieDsqL9eRH0xJ^~P>E0^NSA(Fklp4~{+P%)Ub#_ya3odXZpdw4EO4 zz=xqrdo}tKZVtL+E70d&!qor%x0!;W*p7ZS_u*tb7q5@KBt3Bl^~u-_|3H(cUeU1q zCg2q6OYv&VacP+8WHb^R(TKf=spLkJ^dJ^+|NlzC>`xR6ADjI62-OmnQ$^*iPjfjJ$way?*#fy$e$JZX_S==4P42E zTHLrF?f5XOr^jslT)uhW^}s z3Y~CTg%FwQNeZpG&>J1;Vzi;ncp2ubn4bD`!4S0mBKF1fO5wQy*pK?7*dI@!9dxW5 zW;hu;Q-271<6(50)~*uHm1H*x*K=V!j>WIAHny)C*9hxUUyd%#$LRgD*bpmJ3t!E_ zSc&>#beFu2qwzGFbOWk~=dQ&p>Q5mDTQc!J1w(xd9eJJ_VS6<~*YH}j!DZ+YeTsIJ zQ8O%6HT3!*G=jI|9k>x4Xxm!h<2D673Gc(2xEf3N{r`f3A^aVkVb|K}sXr!9!8z1- zU@z=ZCmcYJp!;|=*1-+vfpijm?rgl@zHZnReQ*)ihobNOh->jr%yR#)s+XR41wTU1 z`djLU?ehrw=8Wq3Ef7wbJ6#vd>^o$E{SJ|0lgdD5j}uzzoYna8WC(6XWl9-$#Ha- zWNRG`q#EdfG!|>&-ROCde1n1qOa3+?iAG{q>UW}lq}qpm74x?Z2TncgMSUi^_8;Ms z_&vIf?`{_&^eVQZei&W*((OYoG{NfByJHvk|8xp1x$rKUrRQ-t-q;~*w*#0({RA4? z938{&_aZoodUJHmSD^cUBNC9rPw0StL6fm)r|?_}w4Fwn`se>UP;ejjM@KdvE8*F&>*2)b{_U}2nr?v8uVrMfTHccIUHik|V`p#x3y4B0*my+0P6&`dPhpFkt> zT+g`w-{gWJ-i^L+9Nm_GqT4G+uaIn|qAk%G55qS2IJ(b|qBA^?F2yCi!$H*=?Qmjr zHoA28_D+U1dYub~Y73ei`_O%U6tgf-pI}Y&FBE#AKg}jY7hr4Z&tMjwKzB!u%fbLE zqu2YR{Y*m#IzLIlkv$e4Sce6u??#jIC_0creM5v=qM_`I&fq3AVvnN(dj(yxU1&$g z&`ACkuc!A59bbY@AX$q-SqeSkjcd_^<90OkFQ6T5L9_WJnoQ@==koRs^#;-I=*&i; z1Gottz+IS*%WyV6iX1@6M2P{R;p^}sZp=bYw%f5jzJ(3&RIFDV7_MJ|USEhFRGYCb zo=2Ck&Y*C=6}G276+7a3G_wC;3%~!hE)OqWgN!Kg7z&UqzR05BgdE7i(aNA>p|$Sjzo>3x#^P9F4$EG=vARFaClzV%wpi zqYapidfKpXpyWV5PG#|Ftcgu=FB+jdSB4JTqLG@0W1_FS%e6791J= zWK$mpP@jN<@Llu_zjRb+s3f|^m1DhOthYf!-3vWQC!rz#9@}7%(c$kE2Sy(loeXFB zZZ4SR|6)}vcU7qOKtG$;qoI5V9q`BK0h2x^d=0Ck5x5D9;N9qn`2-rtXV4kHiREw? zx+~5kDY$lNW5a`a(U6rxw^>6pbUn}r4MIDbiFR;TtS?5B?s4?}xA9Tjjdncg>agGE zqW!Hz+fA;f;KA`ay1)0LNq88u@O$*ZoZ~{sFGdfna?u88hn>)wUxChSGP?g~qXS-q zF6l}fhQA}vClmd~hmXg2bfojpC3p~B^LNpizK^c?HtdO?#d^gFVMg__7uQ>(AEQO+ zKv$s?+K5JIbM!D)bN~NKp*%M#UlX=fcl3LH85;75n1zd?>(K4F8=c|z=nVgi=A0Nh zE{<7TuMzEu9#Ge!OYk^mbN{cQVCY{)L%j)IlI>_nPhboD7pr5_N$IKo@W2>!AfMo9 zpF;=U?b^`J7|f!69opf2Xha@E&;E6oG~_!exQ~xwYb-E1yx0dF&=hn)x1a-h7~L&v zC89hH${_LEAZx-7wFzaHJ2y)WD)opaa~1F4g8F1-H*3 zG&HBsZIXUts9%n$9~x-L7NE~RiFNR`=n3>MB#KTCOVkG)_*gUo)37EkM<@1Cyq-Kx z!O-NI5wf`^x|S_t{Z_0-{Q)#G?_g~_g62elnIUpD(A?;Q&Twq3Ux!ZYcFe+u(RMas z5BL9<6y|fG%1vQ=tVMUl5p>^OVKm_Q8Xeiq3`cRJNyD& z>%(Yd{zjkAoJHiEX)y}@uqCGUDb}F=7@Abu(HVb^uH_Ht!1B)yCuVUpq_xn7`=GmN z4BFv6=r(^4jm-0CKd)fwzyG_5f}z}lZSb3Dd3J}}^D4X?-$w^lYEGDGx9C``$MtzQ z5MRSSm}hPn=rA;i$Dsqc9nHDrbJ_py-?zEo$PdK_&Y&~MJ}<0QO*CuUpbZR*PQfhd z^UM+k99HQ?vT6+b*G zC>YYrh2e$#=z|q70~^NcP2=@mn8o$s=ysfgzW)O9Pu?Up;A8mUVsZ-`+{YhmaQywD zy>}i6Ikg#+X88dMF2Nx*wBMoIEqzHi8OvaG>aEf1*Puzc0EgkD=#2hG2cBzbxL*Rx zQm>7j@iH_=mc{!oFJ=Gxr`fGssExm%Gb#OG7*JI-C+eeXHxv!|JaiyS@D6+lP1>dp zh3kXRlkx`iy=CZoo6!FDU|am_A@;v()coP_VjuLzBpiwB&;z94vM|E|=nTf7xiLG| zm!R#u5ZxT_e};ble?|wKxjejA7Hy|-l7c5)A9Tdi(Gfq2Hnv(Y1e5%LX4Ce~7LCVS9rcme&G)OkF7 zWJaTBcM{Ewjp#}EKDNZ)&1Ug|Bj>QFd2RhIK&xfz#4QOtBiJk{tR>y6Mwl@!5 zqG#guZ_%a8wI=MYrfb;$y}0lQ7xLf_=&#&A(BvujLWsnr=n_?p^%m#=d!iwp6kUcU z?+0iEenr>(JbJL@SR2|ahwiTWYm?zd7cLly(P&32(HXpq?v4X!=+C3uufn?U-eu^) zG7;V9v!hGV6LC%SEp$L1qsjLr+Ry1E1sl$MF?`Lcp+6#rqPt-R`UB!Q^Z+@84(xCA zxzaC%h&97O)cd37#2R#9@5lN9^!Z=VNaT7soEOQ86dXwpG<%1mS$-Yn#{1D^S%D_! zb7(|9MBn=rjY#?{;jiy&qf566UDCDaK;FbG+=(vPFUWwBiQ=z@pJ0um1JE3}0qtNB z+RzhdLu=6v-$lO}KjUyL^;-DI%tDj&19Tf!eLd`w;h2N^)98fOU>W!SdJ0!?;WM;@ zy6eODzdhP9Nqa}9VOy?0f@knhboa*e#9#EE z*z!i$w{O3hp8B`b3cQt``focfN7u5-+hLovLHGL$*apv_$yEQH5V5XkwvR@aaw6u$ zS?J8~z-+h}&4HzuwD2MY8`^=c{ZVv{GB$;^tc@mVBg~dYa^fiJquvdFoc;jaj+yU; zKbBX(Ce(+cC*#A|8c(3@R@xjsc6~Rq|6RlBT$qfj(9jm$64t&vT5p6dO*?dE{jm*> zL6_zkbONuU+i*L&zmK9hbPkPV&i6wSmc_fMxARXlo?JV*;EPAm7ypdr{UAi79GY|; z&}}pYtKh* z^u;^TkgrBNdJ7%M$7n-G&<_7bXME|lkPFq(CF_nZ%`kL=Q_+vn{m9ZK6Yo;+!B5Z- zAHiCfcYFA}wm@fcHJZJ*VH>;)>);OTh5uqX?7ky(a4lMY6#aT`!p1&_4!FU`9%Ssl zz7!nMP3Q~Hq7UrAx_A;j(Ms$LKSau5CiS7wk?6q2qH8)aIvtJFJoNnsu`fP`M(Px% z{{R1Gd=h3@3=MH3^np&;6t6%d^Z>dP|3h=+b^I7Vi1+W`6+-+py5F}%cc25=hn4U< zbZPVLX8)TMbtt%hJEKc*HD=)wbj@Ci_di9?i?h-Ed&0?94gKs+#CrH3+R--jTX8Dh zzjSZ-Jo6A#*}v!vGxvuGl)(nn+n~E-8oIxqKo6$pWBqk> ze{VuN`W(~oJIul#(C2d>2uoZPop9x3EHpsZye+yU{n7n-4Z3~iplkLZy6rZgNAh0G z!as2i7W*uOcscs~=jamtjkZ(l^Dx2MXylXKC^)13Xat6#0~v$9FateU7GX7f9!;kG zXagtF0sn^WG1nJi33{PRI1P==3T%e!u>zh!wlDww=fTim7j#BL(FfNakEW8~}&Q<6V>_M0KQ0hMW|4#~TuVPpfg^MM(SyFDb}D7*@}kxAo@}I3+rQ!L!tfVXe4@~?T^LOzyE(L1sl8kJPuM409X^+leXmlpJWDnv5+=HHkEsg~{quaVK`We0gU4kjc*#B;W zd$`~LmZ96`e`r!Z8?V2FnbhA#530@RK)yjE@eexSY~O~Nmq(Mf8M=!Gq8(p@=F+Wb zzstU5{~MxbxZu(I8g|DI(2qsIQ{c3p89{^xdT0b zCVZcs`u~J{AKp&=5A2DvPljJkALDfDwUa-jCzeoHg_E(xkLig$xCURx**}F}u?>Gt zPyO3%*Pt(chDNCOFCoO2qZ1j8M&|lhzZ;Frax@YfqC2rN_2f4cOqyK3hLf%;dgIFI z?daOBMYrQgw1YgS!h02?9ng+OqY;>kCgHR3`X+2d{Scbu7oSe;9{%}X3Rzrehu#>C z4rn^Mj~~S9xCL$SS9CjOKNFrShOTv!SnrP}=Tt0<_u@Ew8BNL(zlEHsgsK1jcO44O zs24i(tI?BdG5W#=bQf$v2eb#>*XLus-q|pq;po7xM-Qm`(42Y*P1;qMg&(5re~;ri ze-Z_M4}X%m89P&7jUFt&p%KY@F3hkjn(ZyohC8Dt<{&gevv3qXhjy6fkMMjAbnP3V zk?D@^f^nGo_y1>8@P&sll_Y2fJJApx!W?)3O}ZR^#=i%^cGPb`2fiK~`W)I`!@q(9 zqSMd_F2#Ph`7ic=2MU+`9YQ?>o%vYwEk|HC zyc2!@Q*;8~pc6QY_VXXQi?aO}a->RkyL&5C75#2_M(FRtdGuVZ8d=%^ANo<29 zE`;0|iYDJ|bU@Fe5qS@d+z;q(xPYmdvykRU6=Y&b{{KB?q-HP%ZD1z4w)di0`XV~B zt?0n^q7gcW4lr9<`TMp7_~C!lLH8Qs@6 zp)-6O4c*IVX!oOQcOH#I{>(7&($OmD!0Vv{ZH*(bCyv5(=s8d*TSg*j$F(WgPy;lX z+M^u|LK_%|=D>|;C}*S3--j;A<5&~lM`w5jZKqxKj8v`+MC%V>Q(TQk=y>*w@ZbN+ zn4{dU3CI|?gH9g@mwJ% z2A~t1mZac=4@B3X`}+gzj6b1S+#q*I(&lJHI-|*TIojb2bob0b2lx<9##hkoS3XZj z>Z(|udVBOJPEL=7r_l)PLATFwG^D?y$y7XV7-(hmNNs}-^l~)BNpv6!V|^()pr_Ci z^9@YLFR(Ixg+wfw$jldJQVSb#qZhi}=3^6Fj;`50tc54g4vXXu$yXj*Qtyl&MDx)I zyo4QbCpy!@1wzQ%U>5Z&Q?mb)6#U9Pj%M*@^x!!a>)8v2ZP);_xZVlP`m538yF2)N)1~{Ag1a!NcM3IY zgYJgrXk2cb(i0X;`%NAE<>ktJx-Jrl3LkE#Fu_bv(!;7jx*yb#S@Bs5eM9dSAI zgzSJm*DKZsx#4g&Dxz@ zFsb&V$#V?dW*5+`El?sHOoh?ybSe5?X*9Viq0jY;*9XSySE5UGH#*TJ=s9r$_hW%% z$&A#0;rs;7;=+(p8HsuL1-h0)O9!vRe$;QnJMnXDjHAkg>|c&Uy^e#iVOB=!FPrYg z=G2d&xm2cXs9%95WpXJ6XYd-D{okN#T%cTdpg7j1-V9xe322CKMU!tS8mVXF^^NG# z>_BtoDB4~|`S5&RG&!@docq5z1w+~kJ$U+~4PS+RWTvAh;O*#(3*-HV(QICg9yHs~ zqxc98!HN|!Qa{P&;uX|CMk7?IVi?e^nAh+BLJEfZ5j4rxp&h+~4(J{94F3e3$w{=s z-_YlCRSMaj4_)gHXnQ?leIy#O3FtPy1%3ZcO#S=6k5e$K*I`}!8f~CJ<&dov&`@?n z?_Z4-aT%K3o1$N#+xRauqNS>Y$dyNTNwsKebfEn)_22&+M!}I?iyomj<0xE(129+B z;0WwO{dM%$Lkx=wcd=EVaeJd>#s$V`&snkb0B)Y zHv7L97b?{WXZAES>6T+vd=A|{`>++}uNw}kUg!*`qt88p4)gvbE10gga(VLsaNDs=nqLHF}{{0&Pt4Cg|j zM!`PlM`;ndWUrtnVsZ}!v-?LhNwPN%`?mzLKNEFhy+8Wg1T>WM(E+@I9@&S`rMsv} zM(U4PEzp5Y!8*7CeSR1E{9oA2{a>MJ82NDQ%8eve!EI;=&!7iSwq{|(rO~W!f_5+f zeSRL=!RlDwAM5AQldnqiF!NFPAoV#o&NMFCBFuaaI?|%cxe#9bp4n4r~vz$fraw8L2)!jZfXjl^0sn|GqQ^C#MI)sEr$W@x<|8mS@C8_?ukn55v$ z-atqG5xNxn(GGq?v%OHK5RuyG!P6Vvo>QX_qHDSljo@bV8?imsPoYckC;IWp-8s~g zx9nP-dYsYLA9~0GeDkpxf%sSYLt;>^XEP-iq}j=ySiJ5j&4pVy^Dt z#2k+f{2_EgD>3!=|Ibozq_3e_x-)td9l-DCfO7Q+GpmX|-vJ%SP;?-ZF?9f;2i7{Y zy^ZJuccSl|LL+ohPxikJm#5$X(+*vut7CmW8rtX4hTcFs`~;uIqu3j7?-gcr06oGF zqoJG*4MF*hmPDGP@CK{o;&?S22GWNgw_hl~F&>?iD7xxVVse(3GFWMEWQy+nT zZ0^At#}XJ~sD(2!T_7oP8lMr0Dzl;n(QerS}i!L1%mkI)mEi zfZCu(^dNK~Gh_WJG;$xHOL_!N>TCnTK#O8e>P^sHk-RAEd1yrMLUZOZG~{2R1NbxE&vUs0WdE0;U}$TiA!~(p zI2v!kxoAYrNAq40lBy)SG*z)FwnGPU3%bo7M&El8o!};PU|*n-`Uxx0eVN;QOu-Sh zLX+!qbOw{rj_yFW>BH!N-ihu-XLtf@;qPctRu~#0(+Ryl9Nq8N;sAUUUAi+v+5gV8 z$gr?&>Y>|c7_P(lXtFfCGS~*4ad&iJ{m{rRw;YiPgZs%li3NAq>bd5)&A-@yNi6!X%U5n1>ee|2K7wh0R=)ek(2_4kO z=G2>`IW!%O@M3hvkE7ZDJ~Du0;xGjp$UQb#9s5!5j&`&X8{j(hB>NU^=p4G%#jg&b zZHf+f5E`K=vAz%;&?+<;k70d0gB9HWmBwWxT63X0y8rJ+x8aM}20uZwKL7X-q4MZ2 zrLJgXu8ZD|&g{|XdNcxiqd%YnPM;74SQgvTf1)J?J5HhvKaDQMj_7Ih#iG~n0yaWt zIs;qb{bWI6ax(=(b^>iEeNy}j1T;6wqbFS( zbP29Nv-%peqZ#NLFF<#}GIU!$g;}@(YvUK_L~>pmta5EeGIgOd7i@5BbSjpmJ_k+4 zC(!}EfDUjQ4#scsb!f=Sc_4OuUAK%>#MygOdsfG)vKw4)R8`d^quJ>QLCd)CG$skcNUcO+i_5pDl3 z%=G!`VY?;^$3h8of0su`UKd^4uIP-eKyzVStj|XelqF~c9>q4e1)E^zjIhmGqH8_{ zUBY|O2&_Q{m`uD*!Q^=lZE!C-fP?6a&%}D}nc>Cq=<_wvWNa1deb5taB-X=)=#l*{ z+Tk{Im+eE(gFi9T{omlGkPJ;RJ2#f0`~7h=313AUI)InpVRT^U&~2Fi<`B86=trk9 zHpB7g0G~z&{C}mL2YeLOzQ=cFlF&nwCLlvI!3%^UAV?KZI%pIS6`W)z$t0VduqCh& zT@|i)5l{&_Afm>C1dIql2lNHdC1UTrpx6HJf!AKJyx(umEIUE;df)qe`0$-GbLNzP zKNCLTA&?S20P_7;!8Y{&Be;V^4v!f%id<`z;vfN=~^#xXmz-?sXN&72gUnP}G1N@M(~F`$PA6 z2E2y@cK|tYKae7x;I<8r3%(K@4ju#q|PR~ zoC7Lo8z6OE3ep>vgS6(GLAv7(kj7gNa^cT{?DsLqg?$5#0$VH&o(~2o>a##TztE)tQnWFUJFfw`(>)-^djjMJ-vTFqKZBev zKJM>g#j{)%fwa;qK@PMUWXIdx_Wd9O%U+NRdkUNa{s{gHoN$eZcte(p1-80Y{9r=` zm*M$s;3}}^KNS93G1ULKU=r%GLWI__;OS^D2Wi#+1u{K<4K4=GLSZK4>%5d8>BmST_q$p7i2&(!87Rpt8qcm9RNA;QII2ycTQ321kNyFJ+tlzXKOs(T^alykn)} zyA+%R&H<}kN^8Y&`$F&<-UnmgfSZJFw}3Oyeg+&5cD`AJs z0Q?@z1+#Az*1zOd`2U5tu^u-VlfMRMf;k%n_FvI%#HiAQa?e7+nn+Vc|3PGymwm2@zaPbaEH=2Hr z7+@X96~6?|2akd#IB%2SQy>>O;$Fc*kp0$zMc~)qS>VN+#d-gBa5CD5!I!{c)neiC zrdx!23;-$m5|AAq0nY%_w~FVZ!Nq9DKu-J>ND+6tPjUWVkh8%;wEqdx-6q!v2`vL@ z)c1ol_JbhjnSa0Q|M%m9qUf|u`0E^y#ST= z3VaZ}0UWkN{80J{khXGWt?Lb79@=++&hP(Mc8VV=4FyNz!E%?6gY(c%e^996Qt(o= z{{d2Ehd^5QMGuJ|Hf;b^v=6(?v=!&qdgXvL?j<1IZx_gZFOU?;m$+bdYO_m-Y6uua zTL&58UIFPPKZ9R^vv&(ynf$O2^;+;v+6bz;KvK(4p~q?;)EpRK<0V#YJAf3pdhmqYlgf9|IeMPl9x(m%w81%!JVW zCXji*!+ycjKuT~FsDevDZtQON`70nd^eM=Vwx|~y=o`mHXWX~|q^=f%?64YC!5a7Z zb0Bwi2y6>BeO&MqkfI+1&H^t0nfEt=+{go9GtdV4egfpeK6LNL+a3@Tb^|-%!Dx^b z%UqD6UI_LB*Mk)G0Z;|M0v+ReLb%@ma4hc604bU4L6&NFg4|FY$hzVkPz4WxjhO$N zJt=hC7Ua%`f$TUHWazyRYz|%rGOw=#$AHg)CxMwy2`}ggHbr|rI0H05s&p5~@#;V> z=xI;^KLMTJ|9uD-eDNEQIp8;N7&!82@nXc~)gW!+2DiN)q@?ZzRd63j75o#N1`c{g zNGuNWV6p{d;Ccep0T*0ZPmntr4RYXIuq7A(X(LO(?%+C*DtQ>BHGc-S z16w>N`u7AOTHj!h@0|(K8|Hvih2gfZ1>@B5Ex4d=9|QTqVek^L$@9W^3PJ8X47LK7 zfOMx-E^h_7fUO|i@KKNz)n_0#*5w6ZTf;!A@?4Pp=f9xD9UVt-gSy%TQUY7SN#H(k zI@shzvGO?}B~uPMMh4Od?{uH<1v%kCus`@C$o|wu2l;+Q z92bLdu^QySkAhslL68G}2T~%ZzUpQ%kULrc(yteT%zn#2s^(6R#$4-i56FH`g0zWO zLB@f1L8>(V3ohtp8Lx?NK4*Xn&>juaZEgc8vim^Rc5i{_f?t9hX#DHqem+RiSAbl= zO)l>Mv(erPG6KE=a-5$)ECB!i(;H&vCxeV+!(7e-x%10G4!8#7PBwzvaWz;39&n!z zcvIy6Gr@CkzYb(JOn*zb-ykp#?fIY%J_-(HNs{%p5XF3u)>#PBxFR5JV!7Mi1kxRM zgLK0u!8PFLAQyhcJHn`{Ty6!=!2Jio2f-uYJ>cE%3RO-y2vuT!Ul146-Exo{^1406E(LE6?hkSd)IG5`g@_y}Bt-46GI zlhA$|WF$N3ec>HCNGo3ja_8GYTKUT^<$sEu4g|;Helf^+avw+|ejTJL8hs!Nkki3F zXzL%q{}~#u#|?(uM?f0e*C2P${X@}l3djN^0lk% z+7rMaxErJdvJVU0UIdOtdojqIV1s=A4oJziJR%l+4#*8%1u{g(H{-%&N07Rm_Jv5N zL6AmR4br+F1Nq{|AXU@+Um|V{0jb+Ua4NVKoCv-T^1V~P6g!;^GR{=E?fbxG^#6Bp zaXKF4eI){l1u_EKAYXXiZA)K^f7jOuWdA6b3vK}ygTI0^!A0K)Z#n?d`riQ00zU)k z-hca6Ncapelm34rF4*x7@H+4Tuo*b=JH`1w+b4nC;TPauu*>%%lDz{mOUgfp$ag77 ziCqR#v}-|5`~*n%ZuX<_hAtp&VH$WE{r^c^P*>l88^Ele6yIZD0%QQX=BVP^1>OTP zvd#ZlxaB7BTC|@7=@oN+5fWJn7NY$+NcSG|t5979NXb@#jHtW8xP*)SxS+8;4$^qu z1t|gfHxVc@LB7}yYz+2uIn?DCkONL~nd@>sNR=2M1J`bl?JoR(`ns$*w_tky@sOB1XPZrUfJJi1~OCZ&YsHQQN{DIbw3q%KMMDPmgGM z0lji;ZRg~y;+YzbhRQK*#4OQ+YO>S%)&*uX=vR%PIzD$c7Jyfut*y=G!u`>*fRT@x z)Vyd!EzHtzaFmL_;gm|IB!D8W=P1~2o^RJZjn}wz3LE;yF0ZY zWR_B}4f}=kd^6+^`^F{3A?EvcL-+cFv4uw5L2GxtyjN~gXau2aBT`fwdF`dN)~fC| zB4d2xwP036%`<}j%7t%ttu21Le_B%`UssD@M|!Ao?R&!;<(q+MX)s({|K5E~D@Pw1 z*h$qFMzw&mhXNxMj;LCwFj@+&RE|6}I7?krWaJlNcj2(pB|l_D3_YZ&+32R4WnyD} zYRyBpv}vTfVpV>5v-#;-Azm=TDU+c3G}wBP9)jU<6}(fbm8nLASFU+h_Idb?)kORMM*!z$_ilqZc@vO1c6Di{uxHztzb>SWc-H@J;MDT{G-? z&7`ABx?^be%$CwQt%kxr8(LIKIAPyJdbu;Z<9{hnve$Hzo|V%b=d@?{knT!r0t?rJ zVHmsp^{LX>^a7|@*Py2SB9rQdFda+fKEeF6PZ<_Rm+{g%)8_=nJ#Y|~*TCWmkfe3*xj55BXYSD;U3N7bT`UTNQG-U0{m0mSs zW;En=JC87hsimA)IM6YXs&H@-Mcg1`26f+b7@{-eah=1eb-0PtyX^_yv9CQ}%4*X2 zPa?2geTh_;ae8h9hNy-7SQlffV@qK*UkftyBcvVMq813moSj1+3;a^wCh>ATvFs8XhuKE-P=Q7#4KnrmM_5%WrBEX`EZdo@q)zGG zT$dD~TFv(B1zI!^8KGX>qj&h?9(}A+)=0g&IzIYGUF_j&q<1p_K-)eKXtq z-n{L3+ocssMyU~jb6fB4lwNG+gdSlSmD3OP_^Zjqu6aVC{1RA#|s5c7KY z5AR7^+lg|_DqSvhus3`wz5EBpR`|ViYesL^);!ws*q!f!p!2-4^}e>2^s98Oz5Z8e zae6w7nh{oJn!JCa=f$v!oarPpx9)Rt8&U%cG86=!t|}@yEl)#GMvbWl>}S&CoJNi2 zPM_vP@t>N>=XP&4Xoxy!z=+d_j2Jk~p50IWP8w|1@6k(8!{x;Srdm;AmL+OJW_hA2 zX!cdhLS}@|)ncQ5j|gqi;zW%#F-QJ6>ny%d9*dNl_3QPZsiN);;>9{7IHd40Gw8<> z>$h2B2gobp-a9Bm{d&WxSTr~6^1Icjet0xDou~=~6E&=Sqk)oGgV+9Wm=>vBVI1pU zF}Yhu?5=)WMM<(Njb}BZ7727xhJ0h6MFuR%n_iykqQ#;;1BoqRyyrnFR6^vr|>ZAftn^E}HMW#m}nw>RRUYpi5C0Xn7Ve)~d=N(gzz3vS8 zDyhS~5=a%oP1HGMIf4qdR}!;3j*tr_&+GPzGvyvq^VE3Q|Iv|hzqaM|ReF9=(5nsm zr;)NMr59@zu@bxWXgO1AmU>UKaz@MTPfOj1sU;qL%&K2+z?eN-v8IiYdwK?lIRjWX zj*%-GE~oVNvGQ##lS3Doeq{Bi{li%KU9W`f_b1AW6wjWmyvcH* zr)|G7`M3_Vr^~girY34}1~mO;X8HaN{zQ%4c!qpKGj(fJ$ULd%eBZD`=bSN z6WQDE2Tfj}w49fyDhg=j@al3ikQcLN>+(4*XD90N_HPKO;eZ(}%h&B&b-8)-cy5`= zWkg^d6|S`5lW+vrX4P^vtkX5&G>*g6!Sz%`G!%4Yp>lX+X_P?|Nj3t<_Wg(BWzhq} zWr6x@83@%9)O?BRka7G$OSSJ^DDQ3K*{QW~nOy8`f3i#->TPHJU7qV{+bjMq@02og zOSKAYHEFG*mdl5mdwN+z*2=3rZTq>k@)l_jjvc6fT$^LyEH)q_#0FQEa5hLtgRLUY zV;fNDtTA%COrwFBSufr!ceJj;U!EDPyKk1mp0?e?l3Pk~aauDX2y9Wm8CCr_0+u+# z$J8>j)P%9CCE_560;>cW14q9^4VF|~ny3zHh;a4m6E(#+(W0lO>ZsR@03#ZXga{Kc z_dNIqGYmAN^?RU-no`V$XzR&}JQbFs94v)Icph{^x;0>(oSiYznZ};8PChriQBuga zZIpL52nm`Mc%U)AOfl^?UsANV<(C@@grZ zL&b-v;vm$38SAS`qQ2QNqzfa0RD>hB@Q)Z@((`yGK?2thvQz{fB&FltwTJJOhf6JI zA?d=&-1uf#3-`&L+wkUbDdW0*a&Kl74(7<&Hm+6c}9Bw8AxRCI0P8y~i4awn^Dv(irO%jA8mXmWFQoo@zxFr9Zo-#3_VDIYerHR)i{qA) z@9m*SC#z?aWlnU_kS*-BlJZT{I4oE%3qwZE z0XgX;!sU*o$5`LwW4#}i>r|a74;$k<@gOIfw%QGu$)V#&g#V|(lPgS~o3VBHFoH~? zrr~&hzRq+fYFH~bD_t^>kgz+e%97jl`SZ8R>ffmXXuPJoNRJ`fH9+Ro`YwfAEH0!r+O4l~U za4r~z$E@tl-ISH-t&?_vxGt7v_v@|Pk!J7fqYO>&c%E5Ngu^ra5?`JmX2z(XIl}t3 zzj8~PRGE+rS@!B2<@F$c@-am|RMsmy(y=1>W zM7gEW=v;f#1myKIz_li?L+&3I+7M|Lr5+jymKCQni+ z4cJ)|l*wKXw=SEg1U#eIUrki9(mW?DgmBe_y)wa;8Y(j*f|DLFe7T770X>2^kOwIv zo~NdX`6lDTL9#18&f*v;>Zei`P+{lIpy>{Q<6by<30)-~-fxebq9j^1b-ymT0ivt@ z>pW$h(qtw+-3NH2v~QZPWJ>dOmT>r{nRG61CC3ygYB?NBk1yu_TJ2S}K-rSf<9z3U zh+;2!%tNpWprm%q-H7zJrxYkkE3YW$mMdG*yy>UKWlAq^G_~-r_PcuCu>6-d@DF?U zHf^dIYFX2 zqg|H-H2?k$o+8SLLF!*CrOq}2(f@QNr;tMNl(G@cKC)6NmC{&UTCJKY?V5Q)uYKWa zrN*0>t=5&wQja98+bfl`y=^={%|3ap5^K{dsjK~~v~V)x{!UwKHYq2|(l~43SoxGz z!uOJ2ACQj*BEeewHY=UldKQfG9w*y!&1$_I2c7h4WwES!48rsm!7RflG(EetH*Qs4 zOXv4O%+v|-CDR^*=+aOp`7Qn82g%?O6&B-lf*%Agmv?7<*RIj zs?;j^v%DgFXz?tpTztZbvMg`k!qc~Yn|;;8%6+NNI(;8gZf_7BwkMQ!_U8#@jJImC ahCHc!>XE&j^^{WWJ>}YOKdao^;eP>4=U!g` delta 47946 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    "; } $statisticsoutput .= "
    " . $LEM->gT("Question Attribute") . "" . $LEM->gT("Value"). "
    " . $relevance . $prettyValidEqn . $default . "" . $qdetails . "
    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 Date: Thu, 26 Jul 2012 13:47:53 +1000 Subject: [PATCH 39/71] Fixed issue: #6388 - Graph cannot be changed from bar-graph to pie-graph javascript error occurs. Also added text explanations to the icons for mouseovers. --- .../helpers/admin/statistics_helper.php | 20 +++-- scripts/admin/statistics.js | 83 ++++++++++--------- 2 files changed, 56 insertions(+), 47 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index e2fe684f949..97a5f7dce49 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -1735,6 +1735,7 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ $tempdir = Yii::app()->getConfig("tempdir"); $tempurl = Yii::app()->getConfig("tempurl"); $firstletter = substr($rt, 0, 1); + $astatdata=array(); if ($usegraph==1) { @@ -3045,19 +3046,19 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ $sImgUrl = Yii::app()->getConfig('adminimageurl'); $statisticsoutput .= "
    " - ."" - ."" - ."" - ."" - ."" - ."" + ."" + ."" + ."" + ."" + ."" + ."" ."

    \n"; } - return array("statisticsoutput"=>$statisticsoutput, "pdf"=>$pdf); + return array("statisticsoutput"=>$statisticsoutput, "pdf"=>$pdf, "astatdata"=>$astatdata); } @@ -3079,6 +3080,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, { global $pdfdefaultfont, $pdffontsize; + $astatdata=array(); //astatdata generates data for the output page's javascript so it can rebuild graphs on the fly + //load surveytranslator helper Yii::import('application.helpers.surveytranslator_helper', true); @@ -3090,8 +3093,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, $pdf=array(); //Make sure $pdf exists - it will be replaced with an object if a $pdf is actually being created - $astatdata = array(); - // Used for getting coordinates for google maps $agmapdata = array(); @@ -3431,6 +3432,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, { $display=displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $usegraph, $browse, $pdf); $statisticsoutput .= $display['statisticsoutput']; + $astatdata = array_merge($astatdata, $display['astatdata']); } //end if -> collect and display results diff --git a/scripts/admin/statistics.js b/scripts/admin/statistics.js index 9df9b863b25..acb10205e13 100644 --- a/scripts/admin/statistics.js +++ b/scripts/admin/statistics.js @@ -7,7 +7,6 @@ $(document).ready(function(){ destinationdiv.html(data); }); } - }); $('#usegraph').click( function(){ if ($('#grapherror').length>0) @@ -15,7 +14,7 @@ $(document).ready(function(){ $('#grapherror').show(); $('#usegraph').attr('checked',false); } - }) + }); $('#viewsummaryall').click( function(){ if ($('#viewsummaryall').attr('checked')==true) { @@ -26,31 +25,44 @@ $(document).ready(function(){ $('#filterchoices input[type=checkbox]').attr('checked', false); } - }) - $('#hidefilter').click( function(){ - $('#statisticsresponsefilters').hide(1000); - $('#filterchoices').hide(); - $('#filterchoice_state').val('1'); - $('#vertical_slide2').hide(); - }) - $('#showfilter').click( function(){ - $('#statisticsresponsefilters').show(1000); - $('#filterchoices').show(); - $('#filterchoice_state').val(''); - $('#vertical_slide2').show(); - }) - $('#hidegfilter').click( function(){ - $('#statisticsgeneralfilters').hide(1000); - }) - $('#showgfilter').click( function(){ - $('#statisticsgeneralfilters').show(1000); - }) - $('#hidesfilter').click( function(){ - $('#statisticsoutput').hide(1000); - }) - $('#showsfilter').click( function(){ - $('#statisticsoutput').show(1000); - }) + }); + /* Show and hide the three major sections of the statistics page */ + /* The response filters */ + $('#hidefilter').click( function(){ + $('#statisticsresponsefilters').hide(1000); + $('#filterchoices').hide(); + $('#filterchoice_state').val('1'); + $('#vertical_slide2').hide(); + }); + $('#showfilter').click( function(){ + $('#statisticsresponsefilters').show(1000); + $('#filterchoices').show(); + $('#filterchoice_state').val(''); + $('#vertical_slide2').show(); + }); + /* The general settings/filters */ + $('#hidegfilter').click( function(){ + $('#statisticsgeneralfilters').hide(1000); + }); + $('#showgfilter').click( function(){ + $('#statisticsgeneralfilters').show(1000); + }); + /* The actual statistics results */ + $('#hidesfilter').click( function(){ + $('#statisticsoutput').hide(1000); + }); + $('#showsfilter').click( function(){ + $('#statisticsoutput').show(1000); + }); + function showhidefilters(value) { + if(value == true) { + hide('filterchoices'); + } else { + show('filterchoices'); + } + } + /* End of show/hide sections */ + if (typeof aGMapData == "object") { for (var i in aGMapData) { gMapInit("statisticsmap_" + i, aGMapData[i]); @@ -201,7 +213,7 @@ $(document).ready(function(){ }); $(".stats-showpie").click(function () - { + { changeGraphType('showpie', this.parentNode); }); }); @@ -234,14 +246,6 @@ function ajaxError() alert ("An error occured! Please reload the page!"); } -function showhidefilters(value) { - if(value == true) { - hide('filterchoices'); - } else { - show('filterchoices'); - } -} - function selectCheckboxes(Div, CheckBoxName, Button) { var aDiv = document.getElementById(Div); @@ -255,6 +259,7 @@ function selectCheckboxes(Div, CheckBoxName, Button) nInput[i].checked = Value; } } + function nographs() { document.getElementById('usegraph').checked = false; @@ -336,14 +341,16 @@ function statInit(data) } } - - function changeGraphType (cmd, id) { id = statGetId(id); if (!id) { return; } + if (!aStatData[id]) { + alert('Error'); + } + if (!aStatData[id].ap) { return; } From 34feb59a935943e452d2dc49a55a280ac0262043 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Thu, 26 Jul 2012 13:52:47 +1000 Subject: [PATCH 40/71] New feature: added link from deactivation page to export page and corrected language --- application/views/admin/survey/deactivateSurvey_view.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/views/admin/survey/deactivateSurvey_view.php b/application/views/admin/survey/deactivateSurvey_view.php index a90fffff9ad..4e3017c105b 100644 --- a/application/views/admin/survey/deactivateSurvey_view.php +++ b/application/views/admin/survey/deactivateSurvey_view.php @@ -21,7 +21,9 @@
  • eT("All participant information is lost.");?>
  • eT("A deactivated survey is not accessible to participants (only a message appears that they are not permitted to see this survey).");?>
  • eT("All questions, groups and parameters are editable again.");?>
    • -
  • eT("Also you should export your responses before deactivating.");?>
    • +
  • '> + eT("You should export your responses before deactivating.");?> +
    • findAll($ColumnName_RM." != ''"); + foreach($results as $row) { + $extraline .= "
    + + {$row['id']} + +
    +
    ".$row[$ColumnName_RM]."
    +
    "; + } + } + $extraline.="
    \n"; + ."\t\n"; + $statisticsoutput .= "\t\n" + ."\t\t + \n"; + $statisticsoutput .= " +
    "; + $statisticsoutput .= "\n"; break; default: From 59d567c22bdf55c65d1bebcb7cd6547cea98f71b Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 26 Jul 2012 10:01:22 +0200 Subject: [PATCH 47/71] Fixed issue #6351: Error when deleting a user --- application/controllers/admin/useraction.php | 4 ++-- index.php | 15 ++------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/application/controllers/admin/useraction.php b/application/controllers/admin/useraction.php index 277375828e6..eb25741ba71 100644 --- a/application/controllers/admin/useraction.php +++ b/application/controllers/admin/useraction.php @@ -223,7 +223,7 @@ function deluser() } if ($action == "finaldeluser") { - $this->deleteFinalUser($ownerUser, $transfer_surveys_to); + $aViewUrls=$this->deleteFinalUser($ownerUser, $transfer_surveys_to); } else { @@ -246,7 +246,7 @@ function deluser() } } - $this->_renderWrappedTemplate('user', $aViewUrls); + return $aViewUrls; } function deleteFinalUser($result, $transfer_surveys_to) diff --git a/index.php b/index.php index 41c7e0828d1..37104e87b7d 100644 --- a/index.php +++ b/index.php @@ -1,17 +1,5 @@ 0) + if (isset($aSettings['config']['debug']) && $aSettings['config']['debug']>0) { define('YII_DEBUG', true); + error_reporting(E_ALL); } else { From 945dc7f248e1fcade92c0968055769e7482f9054 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 26 Jul 2012 11:10:03 +0200 Subject: [PATCH 48/71] Fixed issue #6386: Importing CSV labels sets from LS website throws SQL exception --- application/controllers/admin/labels.php | 3 --- application/helpers/admin/import_helper.php | 13 +++---------- application/helpers/common_helper.php | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/application/controllers/admin/labels.php b/application/controllers/admin/labels.php index e3d60343cb3..b4030e5aad8 100644 --- a/application/controllers/admin/labels.php +++ b/application/controllers/admin/labels.php @@ -12,8 +12,6 @@ * is derivative of works licensed under the GNU General Public License or * other free or open source software licenses. * See COPYRIGHT.php for copyright notices and details. - * - * $Id$ */ /** @@ -22,7 +20,6 @@ * @package LimeSurvey * @author * @copyright 2011 - * @version $Id$ * @access public */ class labels extends Survey_Common_Action diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php index 6af1b61484d..f2b714c5941 100644 --- a/application/helpers/admin/import_helper.php +++ b/application/helpers/admin/import_helper.php @@ -9,7 +9,6 @@ * is derivative of works licensed under the GNU General Public License or * other free or open source software licenses. * See COPYRIGHT.php for copyright notices and details. -* */ @@ -2024,15 +2023,12 @@ function CSVImportLabelset($sFullFilepath, $options) unset($labelsetrowdata['lid']); - $newvalues=array_values($labelsetrowdata); if ($xssfilter) XSSFilterArray($newvalues); - $lsainsert = "insert INTO {{labelsets}} (".implode(',',array_keys($labelsetrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix - $lsiresult= Yii::app()->db->createCommand($lsainsert)->query(); + // Insert the label set entry and get the new insert id for the labels inside this labelset + $newlid=Labelsets::model()->insertRecords($labelsetrowdata); $results['labelsets']++; - // Get the new insert id for the labels inside this labelset - $newlid=Yii::app()->db->getLastInsertID(); if ($labelsarray) { $count=0; @@ -2055,12 +2051,9 @@ function CSVImportLabelset($sFullFilepath, $options) $labelrowdata["assessment_value"]=(int)$labelrowdata["code"]; } - $newvalues=array_values($labelrowdata); if ($xssfilter) XSSFilterArray($newvalues); - $lainsert = "insert INTO {{labels}} (".implode(',',array_keys($labelrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix - $liresult=Yii::app()->db->createCommand($lainsert)->query(); - + Label::model()->insertRecords($labelrowdata); $results['labels']++; } } diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php index daba8c1c149..80b8f915035 100644 --- a/application/helpers/common_helper.php +++ b/application/helpers/common_helper.php @@ -2916,7 +2916,7 @@ function buildLabelSetCheckSumArray() /**$query = "SELECT lid FROM ".db_table_name('labelsets')." ORDER BY lid"; */ - $result = Labelsets::getLID();//($query) or safeDie("safe_died collecting labelset ids
    $query
    "); //Checked) + $result = Labelsets::model()->getLID();//($query) or safeDie("safe_died collecting labelset ids
    $query
    "); //Checked) $csarray=array(); foreach($result as $row) { From e703aaa1f8c50a92c630bd8e21f8f7b900489b10 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Thu, 26 Jul 2012 19:24:37 +1000 Subject: [PATCH 49/71] Fixed issue #6389 Show text responses inline option no longer available. Fixed methodology to improve script efficiency. --- .../helpers/admin/statistics_helper.php | 20 +++---------------- .../views/admin/export/statistics_view.php | 1 + scripts/admin/statistics.js | 15 ++++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 459acc26515..cfacea6f606 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -1310,7 +1310,7 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { ."\t\n"; $statisticsoutput .= "\t\n" ."\t\t - \n"; $statisticsoutput .= "
    "; @@ -2391,22 +2391,8 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ * */ if(strpos($label[$i], "class='statisticsbrowsebutton'")) { - $extraline="findAll($ColumnName_RM." != ''"); - foreach($results as $row) { - $extraline .= "
    - - {$row['id']} - -
    -
    ".$row[$ColumnName_RM]."
    -
    "; - } - } - $extraline.="
    \n"; + $extraline=" +
    \n"; } //output absolute number of records diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index 2de2824e048..5a682f3ade4 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -10,6 +10,7 @@ var graphUrl="getController()->createUrl("admin/statistics/graph"); ?>"; var listColumnUrl="getController()->createUrl("admin/statistics/listcolumn/surveyid/".$surveyid."/column/"); ?>"; var sql=""; + var showTextInline="";
    diff --git a/scripts/admin/statistics.js b/scripts/admin/statistics.js index acb10205e13..0088b5958c8 100644 --- a/scripts/admin/statistics.js +++ b/scripts/admin/statistics.js @@ -1,4 +1,18 @@ $(document).ready(function(){ + if(showTextInline==1) { + /* Enable all the browse divs, and fill with data */ + $('.statisticsbrowsebutton').each( function (){ + if (!$(this).hasClass('numericalbrowse')) { + var destinationdiv=$('#columnlist_'+this.id); + destinationdiv.parents("td:first").toggle(); + if(destinationdiv.parents("td:first").css("display") != "none") { + $.post(listColumnUrl+'/'+this.id+'/sql/'+sql, function(data) { + destinationdiv.html(data); + }); + } + } + }); + } $('.statisticsbrowsebutton').click( function(){ var destinationdiv=$('#columnlist_'+this.id); destinationdiv.parents("td:first").toggle(); @@ -26,6 +40,7 @@ $(document).ready(function(){ } }); + /* Show and hide the three major sections of the statistics page */ /* The response filters */ $('#hidefilter').click( function(){ From 855d0229821305f339656d290e4a9319def93da7 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Thu, 26 Jul 2012 22:04:30 +1000 Subject: [PATCH 50/71] New feature: sorting for inline text listing in statistics display, also initial sorting for text display of numerical responses. Todo: fix some of the sorting problems for numerical responses --- application/controllers/admin/statistics.php | 23 +++++++----- scripts/admin/statistics.js | 39 ++++++++++++++------ styles/blobblueish/adminstyle.css | 16 ++++---- styles/gartergrey/adminstyle.css | 16 ++++---- styles/gringegreen/adminstyle.css | 16 ++++---- 5 files changed, 65 insertions(+), 45 deletions(-) diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 63983259079..00775624ced 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -560,20 +560,23 @@ public function run($surveyid, $subaction = null) /* Returns a simple list of values in a particular column, that meet the * requirements of the SQL * - * TODO: Move the html into a view to fit with standard mvc methodology * */ - function listcolumn($surveyid, $column, $sql) + function listcolumn($surveyid, $column, $sql, $sortby="", $sortmethod="", $sorttype="") { - $results=Survey_dynamic::model($surveyid)->findAll($column." != ''"); + $search['condition']=$column." != ''"; + if($sorttype=='N') {$sortby = "($sortby * 1)";} //Converts text sorting into numerical sorting + if($sortby != "") $search['order']=$sortby.' '.$sortmethod; + $results=Survey_dynamic::model($surveyid)->findAll($search); foreach($results as $row) { - ?>
    - ' target='_blank'> -
    -
    - -
    -
    $row['id'], "value"=>$row[$column]); } + $aData['surveyid']=$surveyid; + $aData['data']=$output; + $aData['column']=$column; + $aData['sortby']=$sortby; + $aData['sortmethod']=$sortmethod; + $aData['sorttype']=$sorttype; + $this->getController()->render('export/statistics_browse_view', $aData); } function graph() diff --git a/scripts/admin/statistics.js b/scripts/admin/statistics.js index 0088b5958c8..f241a475b70 100644 --- a/scripts/admin/statistics.js +++ b/scripts/admin/statistics.js @@ -3,25 +3,42 @@ $(document).ready(function(){ /* Enable all the browse divs, and fill with data */ $('.statisticsbrowsebutton').each( function (){ if (!$(this).hasClass('numericalbrowse')) { - var destinationdiv=$('#columnlist_'+this.id); - destinationdiv.parents("td:first").toggle(); - if(destinationdiv.parents("td:first").css("display") != "none") { - $.post(listColumnUrl+'/'+this.id+'/sql/'+sql, function(data) { - destinationdiv.html(data); - }); - } + loadBrowse(this.id,''); } }); } $('.statisticsbrowsebutton').click( function(){ - var destinationdiv=$('#columnlist_'+this.id); - destinationdiv.parents("td:first").toggle(); + if($(this).hasClass('numericalbrowse')) { + var destinationdiv=$('#columnlist_'+this.id); + var extra=''; + if(destinationdiv.parents("td:first").css("display") == "none") { + extra='sortby/'+this.id+'/sortmethod/asc/sorttype/N/' + } + loadBrowse(this.id, extra); + } else { + loadBrowse(this.id,''); + } + + }); + $(".sortorder").live("click", function(e) { + var details=this.id.split('_'); + var order='sortby/'+details[2]+'/sortmethod/'+details[3]+'/sorttype/'+details[4]; + loadBrowse(details[1],order); + }); + + function loadBrowse(id,extra) { + var destinationdiv=$('#columnlist_'+id); + if(extra=='') { + destinationdiv.parents("td:first").toggle(); + } else { + destinationdiv.parents("td:first").show(); + } if(destinationdiv.parents("td:first").css("display") != "none") { - $.post(listColumnUrl+'/'+this.id+'/sql/'+sql, function(data) { + $.post(listColumnUrl+'/'+id+'/sql/'+sql+'/'+extra, function(data) { destinationdiv.html(data); }); } - }); + } $('#usegraph').click( function(){ if ($('#grapherror').length>0) { diff --git a/styles/blobblueish/adminstyle.css b/styles/blobblueish/adminstyle.css index 41d5dc05b4c..37bdc13d92c 100644 --- a/styles/blobblueish/adminstyle.css +++ b/styles/blobblueish/adminstyle.css @@ -968,7 +968,7 @@ table.statisticstable, table.statisticssummary { .statisticscolumnid { float: left; text-align: center; - width: 9%; + width: 25px; padding-right: 4px; } .statisticscolumndata { @@ -1651,8 +1651,8 @@ tr.editedrow{ /* main DIV element */ -#showlogicfilediv { - margin: 0px 50px 20px 50px; +#showlogicfilediv { + margin: 0px 50px 20px 50px; padding:0px; text-align: left; } @@ -1661,13 +1661,13 @@ tr.editedrow{ /* main table */ #logicfiletable { - margin-top: 20px; + margin-top: 20px; text-align: center; width: 100%; } table#logicfiletable, #logicfiletable td, #logicfiletable th { - border: 1px solid #000; + border: 1px solid #000; border-collapse: collapse; padding: 4px; } @@ -1681,7 +1681,7 @@ table#logicfiletable th { /* inner table listing question attributes */ table#logicfileattributetable, #logicfileattributetable td, #logicfileattributetable th { - border: 1px dotted #000; + border: 1px dotted #000; border-collapse: collapse; padding: 4px; } @@ -1730,7 +1730,7 @@ tr.LEMsubq td { .LEMheading, .LEMerror{ text-align: left; - margin:20px 50px 0px 50px; + margin:20px 50px 0px 50px; color: red; font-size: 12pt; } @@ -1745,6 +1745,6 @@ td.LEMerror { .highlighterror { - border: 2px solid #FF00FF; + border: 2px solid #FF00FF; color: red; } \ No newline at end of file diff --git a/styles/gartergrey/adminstyle.css b/styles/gartergrey/adminstyle.css index dbd12733465..5d2ee2a349c 100644 --- a/styles/gartergrey/adminstyle.css +++ b/styles/gartergrey/adminstyle.css @@ -672,7 +672,7 @@ div.messagebox .warningheader { .statisticscolumnid { float: left; text-align: center; - width: 9%; + width: 25px; padding-right: 4px; } .statisticscolumndata { @@ -806,8 +806,8 @@ tr.editedrow { /* main DIV element */ -#showlogicfilediv { - margin: 0px 50px 20px 50px; +#showlogicfilediv { + margin: 0px 50px 20px 50px; padding:0px; text-align: left; } @@ -816,13 +816,13 @@ tr.editedrow { /* main table */ #logicfiletable { - margin-top: 20px; + margin-top: 20px; text-align: center; width: 100%; } table#logicfiletable, #logicfiletable td, #logicfiletable th { - border: 1px solid #000; + border: 1px solid #000; border-collapse: collapse; padding: 4px; } @@ -836,7 +836,7 @@ table#logicfiletable th { /* inner table listing question attributes */ table#logicfileattributetable, #logicfileattributetable td, #logicfileattributetable th { - border: 1px dotted #000; + border: 1px dotted #000; border-collapse: collapse; padding: 4px; } @@ -885,7 +885,7 @@ tr.LEMsubq td { .LEMheading, .LEMerror{ text-align: left; - margin:20px 50px 0px 50px; + margin:20px 50px 0px 50px; color: red; font-size: 12pt; } @@ -900,6 +900,6 @@ td.LEMerror { .highlighterror { - border: 2px solid #FF00FF; + border: 2px solid #FF00FF; color: red; } \ No newline at end of file diff --git a/styles/gringegreen/adminstyle.css b/styles/gringegreen/adminstyle.css index e089ad8fe0d..13549fdd59a 100644 --- a/styles/gringegreen/adminstyle.css +++ b/styles/gringegreen/adminstyle.css @@ -994,7 +994,7 @@ table.statisticstable, table.statisticssummary { .statisticscolumnid { float: left; text-align: center; - width: 9%; + width: 25px; padding-right: 4px; } .statisticscolumndata { @@ -1700,8 +1700,8 @@ legend{ /* main DIV element */ -#showlogicfilediv { - margin: 0px 50px 20px 50px; +#showlogicfilediv { + margin: 0px 50px 20px 50px; padding:0px; text-align: left; } @@ -1710,13 +1710,13 @@ legend{ /* main table */ #logicfiletable { - margin-top: 20px; + margin-top: 20px; text-align: center; width: 100%; } table#logicfiletable, #logicfiletable td, #logicfiletable th { - border: 1px solid #000; + border: 1px solid #000; border-collapse: collapse; padding: 4px; } @@ -1730,7 +1730,7 @@ table#logicfiletable th { /* inner table listing question attributes */ table#logicfileattributetable, #logicfileattributetable td, #logicfileattributetable th { - border: 1px dotted #000; + border: 1px dotted #000; border-collapse: collapse; padding: 4px; } @@ -1779,7 +1779,7 @@ tr.LEMsubq td { .LEMheading, .LEMerror{ text-align: left; - margin:20px 50px 0px 50px; + margin:20px 50px 0px 50px; color: red; font-size: 12pt; } @@ -1794,6 +1794,6 @@ td.LEMerror { .highlighterror { - border: 2px solid #FF00FF; + border: 2px solid #FF00FF; color: red; } \ No newline at end of file From 49b9a14ea4b80292742ef8a828b959b0e0acd67c Mon Sep 17 00:00:00 2001 From: jcleeland Date: Thu, 26 Jul 2012 22:18:12 +1000 Subject: [PATCH 51/71] New feature: statistics browse, etc - view file and generic sort icons --- .../admin/export/statistics_browse_view.php | 49 ++++++++++++++++++ styles/blobblueish/images/sort_asc.png | Bin 0 -> 3099 bytes styles/blobblueish/images/sort_desc.png | Bin 0 -> 3106 bytes styles/blobblueish/images/sort_none.png | Bin 0 -> 3077 bytes styles/gartergrey/images/sort_asc.png | Bin 0 -> 3099 bytes styles/gartergrey/images/sort_desc.png | Bin 0 -> 3106 bytes styles/gartergrey/images/sort_none.png | Bin 0 -> 3077 bytes styles/gringegreen/images/sort_asc.png | Bin 0 -> 3104 bytes styles/gringegreen/images/sort_desc.png | Bin 0 -> 3109 bytes styles/gringegreen/images/sort_none.png | Bin 0 -> 3081 bytes 10 files changed, 49 insertions(+) create mode 100644 application/views/admin/export/statistics_browse_view.php create mode 100644 styles/blobblueish/images/sort_asc.png create mode 100644 styles/blobblueish/images/sort_desc.png create mode 100644 styles/blobblueish/images/sort_none.png create mode 100644 styles/gartergrey/images/sort_asc.png create mode 100644 styles/gartergrey/images/sort_desc.png create mode 100644 styles/gartergrey/images/sort_none.png create mode 100644 styles/gringegreen/images/sort_asc.png create mode 100644 styles/gringegreen/images/sort_desc.png create mode 100644 styles/gringegreen/images/sort_none.png diff --git a/application/views/admin/export/statistics_browse_view.php b/application/views/admin/export/statistics_browse_view.php new file mode 100644 index 00000000000..af72a17d91d --- /dev/null +++ b/application/views/admin/export/statistics_browse_view.php @@ -0,0 +1,49 @@ +
    + + + ' class='sortorder' id='sortorder__id__T' style='cursor: pointer' /> +
    +
    + + + ' class='sortorder' id='sortorder____' style='cursor: pointer' />
    +
    + +
    + ' target='_blank'> + ' /> + +
    +
    + +
    +
    + \ No newline at end of file diff --git a/styles/blobblueish/images/sort_asc.png b/styles/blobblueish/images/sort_asc.png new file mode 100644 index 0000000000000000000000000000000000000000..9c50e2c0e6ee016200d85e799c9976891ad630ce GIT binary patch literal 3099 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 literal 0 HcmV?d00001 diff --git a/styles/blobblueish/images/sort_desc.png b/styles/blobblueish/images/sort_desc.png new file mode 100644 index 0000000000000000000000000000000000000000..0240f4e687609d92bfaf3f8420f73eeb3c813257 GIT binary patch literal 3106 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 literal 0 HcmV?d00001 diff --git a/styles/blobblueish/images/sort_none.png b/styles/blobblueish/images/sort_none.png new file mode 100644 index 0000000000000000000000000000000000000000..de9204b3f0ccf0bdfd3e0451e814f43151a3f5f4 GIT binary patch literal 3077 zcmV+g4EpnlP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0003nNklm;S|Ym{WdRig=vulG_2#F0S1Baxk@wARSO+;CwX zoDcZ+M9qiGQ;aOR? zKGsU&`n*T2fRPl4wZhyw_^@1(B$7xXxtWGHlY*@a@ZmGuLKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0003-Nklo%4LQoWC zNuRXP@nlTHqktUvj=MXP?=d^X%-ALrY#Cc`sAfH=)(71F@^F1tM5SDye=)4qKDqJk zpex6)+YqNJu{h0Mxo8Fc<}0;blzKMa=AugcD9u=dT|g-0=h;;>t;$ zR+3z;54h2HA^jNBB&{%rrg$4guvqRfVxP+;gP+;BGOUznPJsfqPGylpxh z#tEiL@>f6vRUsVabzGKbgUJl#q2=)?h*Io}dpT4}25qz)_DumI4Q@DrE)-aXy0F<= pV{_MZxS$JMl=DkB&hF3Q&j7P)l(b%t62brg002ovPDHLkV1l^#$fN)O literal 0 HcmV?d00001 diff --git a/styles/gartergrey/images/sort_desc.png b/styles/gartergrey/images/sort_desc.png new file mode 100644 index 0000000000000000000000000000000000000000..0240f4e687609d92bfaf3f8420f73eeb3c813257 GIT binary patch literal 3106 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 literal 0 HcmV?d00001 diff --git a/styles/gartergrey/images/sort_none.png b/styles/gartergrey/images/sort_none.png new file mode 100644 index 0000000000000000000000000000000000000000..de9204b3f0ccf0bdfd3e0451e814f43151a3f5f4 GIT binary patch literal 3077 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 literal 0 HcmV?d00001 diff --git a/styles/gringegreen/images/sort_none.png b/styles/gringegreen/images/sort_none.png new file mode 100644 index 0000000000000000000000000000000000000000..61562fadf3fbdb7719ce3c57f787679d650161f1 GIT binary patch literal 3081 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 literal 0 HcmV?d00001 From a87b7771f4623d487a71f40829a9793dc8dca260 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 26 Jul 2012 15:21:35 +0200 Subject: [PATCH 52/71] Fixed issue #6383: All languages are presented when editing label set even restricted ones --- application/views/admin/labels/editlabel_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/admin/labels/editlabel_view.php b/application/views/admin/labels/editlabel_view.php index d7f05e93131..df534a7bb91 100644 --- a/application/views/admin/labels/editlabel_view.php +++ b/application/views/admin/labels/editlabel_view.php @@ -36,7 +36,7 @@ \n"; $answer .= "getConfig('surveyID')][$ia[1]]."\" />\n"; @@ -2133,7 +2114,7 @@ function do_ranking($ia) $answer .="
    "; header_includes("ranking.js"); header_includes("ranking.css","css"); - + if(trim($aQuestionAttributes['choice_title'][$clang->langcode]) != '') { $choice_title=htmlspecialchars(trim($aQuestionAttributes['choice_title'][$clang->langcode]), ENT_QUOTES); @@ -2141,7 +2122,7 @@ function do_ranking($ia) else { $choice_title=$clang->gT("Your Choices",'js'); - } + } if(trim($aQuestionAttributes['rank_title'][$clang->langcode]) != '') { $rank_title=htmlspecialchars(trim($aQuestionAttributes['rank_title'][$clang->langcode]), ENT_QUOTES); From be5fced4a5f8f17c912a1bc70c1f856ad8dd9d0f Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 26 Jul 2012 18:04:37 +0200 Subject: [PATCH 54/71] Fixed issue #6259: PDOException: SQLSTATE[42S02]: Base table or view not found: 1146 Table 'ls2.lime_surveys' doesn't exist --- index.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 37104e87b7d..4bde0c9f15a 100644 --- a/index.php +++ b/index.php @@ -143,8 +143,14 @@ define('APPPATH', BASEPATH . $application_folder . '/'); } - - $aSettings= include(APPPATH.'config'.DIRECTORY_SEPARATOR.'config.php'); + if (file_exists(APPPATH.'config'.DIRECTORY_SEPARATOR.'config.php')) + { + $aSettings= include(APPPATH.'config'.DIRECTORY_SEPARATOR.'config.php'); + } + else + { + $aSettings=array(); + } if (isset($aSettings['config']['debug']) && $aSettings['config']['debug']>0) { define('YII_DEBUG', true); From e31ce9a1f37e9662d95e697a5c0654d404f21888 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 26 Jul 2012 22:58:25 +0200 Subject: [PATCH 55/71] Fixed issue: Subquestions and attributes were not properly copied when copying question --- application/controllers/admin/database.php | 22 ++++++++++------------ application/models/Question_attributes.php | 4 ++-- application/models/Questions.php | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php index 35ce353a77a..a952bafed79 100644 --- a/application/controllers/admin/database.php +++ b/application/controllers/admin/database.php @@ -475,7 +475,7 @@ function index($sa = null) if (returnGlobal('copysubquestions') == "Y") { $aSQIDMappings = array(); - $r1 = Questions::getSubQuestions(returnGlobal('oldqid')); + $r1 = Questions::model()->getSubQuestions(returnGlobal('oldqid')); while ($qr1 = $r1->read()) { @@ -488,19 +488,19 @@ function index($sa = null) unset($qr1['qid']); } $qr1['gid'] = $postgid; - $ir1 = Questions::insertRecords($qr1); + $iInsertID = Questions::model()->insertRecords($qr1); if (!isset($qr1['qid'])) { - $aSQIDMappings[$oldqid] = Yii::app()->db->getLastInsertID('qid'); + $aSQIDMappings[$oldqid] = $iInsertID; } } } if (returnGlobal('copyanswers') == "Y") { - $r1 = Answers::getAnswers(returnGlobal('oldqid')); + $r1 = Answers::model()->getAnswers(returnGlobal('oldqid')); while ($qr1 = $r1->read()) { - Answers::insertRecords(array( + Answers::model()->insertRecords(array( 'qid' => $qid, 'code' => $qr1['code'], 'answer' => $qr1['answer'], @@ -512,14 +512,12 @@ function index($sa = null) } if (returnGlobal('copyattributes') == "Y") { - $r1 = Question_attributes::getQuestionAttributes(returnGlobal('oldqid')); + $r1 = Question_attributes::model()->getQuestionAttributes(returnGlobal('oldqid')); while($qr1 = $r1->read()) { - Question_attributes::insertRecords(array( - 'qid' => $qid, - 'attribute' => $qr1['attribute'], - 'value' => $qr1['value'] - )); + $qr1['qid']=$qid; + unset($qr1['qaid']); + Question_attributes::model()->insertRecords($qr1); } } } else { @@ -535,7 +533,7 @@ function index($sa = null) 'attribute' => $validAttribute['name'] ); - Question_attributes::insertRecords($data); + Question_attributes::model()->insertRecords($data); } } diff --git a/application/models/Question_attributes.php b/application/models/Question_attributes.php index 4475d37739c..d0a20a179fb 100644 --- a/application/models/Question_attributes.php +++ b/application/models/Question_attributes.php @@ -55,7 +55,7 @@ function getQuestionAttributes($qid) { return Yii::app()->db->createCommand() ->select() - ->from(self::tableName()) + ->from($this->tableName()) ->where(array('and', 'qid=:qid'))->bindParam(":qid", $qid, PDO::PARAM_STR) ->order('qaid asc') ->query(); @@ -73,7 +73,7 @@ public function getQuestionsForStatistics($fields, $condition, $orderby=FALSE) { $command = Yii::app()->db->createCommand() ->select($fields) - ->from(self::tableName()) + ->from($this->tableName()) ->where($condition); if ($orderby != FALSE) { diff --git a/application/models/Questions.php b/application/models/Questions.php index e3641b46477..fd556a8439c 100644 --- a/application/models/Questions.php +++ b/application/models/Questions.php @@ -189,8 +189,8 @@ function getSubQuestions($parent_qid) return Yii::app()->db->createCommand() ->select() ->from(self::tableName()) - ->where(array('and', 'parent_qid=:parent_qid')) - ->bindParam(":parent_qid", $qid, PDO::PARAM_INT) + ->where('parent_qid=:parent_qid') + ->bindParam(":parent_qid", $parent_qid, PDO::PARAM_INT) ->order('question_order asc') ->query(); } From 90b60d6812ec3b5e782abaaa0199a1026af3503b Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 26 Jul 2012 23:17:14 +0200 Subject: [PATCH 56/71] Fixed issue #6393: Multilingual attributes are lost when copying or importing survey --- application/helpers/export_helper.php | 51 ++++++++----------- .../admin/survey/Question/import_view.php | 2 +- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php index 8e55675302f..ed1a0b5b429 100644 --- a/application/helpers/export_helper.php +++ b/application/helpers/export_helper.php @@ -619,14 +619,14 @@ function surveyGetXMLStructure($iSurveyID, $xmlwriter, $exclude=array()) $platform = Yii::app()->db->getDriverName(); if ($platform == 'mssql' || $platform =='sqlsrv') { - $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value + $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value, qa.language FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} - where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000))"; + where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000)), qa.language"; } else { - $query="SELECT qa.qid, qa.attribute, qa.value + $query="SELECT qa.qid, qa.attribute, qa.value, qa.language FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} - where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value"; + where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value, qa.language"; } buildXMLFromQuery($xmlwriter,$query,'question_attributes'); @@ -1671,14 +1671,14 @@ function groupGetXMLStructure($xml,$gid) $platform = Yii::app()->db->getDriverName(); if ($platform == 'mssql' || $platform =='sqlsrv') { - $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value + $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value, qa.language FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} and q.gid={$gid} - where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000))"; + where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000)), qa.language"; } else { - $query="SELECT qa.qid, qa.attribute, qa.value + $query="SELECT qa.qid, qa.attribute, qa.value, qa.language FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} and q.gid={$gid} - where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value"; + where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value, qa.language"; } buildXMLFromQuery($xml,$query,'question_attributes'); @@ -1704,25 +1704,14 @@ function questionExport($action, $iSurveyID, $gid, $qid) $fn = "limesurvey_question_$qid.lsq"; $xml = getXMLWriter(); - if($action=='exportstructureLsrcCsvQuestion') - { - include_once(APPPATH.'/remotecontrol/lsrc.config.php'); - //Select title as Filename and save - $question = Questions::model()->findByAttributes(array('sid' => $iSurveyID, 'gid' => $gid, 'qid' => $qid)); - $questionTitle = $question->title; - $xml->openURI('remotecontrol/'.$queDir.substr($questionTitle,0,20).".lsq"); - } - else - { - header("Content-Type: text/html/force-download"); - header("Content-Disposition: attachment; filename=$fn"); - header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past - header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); - header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); - header("Pragma: cache"); - // HTTP/1.0 - $xml->openURI('php://output'); - } + header("Content-Type: text/html/force-download"); + header("Content-Disposition: attachment; filename=$fn"); + header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past + header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); + header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); + header("Pragma: cache"); + // HTTP/1.0 + $xml->openURI('php://output'); $xml->setIndent(true); $xml->startDocument('1.0', 'UTF-8'); @@ -1772,14 +1761,14 @@ function questionGetXMLStructure($xml,$gid,$qid) $platform = Yii::app()->db->getDriverName(); if ($platform == 'mssql' || $platform =='sqlsrv') { - $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value + $query="SELECT qa.qid, qa.attribute, cast(qa.value as varchar(4000)) as value, qa.language FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} and q.qid={$qid} - where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000))"; + where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, cast(qa.value as varchar(4000)), qa.language"; } else { - $query="SELECT qa.qid, qa.attribute, qa.value + $query="SELECT qa.qid, qa.attribute, qa.value, qa.language FROM {{question_attributes}} qa JOIN {{questions}} q ON q.qid = qa.qid AND q.sid={$iSurveyID} and q.qid={$qid} - where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value"; + where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value, qa.language"; } buildXMLFromQuery($xml,$query); diff --git a/application/views/admin/survey/Question/import_view.php b/application/views/admin/survey/Question/import_view.php index d73f1276766..3f51bf694fb 100644 --- a/application/views/admin/survey/Question/import_view.php +++ b/application/views/admin/survey/Question/import_view.php @@ -20,5 +20,5 @@
  • gT("Question attributes:") . $aImportResults['question_attributes'] ?>
    • eT("Question import is complete.") ?>
    - +
    \ No newline at end of file From 4d98e921136d73a7e52e275d5e9fe65286ffe86a Mon Sep 17 00:00:00 2001 From: jcleeland Date: Fri, 27 Jul 2012 14:41:57 +1000 Subject: [PATCH 57/71] Fixed issue: multiple short text and multiple numerical results in statistics were endlessly looping, continued cleaning up code --- application/controllers/admin/statistics.php | 72 +------- .../helpers/admin/statistics_helper.php | 154 +++++++----------- .../views/admin/export/statistics_view.php | 3 + 3 files changed, 63 insertions(+), 166 deletions(-) diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 00775624ced..7a25c4b2189 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -37,8 +37,7 @@ public function run($surveyid, $subaction = null) { $surveyid = sanitize_int($surveyid); //TODO: Convert question types to views - - $clang = $this->getController()->lang; + $clang = $this->getController()->lang; $imageurl = Yii::app()->getConfig("imageurl"); $aData = array('clang' => $clang, 'imageurl' => $imageurl); @@ -89,15 +88,6 @@ public function run($surveyid, $subaction = null) */ $maxchars = 50; - - - //don't call this script directly! - //if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');} - - //some includes, the progressbar is used to show a progressbar while generating the graphs - //include_once("login_check.php"); - //require_once('classes/core/class.progressbar.php'); - //we collect all the output within this variable $statisticsoutput =''; @@ -124,54 +114,8 @@ public function run($surveyid, $subaction = null) $language = Survey::model()->findByPk($surveyid)->language; $aData['language'] = $language; -// $chartfontfile = Yii::app()->getConfig("chartfontfile"); -// //pick the best font file if font setting is 'auto' -// if ($chartfontfile=='auto') -// { -// $chartfontfile='vera.ttf'; -// if ( $language=='ar') -// { -// $chartfontfile='KacstOffice.ttf'; -// } -// elseif ($language=='fa' ) -// { -// $chartfontfile='KacstFarsi.ttf'; -// } -// elseif ($language=='el' ) -// { -// $chartfontfile='DejaVuLGCSans.ttf'; -// } -// elseif ($language=='zh-Hant-HK' || $language=='zh-Hant-TW' || $language=='zh-Hans') -// { -// $chartfontfile='fireflysung.ttf'; -// } -// -// } - - //$statisticsoutput .= " - //"; - - //hide/show the filter - //filtersettings by default aren't shown when showing the results - //$statisticsoutput .= ''; + + //Call the javascript file $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'statistics.js'); $aData['display']['menu_bars']['browse'] = $clang->gT("Quick statistics"); @@ -275,11 +219,6 @@ public function run($surveyid, $subaction = null) $aData['selectinc'] = $selectinc; $aData['error'] = $error; - //if ($selecthide!='') - //{ - // $statisticsoutput .= " style='display:none' "; - //} - $survlangs = Survey::model()->findByPk($surveyid)->additionalLanguages; $survlangs[] = Survey::model()->findByPk($surveyid)->language; $aData['survlangs'] = $survlangs; @@ -287,13 +226,10 @@ public function run($surveyid, $subaction = null) //if the survey contains timestamps you can filter by timestamp, too - //Output selector - //second row below options -> filter settings headline - $filterchoice_state=returnGlobal('filterchoice_state'); $aData['filterchoice_state'] = $filterchoice_state; @@ -510,8 +446,6 @@ public function run($surveyid, $subaction = null) //used to adjust linebreaks $previousquestiontype = $flt[2]; - //Group close - //$statisticsoutput .= "\n\t\t\t\t\n\t\t\t\n"; } // ----------------------------------- END FILTER FORM --------------------------------------- diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index cfacea6f606..2dd41e172f6 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -497,8 +497,12 @@ function buildSelects($allfields, $surveyid, $language) { * @param mixed $surveyid The survey id * @param string $outputType * -* @output array $output An array containing "alist"=>A list of answers to the question, "qtitle"=>The title of the question, -* "qquestion"=>The description of the question, "qtype"=>The question type code +* @output array $output An array containing "alist"=>A list of answers to the question in the form of an array ($alist array +* contains an array for every field to be displayed - with the Actual Question Code/Title, The text (flattened) +* of the question, and the fieldname where the data is stored. +* "qtitle"=>The title of the question, +* "qquestion"=>The description of the question, +* "qtype"=>The question type code */ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { @@ -528,71 +532,54 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { break; } - //M - Multiple choice, therefore multiple fields + //M - Multiple choice, therefore multiple fields - one for each answer if ($firstletter == "M" || $firstletter == "P") { //get SGQ data list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); //select details for this question - $nresult = Questions::model()->findAll('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$qqid)); - //$nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; - //$nresult = Yii::app()->db->createCommand($nquery)->query(); - - //loop through question data - foreach ($nresult as $nrow) - { - $qtitle=$nrow['title']; - $qtype=$nrow['type']; - $qquestion=flattenText($nrow['question']); - $qlid=$nrow['parent_qid']; - $qother=$nrow['other']; - } + $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$qqid)); + $qtitle=$nresult->title; + $qtype=$nresult->type; + $qquestion=flattenText($nresult->question); + $qlid=$nresult->parent_qid; + $qother=$nresult->other; //1. Get list of answers - $result=Questions::model()->findAll(array('order'=>'question_order', 'condition'=>'language=:language AND parent_qid=:qid AND scale_id=0', 'params'=>array(':language'=>$language, ':qid'=>$qqid))); + $result=Questions::model()->findAll(array('order'=>'question_order', + 'condition'=>'language=:language AND parent_qid=:qid AND scale_id=0', + 'params'=>array(':language'=>$language, ':qid'=>$qqid) + )); foreach ($result as $row) { $mfield=substr($rt, 1, strlen($rt)).$row['title']; - - //create an array containing answer code, answer and fieldname(??) $alist[]=array($row['title'], flattenText($row['question']), $mfield); } - //check "other" field. is it set? + //Add the "other" answer if it exists if ($qother == "Y") { $mfield=substr($rt, 1, strlen($rt))."other"; - - //create an array containing answer code, answer and fieldname(??) $alist[]=array($statlang->gT("Other"), $statlang->gT("Other"), $mfield); } } - - //S - Short Free Text - //T - Long Free Text + //S - Short Free Text and T - Long Free Text elseif ($firstletter == "T" || $firstletter == "S") //Short and long text { - //search for key $fld = substr($rt, 1, strlen($rt)); $fielddata=$fieldmap[$fld]; list($qanswer, $qlid)=!empty($fielddata['aid']) ? explode("_", $fielddata['aid']) : array("", ""); - //get SGQ data - //list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - //get question data - $nresult = Questions::model()->findAll('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$fielddata['qid'])); - foreach ($nresult as $nrow) - { - $qtitle=$nrow['title']; - $qtype=$nrow['type']; - $qquestion=flattenText($nrow['question']); - $nlid=$nrow['parent_qid']; - } + $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$fielddata['qid'])); + $qtitle=$nresult->title; + $qtype=$nresult->type; + $qquestion=flattenText($nresult->question); + $qlid=$nresult->parent_qid; $mfield=substr($rt, 1, strlen($rt)); @@ -604,53 +591,41 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { $alist[]=array("NoAnswer", $statlang->gT("No answer"), $mfield); } - - //Multiple short text + //Q - Multiple short text elseif ($firstletter == "Q") { + //Build an array of legitimate qid's for testing later + $qidquery = Questions::model()->findAll("sid=:surveyid AND parent_qid=0", array(":surveyid"=>$surveyid)); + foreach ($qidquery as $row) { $legitqids[] = $row['qid']; } //get SGQ data list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); - //separating another ID $tmpqid=substr($qqid, 0, strlen($qqid)-1); - //check if we have legid QIDs. if not create them by substringing + //check if we have a QID that actually exists. if not create them by substringing. Note that + //all of this is due to the fact that when we create a field for an subquestion, we don't seperate + //the question id from the subquestion id - and this is a weird, backwards way of doing that. while (!in_array ($tmpqid,$legitqids)) $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1); - //length of QID $iQuestionIDlength=strlen($tmpqid); - //we somehow get the answer code (see SQL later) from the $qqid $qaid=substr($qqid, $iQuestionIDlength, strlen($qqid)-$iQuestionIDlength); - //get some question data - $nquery = "SELECT title, type, question, other FROM {{questions}} WHERE qid='".substr($qqid, 0, $iQuestionIDlength)."' AND parent_qid=0 AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + //get question data + $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>substr($qqid, 0, $iQuestionIDlength))); + $qtitle=$nresult->title; + $qtype=$nresult->type; + $qquestion=flattenText($nresult->question); //more substrings $count = substr($qqid, strlen($qqid)-1); - //loop through question data - foreach ($nresult->readAll() as $nrow) - { - $nrow=array_values($nrow); - $qtitle=flattenText($nrow[0]).'-'.$count; - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - } - //get answers - $qquery = "SELECT title as code, question as answer FROM {{questions}} WHERE parent_qid='".substr($qqid, 0, $iQuestionIDlength)."' AND title='$qaid' AND language='{$language}' ORDER BY question_order"; - $qresult=Yii::app()->db->createCommand($qquery)->query(); - - //loop through answer data - foreach ($qresult->readAll() as $qrow) - { - $qrow=array_values($qrow); - //store each answer here - $atext=flattenText($qrow[1]); - } - + $nresult = Questions::model()->find(array('order'=>'question_order', + 'condition'=>'language=:language AND parent_qid=:parent_qid AND title=:title', + 'params'=>array(':language'=>$language, ':parent_qid'=>substr($qqid, 0, $iQuestionIDlength), ':title'=>$qaid) + )); + $atext=flattenText($nresult->question); //add this to the question title $qtitle .= " [$atext]"; @@ -665,7 +640,6 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { $alist[]=array("NoAnswer", $statlang->gT("No answer"), $mfield); } - //RANKING OPTION elseif ($firstletter == "R") { @@ -707,20 +681,12 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { list($qsid, $qgid, $qqid) = explode("X", substr($rt, 1, strlen($rt)), 3); //select details for this question - $nquery = "SELECT title, type, question, parent_qid, other FROM {{questions}} WHERE language='{$language}' AND parent_qid=0 AND qid='$qqid'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); - - //loop through question data - foreach ($nresult->readAll() as $nrow) - { - $nrow=array_values($nrow); - $qtitle=$nrow[0]; - $qtype=$nrow[1]; - $qquestion=flattenText($nrow[2]); - $qlid=$nrow[3]; - $qother=$nrow[4]; - } - + $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>substr($qqid, 0, $iQuestionIDlength))); + $qtitle=$nresult->title; + $qtype=$nresult->type; + $qquestion=flattenText($nresult->question); + $qlid=$nresult->parent_qid; + $qother=$nresult->other; /* 4) Average size of file per respondent 5) Average no. of files @@ -756,7 +722,6 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { foreach ($result->readAll() as $row) { - $json = $row['json']; $phparray = json_decode($json); @@ -865,6 +830,9 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { //multiple numerical input if($firstletter == "K") { + //Build an array of legitimate qid's for testing later + $qidquery = Questions::model()->findAll("sid=:surveyid AND parent_qid=0", array(":surveyid"=>$surveyid)); + foreach ($qidquery as $row) { $legitqids[] = $row['qid']; } // This is a multiple numerical question so we need to strip of the answer id to find the question title $tmpqid=substr($qqid, 0, strlen($qqid)-1); @@ -879,19 +847,21 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { $qaid=substr($qqid, $iQuestionIDlength, strlen($qqid)-$iQuestionIDlength); //get question details from DB - $nquery = "SELECT title, type, question, qid, parent_qid + $nresult=Questions::model()->findAll('parent_qid=0 AND qid=:qid AND language=:language', array(':qid'=>substr($qqid, 0, $iQuestionIDlength), ':language'=>$language)); + /* $nquery = "SELECT title, type, question, qid, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='".substr($qqid, 0, $iQuestionIDlength)."' AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + $nresult = Yii::app()->db->createCommand($nquery)->query(); */ } //probably question type "N" = numerical input else { + $nresult=Questions::model()->findAll('parent_qid=0 AND qid=:qid AND language=:language', array(':qid'=>$qqid, ':language'=>$language)); //we can use the qqid without any editing - $nquery = "SELECT title, type, question, qid, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; - $nresult = Yii::app()->db->createCommand($nquery)->query(); + /* $nquery = "SELECT title, type, question, qid, parent_qid FROM {{questions}} WHERE parent_qid=0 AND qid='$qqid' AND language='{$language}'"; + $nresult = Yii::app()->db->createCommand($nquery)->query(); */ } //loop through results @@ -1394,19 +1364,14 @@ function buildOutputList($rt, $language, $surveyid, $outputType, $sql) { { //search for key $fielddata=$fieldmap[$rt]; - //print_r($fielddata); //get SGQA IDs $qsid=$fielddata['sid']; $qgid=$fielddata['gid']; $qqid=$fielddata['qid']; $qanswer=$fielddata['aid']; - - //question type $qtype=$fielddata['type']; - //question string $qastring=$fielddata['question']; - //question ID $rqid=$qqid; @@ -1843,8 +1808,8 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ //picks out answer list ($outputs['alist']/$al)) that come from the multiple list above if (isset($al[2]) && $al[2]) { - //handling for "other" option + //handling for "other" option if ($al[0] == $statlang->gT("Other")) { if($outputs['qtype']=='!' || $outputs['qtype']=='L') @@ -1869,7 +1834,6 @@ function displayResults($outputs, $results, $rt, $outputType, $surveyid, $sql, $ * S = short free text * Q = multiple short text */ - elseif ($outputs['qtype'] == "U" || $outputs['qtype'] == "T" || $outputs['qtype'] == "S" || $outputs['qtype'] == "Q" || $outputs['qtype'] == ";") { $sDatabaseType = Yii::app()->db->getDriverName(); @@ -3454,10 +3418,6 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0, //START Chop up fieldname and find matching questions - //Build an array of legitimate qid's for testing later - $qidquery = Questions::model()->findAll("sid=:surveyid AND parent_qid=0", array(":surveyid"=>$surveyid)); - foreach ($qidquery as $row) { $legitqids[] = $row['qid']; } - //loop through all selected questions foreach ($runthrough as $rt) { diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php index 5a682f3ade4..e7818d04e54 100644 --- a/application/views/admin/export/statistics_view.php +++ b/application/views/admin/export/statistics_view.php @@ -1293,6 +1293,9 @@
    +
    <?php $clang->eT("Maximize"); ?><?php $clang->eT("Minimize"); ?>
    eT("Statistics"); ?> From 8fdaa8d2e31c60c5c5a1fc3f317bc0785a30aa71 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Fri, 27 Jul 2012 14:56:56 +1000 Subject: [PATCH 58/71] Fixed issue: escaping in statistics browse text responses view, also added title/hover info for browse view --- application/views/admin/export/statistics_browse_view.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/application/views/admin/export/statistics_browse_view.php b/application/views/admin/export/statistics_browse_view.php index af72a17d91d..83fe22fa332 100644 --- a/application/views/admin/export/statistics_browse_view.php +++ b/application/views/admin/export/statistics_browse_view.php @@ -1,3 +1,6 @@ +lang; +?>
    ' target='_blank'> - ' /> + ' title='eT("View response"); ?>'/>
    - +
    Date: Fri, 27 Jul 2012 15:44:08 +1000 Subject: [PATCH 59/71] Fixed issue #6287: unable to export QueXML with Postgresql 9.1 Fixed issue #6297: QueXML Export broken Dev Removed condition checking for queXML export --- application/helpers/export_helper.php | 58 +-------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php index ed1a0b5b429..4528ec42200 100644 --- a/application/helpers/export_helper.php +++ b/application/helpers/export_helper.php @@ -816,65 +816,11 @@ function QueXMLFixedArray($array) * @return bool|string Text of item to skip to otherwise false if nothing to skip to * @author Adam Zammit * @since 2010-10-28 +* @TODO Correctly handle conditions in a database agnostic way */ function QueXMLSkipTo($qid,$value,$cfieldname = "") { - global $iSurveyID, $quexmllang; - $qlang = new limesurvey_lang($quexmllang); - - $zeros = "0000000000"; - - $Query = "SELECT q.*," . concat("RIGHT(" . concat($zeros,'g.gid') . ",10)","RIGHT(". concat($zeros,'q.question_order') .",10)") ." as globalorder - FROM {{questions}} as q, {{questions}} as q2, {{groups}} as g, {{groups}} as g2 - WHERE q.parent_qid = 0 - AND q2.parent_qid = 0 - AND q.sid=$iSurveyID - AND q2.sid=$iSurveyID - AND q2.qid = $qid - AND g2.gid =q2.gid - AND g.gid = q.gid - AND " . concat("RIGHT(" . concat($zeros,'g.gid') . ",10)","RIGHT(". concat($zeros,'q.question_order') .",10)") ." > " . concat("RIGHT(" . concat($zeros,'g2.gid') . ",10)","RIGHT(". concat($zeros,'q2.question_order') .",10)") ." - ORDER BY globalorder"; - - $QueryResult = Yii::app()->db->createCommand($Query)->query(); - - $nextqid=""; - $nextorder=""; - - $Row = $QueryResult->read(); - if ($Row) - { - $nextqid = $Row['qid']; - $nextorder = $Row['globalorder']; - } - else - return false; - - - $Query = "SELECT q.* - FROM {{questions}} as q - JOIN {{groups}} as g ON (g.gid = q.gid) - LEFT JOIN {{conditions}} as c ON (c.cqid = '$qid' AND c.qid = q.qid AND c.method LIKE '==' AND c.value NOT LIKE '$value' $cfieldname) - WHERE q.sid = $iSurveyID - AND q.parent_qid = 0 - AND " . concat("RIGHT(" . concat($zeros,'g.gid') . ",10)","RIGHT(". concat($zeros,'q.question_order') .",10)") ." >= $nextorder - AND c.cqid IS NULL - ORDER BY " . concat("RIGHT(" . concat($zeros,'g.gid') . ",10)","RIGHT(". concat($zeros,'q.question_order') .",10)"); - - - $QueryResult = Yii::app()->db->createCommand($Query)->query(); - - $Row = $QueryResult->read(); - if ($Row) - { - if ($nextqid == $Row['qid']) - return false; - else - return $Row['title']; - } - else - return $qlang->gT("End"); - + return false; } /** From 5421bbd628b0466702e0834c0300c209144d58bb Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Fri, 27 Jul 2012 08:41:55 +0200 Subject: [PATCH 60/71] Fixed issue #6395: QuickAdd permits longer codes than 5 characters --- scripts/admin/answers.js | 2 +- scripts/admin/subquestions.js | 2 +- scripts/admin/updateset.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/admin/answers.js b/scripts/admin/answers.js index 11b7e7cb0bd..6a569b62700 100644 --- a/scripts/admin/answers.js +++ b/scripts/admin/answers.js @@ -599,7 +599,7 @@ function quickaddlabels() } else { - thisrow[0]=thisrow[0].replace(/[^A-Za-z0-9]/g, ""); + thisrow[0]=thisrow[0].replace(/[^A-Za-z0-9]/g, "").substr(0,5); } if (typeof thisrow[parseInt(x)+1]=='undefined') diff --git a/scripts/admin/subquestions.js b/scripts/admin/subquestions.js index 2a85c61ca15..b1c272cd267 100644 --- a/scripts/admin/subquestions.js +++ b/scripts/admin/subquestions.js @@ -559,7 +559,7 @@ function quickaddlabels() } else { - thisrow[0]=thisrow[0].replace(/[^A-Za-z0-9]/g, ""); + thisrow[0]=thisrow[0].replace(/[^A-Za-z0-9]/g, "").substr(0,5); } var randomid='new'+Math.floor(Math.random()*111111) diff --git a/scripts/admin/updateset.js b/scripts/admin/updateset.js index 96338efc6b2..fbdf0cf568d 100644 --- a/scripts/admin/updateset.js +++ b/scripts/admin/updateset.js @@ -92,7 +92,7 @@ function quickaddfunction(){ params = element.split(seperatorchar); k = 0; if (params.length > $(".lslanguage").length){ - code = params[0].replace(/[^a-zA-Z 0-9]+/g,''); + code = params[0].replace(/[^a-zA-Z 0-9]+/g,'').substr(0,5); i++; } @@ -344,4 +344,4 @@ function code_duplicates_check() function is_numeric (mixed_var) { return (typeof(mixed_var) === 'number' || typeof(mixed_var) === 'string') && mixed_var !== '' && !isNaN(mixed_var); -} \ No newline at end of file +} From 03b34c89bb359cea1d14a8c74b1b50648fa01640 Mon Sep 17 00:00:00 2001 From: jcleeland Date: Fri, 27 Jul 2012 16:42:18 +1000 Subject: [PATCH 61/71] Fixed issue: the background color of the jqGrid loading modal is too dark. This may not be the best colour, but it's better :-) --- application/controllers/admin/statistics.php | 2 -- styles/gringegreen/jquery-ui/jquery-ui.css | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 7a25c4b2189..545dcccfd21 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -476,9 +476,7 @@ public function run($surveyid, $subaction = null) exit; break; default: - break; - } } //end if -> show summary results diff --git a/styles/gringegreen/jquery-ui/jquery-ui.css b/styles/gringegreen/jquery-ui/jquery-ui.css index 053f3132a7d..4466e537644 100644 --- a/styles/gringegreen/jquery-ui/jquery-ui.css +++ b/styles/gringegreen/jquery-ui/jquery-ui.css @@ -147,7 +147,8 @@ } .ui-state-active,.ui-widget-content .ui-state-active { - background-color: #797979; + /* background-color: #797979; */ + background-color: #DBEAF9; font-weight: bold; color: #4e8632; outline: none; From 85598c958007448993739631ba4c01dcd0b13fac Mon Sep 17 00:00:00 2001 From: jcleeland Date: Fri, 27 Jul 2012 17:29:57 +1000 Subject: [PATCH 62/71] Fixed issue: tokens table not displaying more than 25 entries. Also added sort capabilities. --- application/controllers/admin/tokens.php | 6 +++++- scripts/admin/tokens.js | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php index 79c4804031d..f97dd94dd6b 100644 --- a/application/controllers/admin/tokens.php +++ b/application/controllers/admin/tokens.php @@ -356,10 +356,14 @@ function getTokens_json($iSurveyId) } $clang = $this->getController()->lang; $page = Yii::app()->request->getPost('page'); + $sidx = Yii::app()->request->getPost('sidx'); + $sidx = !empty($sidx) ? $sidx : "lastname"; + $sord = Yii::app()->request->getPost('sord'); + $sord = !empty($sord) ? $sord : "asc"; $limit = Yii::app()->request->getPost('rows'); $limit = isset($limit) ? $limit : 25; //Stop division by zero errors $page = isset($page) ? $page : 1; //Stop division by zero errors - $tokens = Tokens_dynamic::model($iSurveyId)->findAll(); + $tokens = Tokens_dynamic::model($iSurveyId)->findAll(array("order"=>$sidx. " ". $sord)); $aData = new stdClass; $aData->page = $page; diff --git a/scripts/admin/tokens.js b/scripts/admin/tokens.js index 4930be2c684..3902e21595d 100644 --- a/scripts/admin/tokens.js +++ b/scripts/admin/tokens.js @@ -122,12 +122,12 @@ $(document).ready(function() { editable:true, scrollOffset:0, sortable : true, - sortname: 'id', + sortname: 'tid', sortorder: 'asc', viewrecords : true, rowList: [25,50,100,250,500,1000,5000,10000], multiselect: true, - loadonce : true, + loadonce : false, loadComplete: function() { /* Sneaky way of adding custom icons to jqGrid pager buttons */ From 2fd21671f150f0bcfe09e073622925b5ec2bc892 Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Fri, 27 Jul 2012 11:26:44 +0200 Subject: [PATCH 63/71] Fixed issue #6066: File upload fails if single oder double quotes are used --- .../helpers/expressions/em_manager_helper.php | 6 +++++ scripts/uploader.js | 22 ++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php index bf15c992488..ce5f7cafad3 100644 --- a/application/helpers/expressions/em_manager_helper.php +++ b/application/helpers/expressions/em_manager_helper.php @@ -4554,6 +4554,12 @@ private function _UpdateValuesInDatabase($updatedValues, $finished=false) } // otherwise will already be in yyyy-mm-dd format after ProcessCurrentResponses() break; + case '|': //File upload + // This block can be removed once we require 5.3 or later + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { + $val=addslashes($val); + } + break; case 'N': //NUMERICAL QUESTION TYPE case 'K': //MULTIPLE NUMERICAL QUESTION if (trim($val)=='') { diff --git a/scripts/uploader.js b/scripts/uploader.js index c393cbcc4f2..c04d3225254 100644 --- a/scripts/uploader.js +++ b/scripts/uploader.js @@ -28,11 +28,11 @@ $(document).ready(function(){ previewblock += ""; if ($('#'+fieldname+'_show_title').val() == 1 && $('#'+fieldname+'_show_comment').val() == 1) - previewblock += "



    "; + previewblock += "



    "; else if ($('#'+fieldname+'_show_title').val() == 1) - previewblock += ""; + previewblock += ""; else if ($('#'+fieldname+'_show_comment').val() == 1) - previewblock += ""; + previewblock += ""; previewblock += ""+ ""+ @@ -202,7 +202,7 @@ function passJSON(fieldname, show_title, show_comment, pos) { var i = 1; while (i <= licount) { - + if ($("#"+fieldname+"_li_"+i).is(':visible')) { if (filecount > 0) @@ -210,9 +210,9 @@ function passJSON(fieldname, show_title, show_comment, pos) { json += '{'; if ($("#"+fieldname+"_show_title").val() == 1) - json += '"title":"' +$("#"+fieldname+"_title_" +i).val()+'",'; + json += '"title":"' +$("#"+fieldname+"_title_" +i).val().replace(/"/g, '\"')+'",'; if ($("#"+fieldname+"_show_comment").val() == 1) - json += '"comment":"'+$("#"+fieldname+"_comment_"+i).val()+'",'; + json += '"comment":"'+$("#"+fieldname+"_comment_"+i).val().replace(/"/g, '\"')+'",'; json += '"size":"' +$("#"+fieldname+"_size_" +i).val()+'",'+ '"name":"' +$("#"+fieldname+"_name_" +i).val()+'",'+ '"filename":"' +$("#"+fieldname+"_filename_" +i).val()+'",'+ @@ -297,3 +297,13 @@ function deletefile(fieldname, count) { xmlhttp.open('GET',uploadurl+'/delete/1/fieldname/'+fieldname+'/filename/'+filename+'/name/'+encodeURI(name), true); xmlhttp.send(); } + + +function escapeHtml(unsafe) { + return unsafe + .replace(/&/g, "&") + .replace(//g, ">") + .replace(/"/g, """) + .replace(/'/g, "'"); +} From 0521fbf65a64bf5f08d7ba8bcf3f166bce13267c Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Fri, 27 Jul 2012 12:40:38 +0200 Subject: [PATCH 64/71] Fixed issue: Survey breaking if configured template does not exist --- application/controllers/OptinController.php | 2 +- application/controllers/OptoutController.php | 4 +- .../controllers/RegisterController.php | 2 +- application/controllers/survey/index.php | 29 +++---- application/helpers/SurveyRuntimeHelper.php | 50 ++++++------ application/helpers/common_helper.php | 34 ++++---- application/helpers/frontend_helper.php | 78 ++++++++++--------- application/helpers/qanda_helper.php | 6 +- application/helpers/replacements_helper.php | 2 +- application/libraries/Load_answers.php | 8 +- application/libraries/Save.php | 9 ++- .../views/admin/dataentry/content_view.php | 2 +- 12 files changed, 116 insertions(+), 110 deletions(-) diff --git a/application/controllers/OptinController.php b/application/controllers/OptinController.php index f9fbe1c15ec..b9d2a8fb89d 100644 --- a/application/controllers/OptinController.php +++ b/application/controllers/OptinController.php @@ -93,7 +93,7 @@ function actionLocal($surveyid, $token, $langcode = '') //PRINT COMPLETED PAGE if (!$thissurvey['templatedir']) { - $thistpl=getTemplatePath($defaulttemplate); + $thistpl=getTemplatePath(Yii::app()->getConfig("defaulttemplate")); } else { diff --git a/application/controllers/OptoutController.php b/application/controllers/OptoutController.php index 960e3e055be..e466fc6a9e6 100644 --- a/application/controllers/OptoutController.php +++ b/application/controllers/OptoutController.php @@ -96,7 +96,7 @@ function actiontokens() //PRINT COMPLETED PAGE if (!$thissurvey['templatedir']) { - $thistpl=getTemplatePath($defaulttemplate); + $thistpl=getTemplatePath(Yii::app()->getConfig("defaulttemplate")); } else { @@ -196,7 +196,7 @@ function actionparticipants() //PRINT COMPLETED PAGE if (!$thissurvey['templatedir']) { - $thistpl=getTemplatePath($defaulttemplate); + $thistpl=getTemplatePath(Yii::app()->getConfig("defaulttemplate")); } else { diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php index 0dad4b36045..f54e5e1e2a6 100644 --- a/application/controllers/RegisterController.php +++ b/application/controllers/RegisterController.php @@ -29,9 +29,9 @@ function actionAJAXRegisterForm Yii::app()->loadHelper('database'); Yii::app()->loadHelper('replacements'); $redata = compact(array_keys(get_defined_vars())); - $thistpl = Yii::app()->getConfig("standardtemplaterootdir").'/default'; $surveyid = sanitize_int($surveyid); $row = Survey::model()->find('sid=:sid',array(':sid' => $surveyid)) or show_error("Can't find survey data"); + $thistpl=getTemplatePath(validateTemplateDir($row->template)); $data['sid'] = $surveyid; $data['startdate'] = $row->startdate; $data['enddate'] = $row->expires; diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php index c3b06110ee1..a44aebf84a5 100644 --- a/application/controllers/survey/index.php +++ b/application/controllers/survey/index.php @@ -20,7 +20,7 @@ public function run() function action() { - global $surveyid, $thistpl, $totalquestions; + global $surveyid, $totalquestions; global $thissurvey, $thisstep; global $clienttoken, $tokensexist, $token; $clang = Yii::app()->lang; @@ -160,10 +160,7 @@ function action() $sDisplayLanguage = Yii::app()->getConfig('defaultlang'); } $clang = $this->_loadLimesurveyLang($sDisplayLanguage); - if(!isset($defaulttemplate)) - { - $defaulttemplate=Yii::app()->getConfig("defaulttemplate"); - } + $languagechanger = makeLanguageChanger($sDisplayLanguage); //Find out if there are any publicly available surveys $query = "SELECT sid, surveyls_title, publicstatistics, language @@ -276,24 +273,23 @@ function action() "list"=>implode("\n",$list), ); - $thissurvey['templatedir'] = $defaulttemplate; $data['thissurvey'] = $thissurvey; //$data['privacy'] = $privacy; $data['surveylist'] = $surveylist; $data['surveyid'] = $surveyid; - $data['templatedir'] = getTemplatePath($defaulttemplate); - $data['templateurl'] = getTemplateURL($defaulttemplate)."/"; - $data['templatename'] = $defaulttemplate; + $data['templatedir'] = getTemplatePath(Yii::app()->getConfig("defaulttemplate")); + $data['templateurl'] = getTemplateURL(Yii::app()->getConfig("defaulttemplate"))."/"; + $data['templatename'] = Yii::app()->getConfig("defaulttemplate"); $data['sitename'] = Yii::app()->getConfig("sitename"); $data['languagechanger'] = $languagechanger; //A nice exit sendCacheHeaders(); doHeader(); - $this->_printTemplateContent(getTemplatePath($defaulttemplate)."/startpage.pstpl", $data, __LINE__); + $this->_printTemplateContent(getTemplatePath(Yii::app()->getConfig("defaulttemplate"))."/startpage.pstpl", $data, __LINE__); - $this->_printTemplateContent(getTemplatePath($defaulttemplate)."/surveylist.pstpl", $data, __LINE__); + $this->_printTemplateContent(getTemplatePath(Yii::app()->getConfig("defaulttemplate"))."/surveylist.pstpl", $data, __LINE__); echo '\n\n"; echo "
    \n"; - echo templatereplace(file_get_contents("$thistpl/load.pstpl"),array(),$redata); + echo templatereplace(file_get_contents($sTemplatePath."load.pstpl"),array(),$redata); //PRESENT OPTIONS SCREEN (Replace with Template Later) //END echo "\n"; @@ -41,7 +41,7 @@ function run($args) { } echo "
    "; - echo templatereplace(file_get_contents("$thistpl/endpage.pstpl"),array(),$redata); + echo templatereplace(file_get_contents($sTemplatePath."endpage.pstpl"),array(),$redata); doFooter(); exit; diff --git a/application/libraries/Save.php b/application/libraries/Save.php index e7083da2399..771970758bb 100644 --- a/application/libraries/Save.php +++ b/application/libraries/Save.php @@ -58,11 +58,12 @@ class Save { function showsaveform() { //Show 'SAVE FORM' only when click the 'Save so far' button the first time, or when duplicate is found on SAVE FORM. - global $thistpl, $errormsg, $thissurvey, $surveyid, $clang, $clienttoken, $thisstep; + global $errormsg, $thissurvey, $surveyid, $clang, $clienttoken, $thisstep; $redata = compact(array_keys(get_defined_vars())); + $sTemplatePath=$_SESSION['survey_'.$surveyid]['templatepath']; sendCacheHeaders(); doHeader(); - echo templatereplace(file_get_contents("$thistpl/startpage.pstpl"),array(),$redata); + echo templatereplace(file_get_contents($sTemplatePath."startpage.pstpl"),array(),$redata); echo "\n\n\n" ."\t