Bugfix and works with Limesurvey Version 3.15.6+190108

tt33tt
reportico-web · Jun 4, 2019 · c5e4706 · c5e4706
1 parent bc546ed
commit c5e4706
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 9 deletions.
diff --git a/Reportico.php b/Reportico.php
@@ -1,5 +1,5 @@
 <?php 
-class Reportico extends \ls\pluginmanager\PluginBase {
+class Reportico extends LimeSurvey\PluginManager\PluginBase {
 
 
     protected $storage = 'DbStorage';
@@ -9,7 +9,7 @@ class Reportico extends \ls\pluginmanager\PluginBase {
     public $engine;
     private $_assetsUrl;
 
-    public function __construct(PluginManager $manager, $id) {
+    public function __construct(LimeSurvey\PluginManager\PluginManager $manager, $id) {
         parent::__construct($manager, $id);
 
         /**

diff --git a/ReporticoAdminMenuItem.php b/ReporticoAdminMenuItem.php
@@ -1,5 +1,5 @@
 <?php
-class ReporticoAdminMenuItem extends \ls\menu\MenuItem {
+class ReporticoAdminMenuItem extends LimeSurvey\Menu\MenuItem {
 
     public function __construct($options) {
         parent::__construct($options);

diff --git a/ReporticoMainMenu.php b/ReporticoMainMenu.php
@@ -1,5 +1,5 @@
 <?php
-class ReporticoMainMenu extends \ls\menu\Menu {
+class ReporticoMainMenu extends LimeSurvey\Menu\Menu {
 
     public function __construct($options) {
         parent::__construct($options);

diff --git a/ReporticoMenuItem.php b/ReporticoMenuItem.php
@@ -1,5 +1,5 @@
 <?php
-class ReporticoMenuItem extends \ls\menu\MenuItem {
+class ReporticoMenuItem extends LimeSurvey\Menu\MenuItem {
 
     public function __construct($options) {
         parent::__construct($options);

diff --git a/components/reportico.php b/components/reportico.php
@@ -8913,8 +8913,6 @@ function get_value_delimiter()
 
 }
 
-
-
 // Setup SESSION
 //set_up_reportico_session();
 

diff --git a/components/reportico_defaults.php b/components/reportico_defaults.php
@@ -155,4 +155,85 @@ function reportico_defaults($reportico)
                 $reportico->create_page_footer("F1", 2, "Page: {PAGE}{STYLE border-width: 1 0 0 0; margin: 40 0 0 0; font-style: italic; }" );
             }
     }   
+
+    /*
+    * Creates a denormalized representation of lime_survey_xxxxx table
+    * for easy joining row by row questions, answers and actual responses
+    * Creates a temporary table
+    *
+    * Parameters
+    * engine - reference to the reportico process in order yo 
+    */
+
+function denormalize_survey_responses($engine)
+{
+$survey = $engine->get_criteria_value("survey");
+$group = $engine->get_criteria_value("group");
+
+    $swhere = "";
+    $gwhere = "";
+    if ( $survey ) $swhere = " AND s.sid in ( $survey )";
+    if ( $group ) $gwhere = " AND g.gid in ( $group )";
+    $sql = "select s.sid, g.gid, q.qid,
+        g.group_name,
+        q.title,
+        q.question,
+        q.type,
+        cq.title ch_title,
+        CASE
+            WHEN cq.title IS NOT NULL THEN concat(s.sid, 'X', g.gid, 'X', q.qid, cq.title )
+            ELSE concat(s.sid, 'X', g.gid, 'X', q.qid )
+        END id
+            from lime_surveys s
+            join lime_groups g ON g.sid = s.sid $swhere $gwhere
+            join lime_questions q ON q.gid = g.gid AND q.parent_qid  = 0
+            left join lime_questions cq ON cq.parent_qid = q.qid
+        where 1 = 1
+    ";
+
+    $stmt = Yii::app()->db->createCommand($sql)->queryAll();
+    //echo "<PRE>";
+    $unions = [];
+    foreach ( $stmt as $row )
+    {
+        $unions[]  = sprintf("SELECT '%s' group_name, \n
+                              '%s' title, \n
+                              '%s' question, \n
+                              '%s' type, \n
+                              '%s' id, \n
+                              '%s' qid, \n
+                              '%s' gid, \n
+                              '%s' ch_title, \n
+                              s.%s code, \n
+                                0 count
+                        FROM lime_survey_%s AS s \n
+                        LEFT JOIN lime_answers AS a \n
+                          ON a.code = s.%s
+                          AND a.qid = '%s' \n",
+        $row["group_name"],
+        $row["title"],
+        preg_replace("/'/", "/\'/", $row["question"]),
+        $row["type"],
+        $row["id"],
+        $row["qid"],
+        $row["gid"],
+        $row["ch_title"],
+        $row["id"],
+        $row["sid"],
+        $row["id"],
+        $row["qid"]);
+    }
+
+    $union = implode( "\nUNION ALL\n", $unions);
+
+    $union = "CREATE TEMPORARY TABLE t_answers AS $union";
+    $stmt = Yii::app()->db->createCommand($union)->execute();
+
+    //echo "<PRE>";
+    //echo $the_union;
+    //echo "</PRE>";
+
+    $sql = "UPDATE t_answers SET count = 1 WHERE code IS NOT NULL";
+    return Yii::app()->db->createCommand($sql)->execute();
+}
 ?>
diff --git a/components/reportico_report_html.php b/components/reportico_report_html.php
@@ -142,7 +142,7 @@ function finish ()
 	function abs_paging_height($height_string)
 	{
 		$height = (int)$height_string;
-		if ( strstr($height_string, "%" ) )
+		if ( $this->page_height && strstr($height_string, "%" ) ) //Bugfix
 		{
 			$height = (int)
 				( $this->page_height * $height_string ) / 100;

diff --git a/config.php b/config.php
@@ -10,7 +10,6 @@
             'path_to_assets' => 'packages/reportico/reportico',
 
             // Path relative to laravel pase or fully where projects will be created
-            //'path_to_projects' => __DIR__."/components/projects",
             'path_to_projects' => Yii::app()->getRuntimePath()."/reportico/projects",
 
             // Path relative to laravel pase or fully where admin project will be stored