Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3308108

Timestamp:

06/08/2025 04:38:27 PM (8 months ago)

Author:

wibergsweb

Message:

3.57 - Internal fixes regarding to object handling (singleton). Bugfix excel more columns than Z.

Location:

csv-to-html

Files:

: 891 added
: 3 edited

Legend:

: Unmodified
: Added
: Removed

csv-to-html/trunk/csvtohtml.php

-                      r3258805
+                      r3308108
 Plugin URI: http://www.wibergsweb.se/plugins/csvtohtml
 Description:Display/edit/synchronize csv-file(s) dynamically into a html-table
 Version: 3.54
+Version: 3.57
 Author: Wibergs Web
 Author URI: http://www.wibergsweb.se/
 …
 use PhpOffice\PhpSpreadsheet\Writer\Csv;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 if( !class_exists('csvtohtmlwp') )
 …
     class csvtohtmlwp
+    {
+    private static $instance = null;                //Use this class as singleton object. Store it in this variable
+    private $source_type = 'guess';                 //Sourcetype stored in object. Usage from external sources , like addons
+    private $nr_cols = 0;                           //Number of columns stored in object. Usage: external sources
+    private $all_rowdata;                           //Stores an array of all row data (excluding filters etc)
     private $csv_delimit;                           //Used when using anonymous function in array_map when loading file(s) into array(s)
     private $title;                                 //Used together with sourcetype guessonecol
 …
     /**
+     *  get_instance()
+     *
+     *  @param  void
+     *  @return object              instance of this class (singleton)
+     *
+     */
+    public static function get_instance()
+    {
+        if ( self::$instance === null )
+        {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+    /**
+     *  get_sourcetype()
+     *
+     *  This function will return sourcetype
+     *
+     *  @param  void
+     *  @return string          source type
+     *
+     */
+    public function get_sourcetype()
+    {
+        return $this->source_type;
+    }
+    /**
+     *
+     *  get_nrcols()
+     *
+     *  This function will return number of columns in current fetched file(s)
+     *
+     *  @param  void
+     *  @return integer                 Number of columns found
+     *
+     */
+    public function get_nrcols()
+    {
+        return $this->nr_cols;
+    }
+    /**
+     *
+     *  get_rowdata()
+     *
+     *  This function will return rows of current fetched file(s)
+     *
+     *  @param  void
+     *  @return array                   Array of rows
+     *
+     */
+    public function get_rowdata() {
+        return $this->all_rowdata;
+    }
+    /**
     *  Constructor
+    *
 …
     *  @param   N/A
     *  @return  N/A
+    *
     */
     public function __construct()
+    private function __construct()
+    {
         if ( ! function_exists( 'WP_Filesystem' ) )
 …
             'name' => true,
             'type' => true,
+            'value' => true,
             '&quest;' => true
+            )
 …
+    }
+    /**
+    *  on_activation()
+    *
+    *  on activation of this plugin
+    *
+    *  @param   N/A
+    *  @return  N/A
+    *
+    */
     public static function on_activation()
+    {
 …
+    }
+    /**
+    *  on_deactivation()
+    *
+    *  on deactivation of this plugin
+    *
+    *  @param   N/A
+    *  @return  N/A
+    *
+    */
     public static function on_deactivation()
+    {
 …
+    }
     /**
+     *
 …
         $data = [];
         $html = '';
         $html = apply_filters( 'csvtohtml_before_table_html', $html, $new_arr );
+        $html = apply_filters( 'csvtohtml_before_table_html', $html );
         if (isset( $_POST) )
 …
+    {
         $this->check_permission('manage_options');
         echo '<h1>CSV to HTML Shortcode Generator</h1>';
+        echo '<h1 class="shortcode-generator">CSV to HTML Shortcode Generator</h1>';
         echo '<form id="previewbuttonform" spellcheck="false"><input type="button" id="update_shortcode" value="Update/Preview"></form>';
 …
         $rows_arr =  $this->source_to_table( $temp_attribs );
+        if ( !empty ( $rows_arr ) )
+        {
+            $this->all_rowdata = array_slice($rows_arr,0);
+        }
         //Calculate cols and rows
         $nr_cols = 0;
+        $this->nr_cols = 0;
         if ( isset( $rows_arr[0] ) )
+        {
             $nr_cols = count( $rows_arr[0] );
+        }
+            $this->nr_cols = $nr_cols;
+        }
         if ( $temp_attribs['source_type'] === 'guessonecol' )
+        {
 …
+        {
             $nr_cols = 1;
+            $this->nr_cols = 1;
+        }
 …
             'filter_criterias' => '',                           //and,or -logic when filtering: in format col,col,col or col,col (e.g. 1,6 or 2,9)
             'groupby_col' => null,                              //Group values by this column
             'groupby_col_header' => 'yes',                      //Set new header within the table for each grouping
+            'groupby_col_header' => 'no',                      //Set new header within the table for each grouping
             'eol_detection' => 'auto',                          //Use linefeed when using external files, Default auto = autodetect, CR/LF = Carriage return when using external files, CR = Carriage return, LF = Line feed
             'convert_encoding_from' => null,                    //If you want to convert character encoding from source. (use both from and to for best result)
 …
             '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' => null,            //Total number of lines
+            '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
 …
+                {
                     $highestRow = $sheet->getHighestRow();
+                    $highestColumn = $sheet->getHighestColumn();
+                    $highestColumn = $sheet->getHighestColumn(); //This is in letter-format.
                     for ( $row = 1; $row <= $highestRow; $row++ )
+                    {
+                        $rowData = [];
+                        for ( $col = 'A'; $col <= $highestColumn; $col++ )
+                        $rowData = [];
+                        //Compare with indexes instead of just letters for stable comparions
+                        $highestColumnIndex = Coordinate::columnIndexFromString($highestColumn);
+                        for ( $col = 1; $col <= $highestColumnIndex; $col++ )
+                        {
+                            $cell = $sheet->getCell( $col . $row );
+                            $colLetter = Coordinate::stringFromColumnIndex($col);
+                            $cell = $sheet->getCell( $colLetter . $row );
                             $value = $cell->getValue();
 …
+        }
+        $this->source_type = $source_type;
         $this->csv_delimit = $csv_delimiter; //Use this char as delimiter
         if ( $excel_convertdates === "yes" )
 …
+}
+$csvtohtmlwp = new csvtohtmlwp();
+csvtohtmlwp::get_instance();
 // Register activation and deactivation hooks
 register_activation_hook(__FILE__, array('csvtohtmlwp', 'on_activation'));

csv-to-html/trunk/js/wibergsweb198.js

-                      r3240486
+                      r3308108
     //Shortcode creation help function
+    function  check_length( input_type , element_name ) {
+    window.check_length = function( input_type , element_name ) {
+        var use_val = true;
         var tp = 'input';
         if (input_type=='select') {
           tp = 'select';
+        }
+        if (input_type=='button') {
+            tp = 'button';
+            use_val = false; //Use attr instead
+        }
         var element_nofrm = element_name.substr(4); //Remove four first chars (frm_)
         //Value exists, return value
         //If no html-object found, just return ''
+        let el_val = $('#dynamic_form').find(tp + '[name="' + element_name  + '"]').val();
+        let el_val;
+        if ( use_val === true ) {
+            el_val = $('#dynamic_form').find(tp + '[name="' + element_name  + '"]').val();
+        }
+        else {
+            el_val =  $('#shortcode_preview').find(tp + '[name="' + element_name + '"]').attr('value');
+        }
         if (!el_val) {return '';}
 …
     //Shortcode creation help function
+    function generate_shortcode() {
+    window.generate_shortcode = function() {
         var sc_arr = [];
 …
         sc_arr.push ( check_length('select', 'frm_grabcontent_col_fromlink'));
         sc_arr.push ( check_length('select', 'frm_grabcontent_col_tolink'));
         sc_arr.push ( check_length('select', 'frm_grabcontent_col_tolink_addhttp'));
+        sc_arr.push ( check_length('select', 'frm_grabcontent_col_tolink_addhttps'));
         sc_arr.push(']');
 …
     //If path / files etc has changed, values in form must be updated
     //regarding to columns, rows etc
     function updatevalues_fromshortcode() {
+    window.updatevalues_fromshortcode = function() {
         let selected_value = $('#new_shortcode').val();
         var current_url = my_ajax_object.ajax_url;
+        //Store focus and position of textarea
+        let isFocused = $('#new_shortcode').is(':focus');
+        let cursorPos = $('#new_shortcode')[0].selectionStart;
         $.ajax({
             url: current_url,
 …
         .done(function( response ) {
             $('#dynamic_form').html( response );
+            //Restore focus and position of textarea after update dynamic form
+            if (isFocused) {
+                $('#new_shortcode').focus();
+                $('#new_shortcode')[0].setSelectionRange(cursorPos, cursorPos);
+            }
             $("div.csvtohtml-p.admin h2").on( "click", function() {
                 $(this).parent().toggleClass('selectedsection');

csv-to-html/trunk/readme.txt

-                      r3259859
+                      r3308108
 Requires PHP: 8.0
 Requires at least: 3.0.1
 Tested up to: 6.7.2
 Stable Tag: 3.54
+Tested up to: 6.8.1
+Stable Tag: 3.57
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 * CSV to HTML addon
+= 3.57 = (2025-06-08)
+Internally now using the class as singleton (good for using this plugin from other plugins etc)
+get_sourcetype(), get_nrcols(), get_rowdata() can now be used from external sources. Making update_valuesfromshortcode() globally available in the js windows object
+Group by column default is now set to no
+Selection of sheet bugfix when using more columns than the letter Z.
 = 3.54 = (2025-03-19)
 programmatically use new attribute rows_array_all_cols_rows to fetch all columns and rows as an array

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

Trac UI Preferences

Plugin Directory