WordPress.org
Get WordPress

Plugin Directory

Changeset 2807498


Ignore:
Timestamp:
10/30/2022 07:50:39 PM (3 years ago)
Author:
Elvin.Haci
Message:

2 bug fixes from 2.3.4 - on rendering X axis values

Location:
sql-chart-builder
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • sql-chart-builder/trunk/functions.php

    r2806127 r2807498  
    435435}
    436436
    437 function guaven_sqlcharts_local_shortcode($atts)
    438 {
     437function guaven_sqlcharts_local_shortcode($atts) {
    439438    $remote_host=get_post_meta($atts['id'], 'guaven_sqlcharts_dbhost', true);
    440439    if ($remote_host!=''){
    … …  
    494493    }
    495494
    496 echo gvn_chart_top_form($atts);
    497 ?>
     495    echo gvn_chart_top_form($atts);
     496    ?>
    498497    <canvas
    499498        id="ct-chart_<?php echo $sqlcharts_inserted_script; ?>"
    … …  
    505504     var ctx = jQuery("#ct-chart_<?php
    506505    echo $sqlcharts_inserted_script;
    507 ?>");
    508 
    509 <?php
    510     guaven_sqlcharts_print_chart_js($tip_g, $post_g->post_title, $labels, $values, $ylabel, $atts['id']);
    511 ?>
    512 </script>
    513 
    514 <?php
     506    ?>");
     507
     508    <?php
     509        guaven_sqlcharts_print_chart_js($tip_g, $post_g->post_title, $labels, $values, $ylabel, $atts['id']);
     510    ?>
     511    </script>
     512
     513    <?php
    515514    if (!empty($atts["table"])) echo guaven_sqlcharts_tablepart($post_g->post_title, $labels, $values, $ylabel,$xlabel);
    516515    $sqlcharts_inserted_script++;
    … …  
    537536  $colors=get_post_meta($pid,'guaven_sqlcharts_colors',true);
    538537  $colors=explode(",",$colors);
     538  //var_dump($colors,$index,$colors[$index]);
    539539  if (!empty($colors[$index])) return $colors[$index];
    540540  return rand(0, 255) . ',' . rand(0, 255) . ',' . rand(0, 255);
    … …  
    557557    var data = {
    558558    labels: [<?php
    559     echo implode(",", $labels[0]);
     559    echo implode(",", guaven_sqlcharts_merge_labeldata($labels) );
    560560?>],
    561561    datasets: [
    … …  
    625625}
    626626
    627 
     627function guaven_sqlcharts_merge_labeldata($labels){
     628    if(count($labels)==1)return $labels[0];
     629    $merged=[];
     630    foreach($labels as $label){
     631        $merged=array_merge($merged,$label);
     632    }
     633    return array_unique($merged);
     634}
    628635
    629636function guaven_sqlcharts_linedata($title, $labels, $values, $ylabel, $type = 'false', $pid = null)
    … …  
    632639var data = {
    633640    labels: [<?php
    634     echo implode(",", $labels[0]);
     641    echo implode(",", guaven_sqlcharts_merge_labeldata($labels));
    635642?>],
    636643    datasets: [
    … …  
    717724    };
    718725    var data = {
    719     labels: [ <?php echo implode(",", $labels[0]);?>],
     726    labels: [ <?php echo implode(",", guaven_sqlcharts_merge_labeldata($labels));?>],
    720727    datasets: [
    721728    <?php
    … …  
    734741            backgroundColor: [
    735742                <?php
     743                $ii=0;
    736744                foreach($values[$i] as $vci=>$valuecolor){
    737                     echo guaven_sqlcharts_colorgenerator(1, 0, 0, guaven_sqlcharts_colors($vci, $pid));
     745                    echo guaven_sqlcharts_colorgenerator(1, 0, 0, guaven_sqlcharts_colors($ii, $pid));
     746                    $ii++;
    738747                }       
    739748?>
    … …  
    742751               <?php
    743752               foreach($values[$i] as $vci=>$valuecolor){
    744                 echo guaven_sqlcharts_colorgenerator(1, 0, 0.2, guaven_sqlcharts_colors($vci, $pid));
     753                echo guaven_sqlcharts_colorgenerator(1, 0, 0.2, guaven_sqlcharts_colors($i, $pid));
    745754            }
    746755?>
    … …  
    800809  $tabledata='';
    801810  $fcol=[];$scol=[];
    802   $tablein='<br>';
    803   foreach($values as $valuerow){
     811  $empty_cell=apply_filters( 'guaven_sqlcharts_table_empty_cell','<td></td>');
     812  $tablein='';
     813  foreach($values as $row=>$valuerow){
    804814    foreach ($valuerow as $key => $value) {
    805       $fcol[$key]='<td>'.str_replace('"',"",$labels[0][$key]).'</td>';
    806       $scol[$key][]='<td>'.$value.'</td>';
    807 
    808     }
    809   }
     815      $putval=$labels[$row][$key]??'';
     816      $fcol[$key]='<td>'.str_replace('"',"",$putval).'</td>';
     817      $scol[$key][$row]='<td>'.$value.'</td>';
     818    }
     819    foreach($scol as $scolkey=>$scolvalue){
     820        for($i=0;$i<count($values);$i++){
     821            //echo $i;
     822            if(!isset($scolvalue[$i]))$scol[$scolkey][$i]=$empty_cell;;
     823        }
     824        ksort($scol[$scolkey]);
     825      }
     826  } 
     827 
    810828  foreach($fcol as $key=>$value){
    811829    $tablein.='<tr>'.$value.implode(" ",$scol[$key]).'</tr>'.PHP_EOL;
    … …  
    835853function guaven_sqlcharts_key_normalizer($values,$labels,$ylabel){
    836854    $normalize_keys=[];
     855    $empty_value=apply_filters( 'guaven_sqlcharts_table_empty_value','');
    837856    foreach ($values as $key_ak=>$value_ak) {
    838857        $normalize_keys=array_merge($normalize_keys,array_keys($values[$key_ak]));
    … …  
    841860    foreach($normalize_keys as $normalized_key){
    842861        foreach ($values as $key_ak=>$value_ak) {
    843             $values_normalized[$key_ak][$normalized_key]=isset( $values[$key_ak][$normalized_key])? $values[$key_ak][$normalized_key]:"''";
     862            $values_normalized[$key_ak][$normalized_key]=isset( $values[$key_ak][$normalized_key])? $values[$key_ak][$normalized_key]:"'".$empty_value."'";
    844863            $labels_normalized[$key_ak][$normalized_key]=isset( $labels[$key_ak][$normalized_key])? $labels[$key_ak][$normalized_key]:"''";
    845             $ylabel_normalized[$key_ak][$normalized_key]=isset( $ylabel[$key_ak][$normalized_key])? $ylabel[$key_ak][$normalized_key]:"''";
     864            $ylabel_normalized[$key_ak][$normalized_key]=isset( $ylabel[$key_ak][$normalized_key])? $ylabel[$key_ak][$normalized_key]:"";
    846865        }
    847866    }
    848867    return [$values_normalized,$labels_normalized,$ylabel_normalized];
    849868}
     869
     870
     871add_filter('guaven_sqlcharts_table_empty_cell',function($str){return '<td>#</td>';});
     872add_filter('guaven_sqlcharts_table_empty_value',function($str){return 'N/A';});

  • sql-chart-builder/trunk/guaven_sqlcharts.php

    r2806127 r2807498  
    44 * Plugin URI:        http://guaven.com/updatepusher
    55 * Description:       Turn Your SQL Queries into Beautiful Dynamic Charts- Pie, Line, Area, Donut, Bar, Polar Charts with date/input filters.
    6  * Version:           2.3.4
     6 * Version:           2.3.5
    77 * Author:            Guaven Labs
    88 * Author URI:        http://guaven.com/
    … …  
    1616}
    1717
    18 define('GVNSQLCHARTS_VERSION','2.3.4');
     18define('GVNSQLCHARTS_VERSION','2.3.5');
    1919
    2020

  • sql-chart-builder/trunk/readme.txt

    r2806127 r2807498  
    44Requires at least: 5.0.0
    55Tested up to: 6.0.2
    6 Stable tag: 2.3.4
     6Stable tag: 2.3.5
    77Donate link: https://guaven.com/service/small-thankyou-premium-support-service/
    88License: GPLv2 or later
    … …  
    9797
    9898== Changelog ==
     99= 2.3.5=
     100
     101* 2 bug fixes on chart rendering X axis values
    99102= 2.3.4=
    100103
Note: See TracChangeset for help on using the changeset viewer.