SF.net SVN: ledger-smb:[5497] branches/1.3

[..hidden..]

Revision: 5497
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5497&view=rev
Author:   einhverfr
Date:     2013-01-06 07:13:48 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
Merging trunk fixes for dynatable into LedgerSMB 1.3

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/UI/lib/dynatable.tex

Property Changed:
----------------
    branches/1.3/


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-06 07:08:32 UTC (rev 5496)
+++ branches/1.3/Changelog	2013-01-06 07:13:48 UTC (rev 5497)
@@ -13,6 +13,7 @@
 * Fixing extra blank lines showing up on ar/ap trans screen on save (Chris T)
 * Changing xetex demos to use Liberation font (Chris T, h/t Erik H)
 * Better appearance of customer history report filter screen (Chris T)
+* Fixed new Dynatable.tex not handling col ids with underscores (Chris T)
 
 Changelog for 1.3.27
 * Detect whether ledgersmb.conf exists during Makefile.PL run and create if

Modified: branches/1.3/UI/lib/dynatable.tex
===================================================================
--- branches/1.3/UI/lib/dynatable.tex	2013-01-06 07:08:32 UTC (rev 5496)
+++ branches/1.3/UI/lib/dynatable.tex	2013-01-06 07:13:48 UTC (rev 5497)
@@ -5,6 +5,9 @@
                 # This assumes a 1cm margin on either side. --CT
 DECLARED_WIDTH=0; 
 
+SKIP_TYPES = ['hidden', 'radio', 'checkbox'];
+
+
 FOREACH COL IN columns;
     DECLARED_WIDTH = DECLARED_WIDTH + COL.pwidth; # pwidth is arbitrary scale
 END; 
@@ -21,7 +24,9 @@
    IF COL.psep_before;
       '|';
    END;
-   IF COL.pwidth;
+   IF 1 == SKIP_TYPES.grep(COL.type).size() or COL.html_only;
+      '';
+   ELSIF COL.pwidth;
        "p{" _ (COL.pwidth * WIDTH_PER_P) _ "cm}";
    ELSIF COL.palign;
         COL.palign;
@@ -38,52 +43,51 @@
 <?lsmb IF head; head ?>\\<?lsmb- END ?>
 <?lsmb- -?>
 <?lsmb 
-SKIP_TYPES = ['hidden', 'radio', 'checkbox'];
-
 ADD_SEP = 0;
 FOREACH COL IN columns;
-    IF ADD_SEP;
-      ' & ';
-    END;
-    ADD_SEP = 1;
-    IF 0 == SKIP_TYPES.grep(COL.type).size();
+    IF 0 == SKIP_TYPES.grep(COL.type).size() AND ! COL.html_only;
+        IF ADD_SEP;
+           ' & ';
+        END;
         COL.name;
+        ADD_SEP = 1;
     END;
 END;
--?>\\
+-?>\tabularnewline
 \hline\hline
 \endfirsthead
 <?lsmb 
-SKIP_TYPES = ['hidden', 'radio', 'checkbox'];
 
 ADD_SEP = 0;
 FOREACH COL IN columns;
-    IF ADD_SEP;
-      ' & ';
-    END;
-    ADD_SEP = 1;
-    IF 0 == SKIP_TYPES.grep(COL.type).size();
+    IF 0 == SKIP_TYPES.grep(COL.type).size() AND ! COL.html_only;
+        IF ADD_SEP;
+           ' & ';
+        END;
         COL.name;
+        ADD_SEP = 1;
     END;
 END;
--?>\\
+-?>\tabularnewline
 \hline\hline
 \endhead
 <?lsmb
 
 FOREACH ROW IN tbody.rows;
-    ADD_SEP = 0;
+    ADD_SEP=0;
     FOREACH COL IN columns;
-        IF ADD_SEP;
-           ' & ';
+        COLID =  COL.col_id.replace('\\\\');
+        IF 0 == SKIP_TYPES.grep(COL.type).size() AND ! COL.html_only;
+            IF ADD_SEP;
+               ' & ';
+            END;
+            ADD_SEP = 1;
+            ?>\begin{minipage}{<?lsmb (COL.pwidth * WIDTH_PER_P) _ "cm"; ?>}<?lsmb
+                ROW.${COLID}; #$
+            ?>\end{minipage}<?lsmb
         END;
-        ADD_SEP = 1;
-        COL_ID = COL.col_id;
-        IF 0 == SKIP_TYPES.grep(COL.type).size();
-            ROW.$COL_ID; #$
-        END;
-    END; 
-    ?>\\
+    END;
+    ?>\tabularnewline
 <?lsmb
 END; # FOREACH ?>
 \end{longtable}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.