diff --git a/main/survey/reporting.php b/main/survey/reporting.php index f152a92c88..3504bd7ca4 100755 --- a/main/survey/reporting.php +++ b/main/survey/reporting.php @@ -161,7 +161,7 @@ async function exportToPdf() { await html2canvas(table).then(function(canvas) { var pageData = canvas.toDataURL("image/jpeg", 1); headerY = 530.28/canvas.width * canvas.height; - pdf.addImage(pageData, "JPEG", 40, 60, 530, headerY); + pdf.addImage(pageData, "JPEG", 35, 60, 530, headerY); }); var divs = doc.getElementsByClassName("question-item"); @@ -174,7 +174,7 @@ async function exportToPdf() { pages[page] = 0; } - var positionY = 160; + var positionY = 150; pages[page] += 1; var diff = 250; if (page > 1) { @@ -183,17 +183,17 @@ async function exportToPdf() { diff = 220; } if (pages[page] > 1) { - positionY = pages[page] * diff + 10; + positionY = pages[page] * diff + 5; } const title = $(divs[i]).find(".title-question"); - pdf.setFontSize(12); + pdf.setFontSize(10); pdf.text(40, positionY, title.text()); var svg = divs[i].querySelector("svg"); svg2pdf(svg, pdf, { - xOffset: 10, - yOffset: positionY + 10, + xOffset: 150, + yOffset: positionY, scale: 0.45 }); @@ -201,8 +201,8 @@ async function exportToPdf() { var config= {}; for (var j = 0; j < tables.length; j += 1) { await html2canvas(tables[j], config).then(function(canvas) { - var pageData = canvas.toDataURL("image/jpeg", 0.8); - pdf.addImage(pageData, "JPEG", 40, positionY + 200, 500, 500/canvas.width * canvas.height); + var pageData = canvas.toDataURL("image/jpeg", 0.7); + pdf.addImage(pageData, "JPEG", 40, positionY + 175, 500, 500/canvas.width * canvas.height); }); } diff --git a/main/survey/surveyUtil.class.php b/main/survey/surveyUtil.class.php index d4b5b6c8a1..9a514b0fcb 100755 --- a/main/survey/surveyUtil.class.php +++ b/main/survey/surveyUtil.class.php @@ -734,7 +734,7 @@ class SurveyUtil array_push($chartData, ['option' => $optionText, 'votes' => $votes]); } $chartContainerId = 'chartContainer'.$question['question_id']; - echo '
'; + echo '
'; echo self::drawChart($chartData, false, $chartContainerId, false); echo '
'; @@ -3911,23 +3911,23 @@ class SurveyUtil $serieValue = isset($chartDataElement['serie']) ? $chartDataElement['serie'] : null; if (!$hasSerie) { - $data .= get_lang("Option").'":"'.$option.'", "'; + $data .= get_lang('Option').'":"'.$option.'", "'; array_push($order, $option); } else { if (!is_array($serieValue)) { $data .= - get_lang("Option").'":"'.$serieValue.'", "'. - get_lang("Score").'":"'.$option.'", "'; + get_lang('Option').'":"'.$serieValue.'", "'. + get_lang('Score').'":"'.$option.'", "'; array_push($serie, $serieValue); } else { $data .= - get_lang("Serie").'":"'.$serieValue[0].'", "'. - get_lang("Option").'":"'.$serieValue[1].'", "'. - get_lang("Score").'":"'.$option.'", "'; + get_lang('Serie').'":"'.$serieValue[0].'", "'. + get_lang('Option').'":"'.$serieValue[1].'", "'. + get_lang('Score').'":"'.$option.'", "'; } } - $data .= get_lang("Votes").'":"'.$chartDataElement['votes'].'"},'; - rtrim($data, ","); + $data .= get_lang('Votes').'":"'.$chartDataElement['votes'].'"},'; + rtrim($data, ','); } if ($loadLibs) { @@ -3937,14 +3937,18 @@ class SurveyUtil $htmlChart .= '