Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3312748

Timestamp:

06/16/2025 08:25:54 PM (10 months ago)

Author:

wibergsweb

Message:

Focus on attributes for grouping totals and bugfix while using headerrow_exists is set to no.

Location:

csv-to-html

Files:

: 891 added
: 2 edited

Legend:

: Unmodified
: Added
: Removed

csv-to-html/trunk/csvtohtml.php

-                      r3308108
+                      r3312748
 Plugin URI: http://www.wibergsweb.se/plugins/csvtohtml
 Description:Display/edit/synchronize csv-file(s) dynamically into a html-table
 Version: 3.57
+Version: 3.63
 Author: Wibergs Web
 Author URI: http://www.wibergsweb.se/
 …
             'htmltags_autoconvert_imagealt' => '',              //Set alt text based on a specific columns value (Or same text for all images if you just set some text here instead of a number)
             'htmltags_autoconvert_imagewidth' => null,          //Width of converted images, can be set in px (default), %, vw, em, rem etc
-            'totals_cols_bottom_countlines' => 'no',            //Total number of lines
-            'totals_cols_bottom' => null,                       //Add totals with given columns at bottom of table (example 1,2,4 or 1-2,4)
-            'totals_cols_bottom_empty' => '',                   //What string/character (maybe a zero?) to show when there's no calculation
             'totals_cols_prefix' => '',                         //Add prefix to the total column(s) (e.g. $10)
             'totals_cols_suffix' => '',                         //Add suffix to the total column(s) (e.g. 10$)
+            'totals_forgrouping' => 'no',                       //When totals_forgrouping is set to yes, totals are shown for each grouping (instead of whole table)
+            'totals_cols_bottom_countlines' => 'no',            //Total number of lines
+            'totals_cols_bottom' => null,                       //Add totals with given columns at bottom of table (or grouping) (example 1,2,4 or 1-2,4)
+            'totals_cols_bottom_empty' => '',                   //What string/character (maybe a zero?) to show when there's no calculation
             'totals_cols_bottom_title' => null,                 //Set a specific string when added totals (overrides totals_cols_bottom_empty)
+            'totals_cols_bottom_title_col' => null,             //Which column to set this specific string
+            'totals_cols_bottom_title_col' => null,             //Which column to set this specific string
+            'totals_cols_top_countlines' => 'no',               //Total number of lines
+            'totals_cols_top' => null,                          //Add totals with given columns at top of table (or grouping)
+            'totals_cols_top_empty' => '',                      //What string/character (maybe a zero?) to show when there's no calculation
+            'totals_cols_top_title' => null,                    //Set a specific string when added totals (overrides totals_cols_top_empty)
+            'totals_cols_top_title_col' => null,                //Which column to set this specific string
             'total_percentage_above_table' => 'yes',            //Show total percentage of a specific value above table
             'total_percentage_below_table' => 'no',             //Show total percentage of a specific value below table
 …
         if ( $groupby_col !== null )
+        {
+            $groups_arr = [];
+            $groups_arr = [];
+            if ($totals_forgrouping === 'yes')
+            {
+                if ( $totals_cols_top !== null )
+                {
+                    $use_cols = $this->adjust_columns( $totals_cols_top );
+                }
+                $groups_arr_totals = [];
+            }
             $groupby_column = $groupby_col-1; //Index-based 0
 …
+                }
+                $groups_arr[$groupedby_value][] = array_slice($row,0);
+            }
+                $groups_arr[$groupedby_value][] = array_slice($row,0);
+                //Set totals for all columns for this group
+                if ($totals_forgrouping === 'yes')
+                {
+                    if (!isset($groups_arr_totals[$groupedby_value]))
+                    {
+                        $groups_arr_totals[$groupedby_value] = array_fill(0,count($row_values),0);
+                    }
+                    //Count totals for columns
+                    foreach($use_cols as $key=>$column)
+                    {
+                        if ( $totals_cols_top_countlines === "yes" )
+                        {
+                            $add_value = 1; //Count lines instead of values
+                        }
+                        else
+                        {
+                            $add_value = (int)($row[$column][1]); //Actual value in column to add
+                        }
+                        $groups_arr_totals[$groupedby_value][$column] += $add_value;
+                    }
+                }
+            }
             //...then simply create new array based on temporary array
             //(so things will get in correct order)
 …
                     $row_groupedby_header = [];
                     $first_col = true;
                     foreach( $inner_arr[0] as $kv=>$value ) //$inner_arr is basically the first item, so we know number of cols
+                    foreach( $inner_arr[0] as $kv=>$value ) //$inner_arr is basically the first item, so we know number of cols. $kv is the index of column
+                    {
                         if ( $first_col === true )
 …
                         else
+                        {
+                            $row_groupedby_header[] = ['', ''];
+                        }
+                            if ($totals_forgrouping === 'yes')
+                            {
+                                if ( in_array($kv, $use_cols) !== false)
+                                {
+                                    $row_groupedby_header[] = ['', '<span class="subtotal">' . $totals_cols_prefix . $groups_arr_totals[$key][$kv] . $totals_cols_suffix  . '</span>'];
+                                }
+                                else
+                                {
+                                    //If title is set somewhere for totals, override totals_col_top_empty setting
+                                    //($kv is index of column, so $kv=0 is column1, $kv=1 is column2 etc)
+                                    if ( mb_strlen( $totals_cols_top_title ) >0 && (int)$totals_cols_top_title_col == $kv+1 )
+                                    {
+                                        $row_groupedby_header[] = ['', '<span class="subtotal-title">' . $totals_cols_top_title . '</span>'];
+                                    }
+                                    else
+                                    {
+                                        $row_groupedby_header[] = ['', '<span class="subtotal-novalue">' . $totals_cols_top_empty . '</span>'];
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                $row_groupedby_header[] = ['', ''];
+                            }
+                        }
+                    }
                     $row_values[] = array_slice($row_groupedby_header,0);
 …
         //If skip header is set to yes, header will not be included in html
         $hide_row_class = '';
+        $nr_col = 1;
         if ( $skip_headerrow === "no" )
+        {
 …
             //Take for granted HTML5 is used. Then this below is ok
             $nr_col = 1;
             $html .= '<style>';
             if ( $header_type === "sticky" )
 …
+        {
             $use_cols = $this->adjust_columns( $totals_cols_bottom );
             $row_sum = [];
             $cnt_rowvalues = count ( $row_values );
             //If totals_cols_bottom_countlines is defined and set to yes,
             //then count lines else don't
 …
+            }
+            for( $i=0;$i<$nr_col-1;$i++ )
+            $nr_col = count($row_values[0]);
+            for( $i=0;$i<$nr_col;$i++ )
+            {
                 if ( in_array( $i, $use_cols) !== false )
 …
                             $row_sum[$i][] = $numberonly_str;
+                        }
+                    }
+                    }
+                    $subtract_fromtotal = 0;
+                    //If using totals for grouping, these subtotals should not
+                    //be included in total sum, therefore tell how much to subtract in total below
+                    if ($totals_forgrouping === 'yes')
+                    {
+                        foreach($groups_arr_totals as $gat)
+                        {
+                            $subtract_fromtotal += $gat[$i];
+                        }
+                    }
                     //Add row with totals to the bottom of table
                     //If suffix or prefix (or both) is given then print out those as well
+                    //If suffix or prefix (or both) is given then print out those as well
                     if ( !empty( $row_sum[$i] ))
+                    {
+                        $row_values[$cnt_rowvalues][$i] = array( '',  $totals_cols_prefix . array_sum($row_sum[$i]) . $totals_cols_suffix );
+                        //subtract_fromtotal is used when using subtotals in this column
+                        $row_values[$cnt_rowvalues][$i] = array( '',  '<span class="total">' . $totals_cols_prefix . array_sum($row_sum[$i]) - $subtract_fromtotal . $totals_cols_suffix . '</span>');
+                    }
+                }
 …
+                {
                     //Show empty totals (not even zeros)
                     $row_values[$cnt_rowvalues][$i] = array('',   $totals_cols_bottom_empty );
+                    $row_values[$cnt_rowvalues][$i] = array('',   '<span class="empty-novalue">' . $totals_cols_bottom_empty . '</span>' );
+                }
 …
                     if ( $title_col === $i )
+                    {
                         $row_values[$cnt_rowvalues][$i] = array( '',  $totals_cols_bottom_title );
+                        $row_values[$cnt_rowvalues][$i] = array( '',  '<span class="total-title">' . $totals_cols_bottom_title . '</span>' );
+                    }
+                }
 …
                 else
+                {
+                    if ( empty( $tablecell_hidecolumn_class[$m_colkey] ) ) {$tablecell_hidecolumn_class[$m_colkey] = '';}
                     if ( !isset( $inner_value[1] ) )
+                    {
 …
                         if ( $nr_col == 1 )
+                        {
-                            if ( empty( $tablecell_hidecolumn_class[$m_colkey] ) ) {$tablecell_hidecolumn_class[$m_colkey] = '';}
                             $html .= '<'. $tdh . ' data-editable="' . $editable . '" class="' . $tablecell_hidecolumn_class[$m_colkey] . 'td colset colset-' . $nr_col . '">';
+                        }

csv-to-html/trunk/readme.txt

-                      r3308108
+                      r3312748
 Requires PHP: 8.0
 Requires at least: 3.0.1
 Tested up to: 6.8.1
 Stable Tag: 3.57
+Tested up to: 6.8
+Stable Tag: 3.63
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 * CSV to HTML addon
+= 3.63 = (2025-06-16)
+Bugfix: When using headerrow_exists="no" totals were not shown. They are now.
+Totals now available for each grouping (at top at each grouping) when using group by column.
+Suffixes, prefixes also avaialable in grouping totals (same attributes as before)
+Count lines instead of sum in grouping totals, total_cols_top_empty in grouping,
+New attributes (only applicable for grouping totals): totals_forgrouping, totals_cols_top_empty, totals_cols_top_title, totals_cols_top_title_col
+Classes added for totals and subtotals for easier applicance of css.
 = 3.57 = (2025-06-08)
 Internally now using the class as singleton (good for using this plugin from other plugins etc)

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory

Context Navigation

Changeset 3312748

Legend:

csv-to-html/trunk/csvtohtml.php

csv-to-html/trunk/readme.txt

Download in other formats: