SF.net SVN: ledger-smb: [1743] trunk/UI

[..hidden..]

Revision: 1743
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=1743&view=rev
Author:   tetragon
Date:     2007-10-11 08:20:17 -0700 (Thu, 11 Oct 2007)

Log Message:
-----------
Fixing the output of empty fields where the label is a 'text' value in a hash

Modified Paths:
--------------
    trunk/UI/form-dynatable.csv
    trunk/UI/form-dynatable.odst
    trunk/UI/form-dynatable.xlst

Modified: trunk/UI/form-dynatable.csv
===================================================================
--- trunk/UI/form-dynatable.csv	2007-10-11 15:08:11 UTC (rev 1742)
+++ trunk/UI/form-dynatable.csv	2007-10-11 15:20:17 UTC (rev 1743)
@@ -1,3 +1,29 @@
-<?lsmb FOREACH column IN columns ?><?lsmb IF heading.$column.text; heading.$column.text; ELSE; heading.$column; END ?><?lsmb IF NOT loop.last ?>,<?lsmb END ?><?lsmb END ?>
-<?lsmb FOREACH row IN rows ?><?lsmb FOREACH column IN columns ?><?lsmb IF row.$column.text; row.$column.text; ELSE; row.$column; END ?><?lsmb IF NOT loop.last ?>,<?lsmb END ?><?lsmb END ?>
-<?lsmb END ?><?lsmb IF totals; t = []; FOREACH column IN columns; t.push(totals.$column); END; t.join(','); END ?>
+<?lsmb FOREACH column IN columns;
+	IF heading.$column.text;
+		heading.$column.text;
+	ELSE;
+		heading.$column;
+	END;
+	IF NOT loop.last
+		?>,<?lsmb
+	END;
+END ?>
+<?lsmb FOREACH row IN rows;
+	FOREACH column IN columns;
+		IF row.$column.text.defined;
+			row.$column.text;
+		ELSE;
+			row.$column;
+		END;
+		IF NOT loop.last
+			?>,<?lsmb
+		END;
+	END ?>
+<?lsmb END;
+IF totals;
+	t = [];
+	FOREACH column IN columns;
+		t.push(totals.$column);
+	END;
+	t.join(',');
+END ?>

Modified: trunk/UI/form-dynatable.odst
===================================================================
--- trunk/UI/form-dynatable.odst	2007-10-11 15:08:11 UTC (rev 1742)
+++ trunk/UI/form-dynatable.odst	2007-10-11 15:20:17 UTC (rev 1743)
@@ -17,7 +17,7 @@
 		<?lsmb FOREACH column IN columns ?>
 		<?lsmb IF loop.first ?><format num_format="3">
 		<?lsmb END ?>
-			<?lsmb IF row.$column.href ?>
+			<?lsmb IF row.$column.text.defined ?>
 			<italic>
 			<cell text="<?lsmb row.$column.text ?>" />
 			</italic>

Modified: trunk/UI/form-dynatable.xlst
===================================================================
--- trunk/UI/form-dynatable.xlst	2007-10-11 15:08:11 UTC (rev 1742)
+++ trunk/UI/form-dynatable.xlst	2007-10-11 15:20:17 UTC (rev 1743)
@@ -11,7 +11,7 @@
 	<?lsmb FOREACH row IN rows ?>
 		<row>
 		<?lsmb FOREACH column IN columns ?>
-			<?lsmb IF row.$column.href ?>
+			<?lsmb IF row.$column.text.defined ?>
 			<cell text="<?lsmb row.$column.text ?>" />
 			<?lsmb ELSE ?>
 			<cell text="<?lsmb row.$column ?>" />


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