Merge pull request #1 from manikk/master

Increasing the no. of columns support
intellipharm-pty-ltd · May 24, 2018 · 3332925 · 3332925
2 parents 7a873f1 + 7f419ac
commit 3332925
Show file tree

Hide file tree

Showing 3 changed files with 700 additions and 2 deletions.
diff --git a/src/scripts/models/worksheet-model.js b/src/scripts/models/worksheet-model.js
@@ -60,7 +60,8 @@ window.JSFile = window.JSFile || {};
                 self[cell_letter + cell_number] = new module.WorksheetCell({type: 's', value: item.value});
 
                 // increment letter
-                cell_letter = module.FileUtil.nextLetter(cell_letter);
+                //cell_letter = module.FileUtil.nextLetter(cell_letter);
+                cell_letter = module.FileUtil.nextColumn(cell_letter);
 
                 // count letters
                 _letter_count++;

diff --git a/src/scripts/utils/file-util.js b/src/scripts/utils/file-util.js
@@ -259,7 +259,7 @@ window.JSFile = window.JSFile || {};
                     }
 
                     // increment letter
-                    letter = self.nextLetter(letter);
+                    letter = self.nextColumn(letter);
                 });
 
             });
@@ -439,6 +439,43 @@ window.JSFile = window.JSFile || {};
 
             return result;
         };
+
+        this.nextColumn = function(currentColumn) {
+            //Logic only works upto two series column - A ... ZZ
+            //As it supports around 702 columns, in which practically we wouldn't hit
+
+            var charCode;
+
+            // convert letter to upper case
+            currentColumn = currentColumn.toUpperCase();
+            var nxtColumn = "";
+
+            if(currentColumn.length > 2) {
+                console.warn("Only 702 columns are supported");
+            }
+
+            if(currentColumn[currentColumn.length -1] === "Z" ) {
+                // Generate unicode value for given character
+                charCode = currentColumn.charCodeAt(0);
+                var suffix = "A";
+                if(charCode < 90) {
+                    // Convert integer to character
+                    nxtColumn = String.fromCharCode(charCode + 1)  + suffix;
+                } else {
+                    suffix += "A";
+                    nxtColumn = suffix;
+                }
+
+            } else {
+                // Generate unicode value for given character
+                charCode = currentColumn[currentColumn.length -1].charCodeAt(0);
+                var prefix = currentColumn.slice(0, -1);
+                // Convert integer to character
+                nxtColumn = prefix + String.fromCharCode(charCode + 1);
+            }
+
+            return nxtColumn;
+        };
     };
 
     // create singleton