s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved the "extract operations" dialog to let user select which operations to extract. Also show history entries that cannot be abstracted.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@118 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-02-22 06:31:09 +00:00
parent 1227c9dff4
commit c50de52883
2 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/metaweb/gridworks/commands/info/GetOperationsCommand.java
View File

@ -29,12 +29,16 @@ public class GetOperationsCommand extends Command {
JSONWriter writer = new JSONWriter(response.getWriter()); JSONWriter writer = new JSONWriter(response.getWriter());
writer.object(); writer.object();
writer.key("operations"); writer.array(); writer.key("entries"); writer.array();
for (HistoryEntry entry : project.history.getLastPastEntries(-1)) { for (HistoryEntry entry : project.history.getLastPastEntries(-1)) {
writer.object();
writer.key("description"); writer.value(entry.description);
if (entry.operation != null) { if (entry.operation != null) {
writer.key("operation");
entry.operation.write(writer, options); entry.operation.write(writer, options);
} }
writer.endObject();
} }
writer.endArray(); writer.endArray();
writer.endObject(); writer.endObject();

63
src/main/webapp/scripts/project/history-widget.js
View File

@ -109,8 +109,8 @@ HistoryWidget.prototype._extractOperations = function() {
"/command/get-operations?" + $.param({ project: theProject.id }), "/command/get-operations?" + $.param({ project: theProject.id }),
null, null,
function(data) { function(data) {
if ("operations" in data) { if ("entries" in data) {
self._showExtractOperationsDialog(data.operations); self._showExtractOperationsDialog(data);
} }
}, },
"jsonp" "jsonp"
@ -130,8 +130,55 @@ HistoryWidget.prototype._showExtractOperationsDialog = function(json) {
"The following JSON code encodes the operations you have done that can be abstracted. " + "The following JSON code encodes the operations you have done that can be abstracted. " +
"You can copy and save it in order to apply the same operations in the future.").appendTo(body); "You can copy and save it in order to apply the same operations in the future.").appendTo(body);
var textarea = $('<textarea />').attr("wrap", "hard").width("100%").height("400px").appendTo(body); var table = $('<table width="100%" cellspacing="0" cellpadding="0"><tr></tr></table>').appendTo(body)[0];
textarea.text(JSON.stringify(json, null, 2)); var leftColumn = table.rows[0].insertCell(0);
var rightColumn = table.rows[0].insertCell(1);
$(leftColumn).width("50%");
$(rightColumn).width("50%").css("padding-left", "20px");
var entryDiv = $('<div>').height("400px").css("overflow", "auto").appendTo(leftColumn);
var entryTable = $('<table cellspacing="5"></table>').appendTo(entryDiv)[0];
var createEntry = function(entry) {
var tr = entryTable.insertRow(entryTable.rows.length);
var td0 = tr.insertCell(0);
var td1 = tr.insertCell(1);
td0.width = "1%";
if ("operation" in entry) {
entry.selected = true;
$('<input type="checkbox" checked="true" />').appendTo(td0).click(function() {
entry.selected = !entry.selected;
updateJson();
});
$('<span>').text(entry.operation.description).appendTo(td1);
} else {
$('<span>').text(entry.description).css("color", "#888").appendTo(td1);
}
};
for (var i = 0; i < json.entries.length; i++) {
createEntry(json.entries[i]);
}
var textarea = $('<textarea />')
.attr("wrap", "off")
.css("white-space", "pre")
.css("font-family", "monospace")
.width("100%")
.height("400px")
.appendTo(rightColumn);
var updateJson = function() {
var a = [];
for (var i = 0; i < json.entries.length; i++) {
var entry = json.entries[i];
if ("operation" in entry && entry.selected) {
a.push(entry.operation);
}
}
textarea.text(JSON.stringify(a, null, 2));
};
updateJson();
$('<button></button>').text("Done").click(function() { $('<button></button>').text("Done").click(function() {
DialogSystem.dismissUntil(level - 1); DialogSystem.dismissUntil(level - 1);
@ -154,7 +201,13 @@ HistoryWidget.prototype._showApplyOperationsDialog = function(json) {
$('<p></p>').text( $('<p></p>').text(
"Paste the JSON code encoding the operations to perform.").appendTo(body); "Paste the JSON code encoding the operations to perform.").appendTo(body);
var textarea = $('<textarea />').attr("wrap", "hard").width("100%").height("400px").appendTo(body); var textarea = $('<textarea />')
.attr("wrap", "off")
.css("white-space", "pre")
.css("font-family", "monospace")
.width("100%")
.height("400px")
.appendTo(body);
textarea.text(JSON.stringify(json, null, 2)); textarea.text(JSON.stringify(json, null, 2));
$('<button></button>').text("Apply").click(function() { $('<button></button>').text("Apply").click(function() {