[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[32325] trunk

[<rob...@us...>]

Revision: 32325
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32325&view=rev
Author:   robertplummer
Date:     2011-01-31 21:20:58 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
[ADD] Added sheet history to export spreadsheets

Modified Paths:
--------------
    trunk/lib/sheet/grid.php
    trunk/templates/tiki-export-sheets.tpl
    trunk/templates/tiki-history_sheets.tpl
    trunk/tiki-export_sheet.php
    trunk/tiki-history_sheets.php

Modified: trunk/lib/sheet/grid.php
===================================================================
--- trunk/lib/sheet/grid.php	2011-01-31 21:02:19 UTC (rev 32324)
+++ trunk/lib/sheet/grid.php	2011-01-31 21:20:58 UTC (rev 32325)
@@ -2315,6 +2315,10 @@
 		}
 	}
 	
+	function sheet_history( $sheetId ) {
+		return $this->fetchAll( "SELECT DISTINCT `begin` as stamp, `user`, DATE_FORMAT(FROM_UNIXTIME(`begin`), '%M %D %Y %h:%i:%s') as prettystamp FROM `tiki_sheet_values` WHERE `sheetId` = ? ORDER BY begin DESC", array( $sheetId ) );
+	}
+	
 	function rollback_sheet($id, $readdate=null) {
 		global $user, $sheetlib;
 		

Modified: trunk/templates/tiki-export-sheets.tpl
===================================================================
--- trunk/templates/tiki-export-sheets.tpl	2011-01-31 21:02:19 UTC (rev 32324)
+++ trunk/templates/tiki-export-sheets.tpl	2011-01-31 21:20:58 UTC (rev 32325)
@@ -37,12 +37,21 @@
 {else}
 	<form method="post" action="tiki-export_sheet.php?mode=export&sheetId={$sheetId}" enctype="multipart/form-data">
 		<h2>{tr}Export to file{/tr}</h2>
+		{tr}Version:{/tr}
+		<select name="readdate">
+			{section name=key loop=$history}
+				<option value="{$history[key].stamp}">{$history[key].prettystamp}</option>
+			{/section}
+		</select>
+		<br />
 		{tr}Format:{/tr}
+		<input type="hidden" value="{$sheetId}" name="sheetId" />
 		<select name="handler">
 			{section name=key loop=$handlers}
 				<option value="{$handlers[key].class}">{$handlers[key].name} V. {$handlers[key].version}</option>
 			{/section}
 		</select>
+		<br />
 		{tr}Charset encoding:{/tr}
 		<select name="encoding">
 			<!--<option value="">{tr}Autodetect{/tr}</option>-->
@@ -50,6 +59,7 @@
 			<option value="{$charsets[key]}">{$charsets[key]}</option>
 		{/section}
 		</select>
+		<br />
 		<input type="submit" value="{tr}Export{/tr}" />
 	</form>
 {/if}

Modified: trunk/templates/tiki-history_sheets.tpl
===================================================================
--- trunk/templates/tiki-history_sheets.tpl	2011-01-31 21:02:19 UTC (rev 32324)
+++ trunk/templates/tiki-history_sheets.tpl	2011-01-31 21:20:58 UTC (rev 32325)
@@ -55,7 +55,7 @@
 			{section name=revision_date loop=$history}
 				<tr>
 					<td>
-						{$history[revision_date].string}
+						{$history[revision_date].prettystamp}
 					</td>
 		    		<td>
 		    			{$history[revision_date].user}

Modified: trunk/tiki-export_sheet.php
===================================================================
--- trunk/tiki-export_sheet.php	2011-01-31 21:02:19 UTC (rev 32324)
+++ trunk/tiki-export_sheet.php	2011-01-31 21:20:58 UTC (rev 32325)
@@ -8,12 +8,16 @@
 $section = 'sheet';
 require_once ('tiki-setup.php');
 require_once ('lib/sheet/grid.php');
+$auto_query_args = array(
+	'sheetId',
+	'readdate',
+);
 
 $access->check_feature('feature_sheet');
 
 $info = $sheetlib->get_sheet_info( $_REQUEST['sheetId'] );
 if (empty($info)) {
-	$smarty->assign('Incorrect parameter');
+	$smarty->assign('msg', tra('Incorrect parameter'));
 	$smarty->display('error.tpl');
 	die;
 }
@@ -33,19 +37,19 @@
 $smarty->assign('description', $info['description']);
 
 $smarty->assign('page_mode', 'form' );
+$smarty->assign('sheetId', $_REQUEST['sheetId'] );
 
 // Process the insertion or modification of a gallery here
-
 $grid = new TikiSheet;
 
-if( $_SERVER['REQUEST_METHOD'] == 'POST' )
+$history = $sheetlib->sheet_history( $_REQUEST['sheetId'] );
+$smarty->assign_by_ref( 'history', $history );
+
+if( isset($_REQUEST['encoding']) )
 {
 	$smarty->assign('page_mode', 'submit' );
 
-	$sheetId = $_REQUEST['sheetId'];
-    $encoding = $_REQUEST['encoding'];
-
-	$handler = new TikiSheetDatabaseHandler( $sheetId );
+	$handler = new TikiSheetDatabaseHandler( $_REQUEST['sheetId'], $_REQUEST['readdate'] );
 	$grid->import( $handler );
 
 	$handler = $_REQUEST['handler'];
@@ -58,7 +62,7 @@
 		die;
 	}
 
-	$handler = new $handler( "php://stdout" , 'UTF-8', $encoding );
+	$handler = new $handler( "php://stdout" , 'UTF-8', $_REQUEST['encoding'] );
 	$grid->export( $handler );
 
 	exit;

Modified: trunk/tiki-history_sheets.php
===================================================================
--- trunk/tiki-history_sheets.php	2011-01-31 21:02:19 UTC (rev 32324)
+++ trunk/tiki-history_sheets.php	2011-01-31 21:20:58 UTC (rev 32325)
@@ -38,20 +38,7 @@
 $smarty->assign('description', $info['description']);
 $smarty->assign('page_mode', 'view' );
 
-$result = $tikilib->query( "SELECT DISTINCT `begin`, `user` FROM `tiki_sheet_values` WHERE `sheetId` = ? ORDER BY begin DESC", array( $_REQUEST['sheetId'] ) );
-$history = array();
-
-$i = 0;
-while( $row = $result->fetchRow() ) {
-	$history[$i] = array(
-		"stamp" => $row['begin'], 
-		"string" => $tikilib->date_format( "%Y-%m-%d %H:%M:%S", $row['begin'] ), 
-		"user" => $row['user'],
-		"index" => $i
-	);
-	$i++;
-}
-
+$history = $sheetlib->sheet_history( $_REQUEST['sheetId'] );
 $smarty->assign_by_ref( 'history', $history );
 
 $sheetIndexes = array();


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