From 4fb31df0659a83e7fffc59d7dc5159b959996a8c Mon Sep 17 00:00:00 2001 From: Ross Jones Date: Fri, 16 Mar 2012 10:38:00 +0000 Subject: [PATCH 1/3] [2209,xs] Missing package type when locating new_template --- ckan/controllers/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index a88d3510c7d..90260ab48e3 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -413,7 +413,7 @@ def new(self, data=None, errors=None, error_summary=None): c.form = render(self.package_form, extra_vars=vars) else: c.form = render(self._package_form(package_type=package_type), extra_vars=vars) - return render( self._new_template('')) + return render( self._new_template(package_type)) def edit(self, id, data=None, errors=None, error_summary=None): From 0d970d3a0e523a1695830e8c8c28c0ba10a8d8b9 Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Fri, 16 Mar 2012 15:00:39 +0000 Subject: [PATCH 2/3] [#2236,data-viewer][s]: integrate latest version of Recline (v0.3b). --- .../public/img/glyphicons-halflings-white.png | Bin 0 -> 4352 bytes ckan/public/img/glyphicons-halflings.png | Bin 0 -> 4352 bytes .../vendor/recline/css/data-explorer.css | 138 ++-- ckan/public/scripts/vendor/recline/recline.js | 781 ++++++++++-------- ckan/templates/package/resource_read.html | 12 +- 5 files changed, 493 insertions(+), 438 deletions(-) create mode 100644 ckan/public/img/glyphicons-halflings-white.png create mode 100644 ckan/public/img/glyphicons-halflings.png diff --git a/ckan/public/img/glyphicons-halflings-white.png b/ckan/public/img/glyphicons-halflings-white.png new file mode 100644 index 0000000000000000000000000000000000000000..a20760bfde58d1c92cee95116059fba03c68d689 GIT binary patch literal 4352 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 literal 0 HcmV?d00001 diff --git a/ckan/public/scripts/vendor/recline/css/data-explorer.css b/ckan/public/scripts/vendor/recline/css/data-explorer.css index 208ce906a56..b27e3f82081 100644 --- a/ckan/public/scripts/vendor/recline/css/data-explorer.css +++ b/ckan/public/scripts/vendor/recline/css/data-explorer.css @@ -23,39 +23,32 @@ height: 30px; } -.header .recline-query-editor form { - height: 30px; - margin-bottom: 0; +.header .recline-query-editor .input-prepend { + margin-bottom: auto; } -.header .recline-query-editor label { - float: none; +.header .recline-query-editor .text-query input { + float: left; } -.header .recline-query-editor label { - float: none; +.recline-query-editor .text-query .btn-group { + display: inline; + float:left; + margin-left:-2px; } -.header .recline-query-editor input.text-query { - float: left; - margin-top: 1px; - margin-right: 5px; - width: 200px; +.recline-query-editor .text-query .btn-group .dropdown-toggle { + -moz-border-radius:0px 3px 3px 0px; + -webkit-border-radius:0px 3px 3px 0px; + border-radius:0px 3px 3px 0px; } -.header .recline-query-editor .pagination input { - width: 30px; - height: 18px; - padding: 2px 4px; - margin-top: -4px; +.recline-query-editor .text-query .btn-group ul { + margin-left:-110px; } .header .recline-query-editor .pagination a { - line-height: 28px; -} - -.header .recline-query-editor form .btn { - vertical-align: top; + line-height: 26px; } .data-view-container { @@ -79,6 +72,11 @@ * Data Table *********************************************************/ +.data-table .btn-group .dropdown-toggle { + padding: 1px 3px; + line-height: auto; +} + .data-table-container { overflow: auto; height: 550px; @@ -86,7 +84,6 @@ .data-table { border: 1px solid #ccc; - font-size: 12px; width: 100%; } @@ -100,44 +97,46 @@ width: 20px; } +/* direct borrowing from twitter buttons */ +.data-table th, +.transform-column-view .expression-preview-table-wrapper th +{ + background-color: #e6e6e6; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); + background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + color: #333; + border: 1px solid #ccc; + border-bottom-color: #bbb; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-transition: 0.1s linear all; + -moz-transition: 0.1s linear all; + -ms-transition: 0.1s linear all; + -o-transition: 0.1s linear all; + transition: 0.1s linear all; +} + + /********************************************************** * Data Table Menus *********************************************************/ -a.column-header-menu, a.root-header-menu { +.column-header-menu, a.root-header-menu { float: right; - display: block; - margin: 0 4px 0 0; - width: 17px; - height: 19px; - background-image: url(images/menu-dropdown.png); - background-repeat: no-repeat; -} - -a.row-header-menu:hover, a.root-header-menu:hover { - background-position: -17px 0px; - text-decoration: none; -} - -a.row-header-menu { - float: left; - display: block; - margin: -2px 0 -4px 0; - width: 17px; - height: 18px; - background-image: url(images/menu-dropdown.png); - background-repeat: no-repeat; } .read-only a.row-header-menu { display: none; } -a.column-header-menu:hover { - background-position: -17px 0px; - text-decoration: none; -} - .column-header-recon-stats-bar { margin-top: 10px; height: 4px; @@ -203,45 +202,6 @@ div.data-table-cell-content-numeric > a.data-table-cell-edit { color: red; } -.data-table-menu-overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; -} - -ul.data-table-menu { - display: none; - outline-style: none; - background: white; - color: black; - font-size: 12px; - height: auto; - list-style: none; - overflow: hidden; - position: absolute; - text-align: left; - width: 120px; - z-index: 666; - border: 1px solid #CCC; - border-right: 1px solid #666; - border-bottom: 1px solid #666; - margin: 0; padding: 0; } - ul.data-table-menu * { - margin: 0; - padding: 0; } - ul.data-table-menu a { - line-height: 14px; - color: black; - display: block; - padding: 5px 7px; - text-decoration: none; } - ul.data-table-menu li { - height: 24px; } - ul.data-table-menu li:hover { - background-color: #DBE8F8 } - /* TODO: not sure the rest of this is needed */ .data-table-cell-editor, .data-table-topic-popup { overflow: auto; diff --git a/ckan/public/scripts/vendor/recline/recline.js b/ckan/public/scripts/vendor/recline/recline.js index 3102ad36c70..ee6f6fa33b6 100644 --- a/ckan/public/scripts/vendor/recline/recline.js +++ b/ckan/public/scripts/vendor/recline/recline.js @@ -131,14 +131,13 @@ this.recline.Model = this.recline.Model || {}; // ## A Dataset model // -// A model must have the following (Backbone) attributes: +// A model has the following (non-Backbone) attributes: // // * fields: (aka columns) is a FieldList listing all the fields on this -// Dataset (this can be set explicitly, or, on fetch() of Dataset -// information from the backend, or as is perhaps most common on the first -// query) -// * currentDocuments: a DocumentList containing the Documents we have currently loaded for viewing (you update currentDocuments by calling getRows) -// * docCount: total number of documents in this dataset (obtained on a fetch for this Dataset) +// Dataset (this can be set explicitly, or, will be set by Dataset.fetch() or Dataset.query() +// * currentDocuments: a DocumentList containing the Documents we have +// currently loaded for viewing (you update currentDocuments by calling query) +// * docCount: total number of documents in this dataset my.Dataset = Backbone.Model.extend({ __type__: 'Dataset', initialize: function(model, backend) { @@ -166,7 +165,7 @@ my.Dataset = Backbone.Model.extend({ query: function(queryObj) { this.trigger('query:start'); var self = this; - this.queryState.set(queryObj, {silent: true}); + this.queryState.set(queryObj); var dfd = $.Deferred(); this.backend.query(this, this.queryState.toJSON()).done(function(rows) { var docs = _.map(rows, function(row) { @@ -255,18 +254,6 @@ my.backends = {}; var util = function() { var templates = { transformActions: '
  • Global transform...
    • ' - , columnActions: ' \ -
  • Transform...
    • \ -
  • Delete this column
    • \ -
  • Sort ascending
    • \ -
  • Sort descending
    • \ -
  • Hide this column
    • \ - ' - , rowActions: '
  • Delete this row
    • ' - , rootActions: ' \ - {{#columns}} \ -
  • Show column: {{.}}
    • \ - {{/columns}}' , cellEditor: ' \
    \ \ @@ -453,7 +440,10 @@ my.FlotGraph = Backbone.View.extend({ \
    \ \
    \ \ @@ -514,7 +504,7 @@ my.FlotGraph = Backbone.View.extend({ this.chartConfig = _.extend({ group: null, series: [], - graphType: 'line' + graphType: 'lines-and-points' }, configFromHash, config @@ -536,11 +526,16 @@ my.FlotGraph = Backbone.View.extend({ onEditorSubmit: function(e) { var select = this.el.find('.editor-group select'); - this._getEditorData(); + $editor = this; + var series = this.$series.map(function () { + return $(this).val(); + }); + this.chartConfig.series = $.makeArray(series) + this.chartConfig.group = this.el.find('.editor-group select').val(); + this.chartConfig.graphType = this.el.find('.editor-type select').val(); // update navigation - // TODO: make this less invasive (e.g. preserve other keys in query string) var qs = my.parseHashQueryString(); - qs['graph'] = this.chartConfig; + qs['graph'] = JSON.stringify(this.chartConfig); my.setHashQueryString(qs); this.redraw(); }, @@ -556,28 +551,127 @@ my.FlotGraph = Backbone.View.extend({ if ((!areWeVisible || this.model.currentDocuments.length == 0)) { return } + var series = this.createSeries(); + var options = this.getGraphOptions(this.chartConfig.graphType); + this.plot = $.plot(this.$graph, series, options); + this.setupTooltips(); // create this.plot and cache it - if (!this.plot) { - // only lines for the present - options = { - id: 'line', - name: 'Line Chart' - }; - this.plot = $.plot(this.$graph, this.createSeries(), options); - } - this.plot.setData(this.createSeries()); - this.plot.resize(); - this.plot.setupGrid(); - this.plot.draw(); +// if (!this.plot) { +// this.plot = $.plot(this.$graph, series, options); +// } else { +// this.plot.parseOptions(options); +// this.plot.setData(this.createSeries()); +// this.plot.resize(); +// this.plot.setupGrid(); +// this.plot.draw(); +// } }, - _getEditorData: function() { - $editor = this - var series = this.$series.map(function () { - return $(this).val(); + // needs to be function as can depend on state + getGraphOptions: function(typeId) { + var self = this; + var tickFormatter = function (val) { + if (self.model.currentDocuments.models[val]) { + var out = self.model.currentDocuments.models[val].get(self.chartConfig.group); + // if the x-axis value was in fact a number we want that not the + if (typeof(out) == 'number') { + return val; + } else { + return out; + } + } + return val; + } + // TODO: we should really use tickFormatter and 1 interval ticks if (and + // only if) x-axis values are non-numeric + // However, that is non-trivial to work out from a dataset (datasets may + // have no field type info). Thus at present we only do this for bars. + var options = { + lines: { + series: { + lines: { show: true } + } + } + , points: { + series: { + points: { show: true } + }, + grid: { hoverable: true, clickable: true } + } + , 'lines-and-points': { + series: { + points: { show: true }, + lines: { show: true } + }, + grid: { hoverable: true, clickable: true }, + } + , bars: { + series: { + lines: {show: false}, + bars: { + show: true, + barWidth: 1, + align: "center", + fill: true + } + }, + grid: { hoverable: true, clickable: true }, + xaxis: { + tickSize: 1, + tickLength: 1, + tickFormatter: tickFormatter + } + } + } + return options[typeId]; + }, + + setupTooltips: function() { + var self = this; + function showTooltip(x, y, contents) { + $('
    ' + contents + '
    ').css( { + position: 'absolute', + display: 'none', + top: y + 5, + left: x + 5, + border: '1px solid #fdd', + padding: '2px', + 'background-color': '#fee', + opacity: 0.80 + }).appendTo("body").fadeIn(200); + } + + var previousPoint = null; + this.$graph.bind("plothover", function (event, pos, item) { + if (item) { + if (previousPoint != item.datapoint) { + previousPoint = item.datapoint; + + $("#flot-tooltip").remove(); + var x = item.datapoint[0]; + var y = item.datapoint[1]; + // convert back from 'index' value on x-axis (e.g. in cases where non-number values) + if (self.model.currentDocuments.models[x]) { + x = self.model.currentDocuments.models[x].get(self.chartConfig.group); + } else { + x = x.toFixed(2); + } + y = y.toFixed(2); + + var content = _.template('<%= group %> = <%= x %>, <%= series %> = <%= y %>', { + group: self.chartConfig.group, + x: x, + series: item.series.label, + y: y + }); + showTooltip(item.pageX, item.pageY, content); + } + } + else { + $("#flot-tooltip").remove(); + previousPoint = null; + } }); - this.chartConfig.series = $.makeArray(series) - this.chartConfig.group = this.el.find('.editor-group select').val(); }, createSeries: function () { @@ -703,19 +797,19 @@ my.DataGrid = Backbone.View.extend({ onColumnHeaderClick: function(e) { this.state.currentColumn = $(e.target).closest('.column-header').attr('data-field'); - util.position('data-table-menu', e); - util.render('columnActions', 'data-table-menu'); }, onRowHeaderClick: function(e) { this.state.currentRow = $(e.target).parents('tr:first').attr('data-id'); - util.position('data-table-menu', e); - util.render('rowActions', 'data-table-menu'); }, onRootHeaderClick: function(e) { - util.position('data-table-menu', e); - util.render('rootActions', 'data-table-menu', {'columns': this.hiddenFields}); + var tmpl = ' \ + {{#columns}} \ +
  • Show column: {{.}}
    • \ + {{/columns}}'; + var tmp = $.mustache(tmpl, {'columns': this.hiddenFields}); + this.el.find('.root-header-menu .dropdown-menu').html(tmp); }, onMenuClick: function(e) { @@ -757,7 +851,6 @@ my.DataGrid = Backbone.View.extend({ }) } } - util.hide('data-table-menu'); actions[$(e.target).attr('data-action')](); }, @@ -810,26 +903,32 @@ my.DataGrid = Backbone.View.extend({ // ====================================================== // #### Templating template: ' \ - \ -
      \ - \ +
      \ \ \ {{#notEmpty}} \ \ {{/notEmpty}} \ {{#fields}} \ \ {{/fields}} \ \ @@ -911,7 +1010,14 @@ my.DataGridRow = Backbone.View.extend({ }, template: ' \ - \ + \ {{#cells}} \
      \ -
      \ - \ - \ +
      \ + \ +
        \ +
      \
      \ + \
      		\ -
      \ - \ - {{label}} \ -
      \ +
      \ + \ + \
      \ + {{label}} \
      \ +
      \ + \ + \ +
      \ +       		\
      \ @@ -989,6 +1095,212 @@ my.DataGridRow = Backbone.View.extend({ this.recline = this.recline || {}; this.recline.View = this.recline.View || {}; +// Views module following classic module pattern +(function($, my) { + +// View (Dialog) for doing data transformations on whole dataset. +my.DataTransform = Backbone.View.extend({ + className: 'transform-view', + template: ' \ +
      \ + Recursive transform on all rows \ +
      \ +
      \ +
      \ +

      Traverse and transform objects by visiting every node on a recursive walk using js-traverse.

      \ + \ + \ + \ + \ + \ + \ +
      \ +
      \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +
      \ + Expression \ +
      \ +
      \ + \ +
      \ +       		\ + No syntax error. \ +
      \ +
      \ + Preview \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ + \ + \ +
      \ + ', + + initialize: function() { + this.el = $(this.el); + }, + + render: function() { + this.el.html(this.template); + } +}); + + +// View (Dialog) for doing data transformations (on columns of data). +my.ColumnTransform = Backbone.View.extend({ + className: 'transform-column-view', + template: ' \ +
      \ + Functional transform on column {{name}} \ +
      \ +
      \ +
      \ + \ + \ + \ + \ + \ + \ +
      \ +
      \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +
      \ + Expression \ +
      \ +
      \ + \ +
      \ +       		\ + No syntax error. \ +
      \ +
      \ + Preview \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ +
      \ + \ + \ +
      \ + ', + + events: { + 'click .okButton': 'onSubmit' + , 'keydown .expression-preview-code': 'onEditorKeydown' + }, + + initialize: function() { + this.el = $(this.el); + }, + + render: function() { + var htmls = $.mustache(this.template, + {name: this.state.currentColumn} + ) + this.el.html(htmls); + // Put in the basic (identity) transform script + // TODO: put this into the template? + var editor = this.el.find('.expression-preview-code'); + editor.val("function(doc) {\n doc['"+ this.state.currentColumn+"'] = doc['"+ this.state.currentColumn+"'];\n return doc;\n}"); + editor.focus().get(0).setSelectionRange(18, 18); + editor.keydown(); + }, + + onSubmit: function(e) { + var self = this; + var funcText = this.el.find('.expression-preview-code').val(); + var editFunc = costco.evalFunction(funcText); + if (editFunc.errorMessage) { + my.notify("Error with function! " + editFunc.errorMessage); + return; + } + util.hide('dialog'); + my.notify("Updating all visible docs. This could take a while...", {persist: true, loader: true}); + var docs = self.model.currentDocuments.map(function(doc) { + return doc.toJSON(); + }); + // TODO: notify about failed docs? + var toUpdate = costco.mapDocs(docs, editFunc).edited; + var totalToUpdate = toUpdate.length; + function onCompletedUpdate() { + totalToUpdate += -1; + if (totalToUpdate === 0) { + my.notify(toUpdate.length + " documents updated successfully"); + alert('WARNING: We have only updated the docs in this view. (Updating of all docs not yet implemented!)'); + self.remove(); + } + } + // TODO: Very inefficient as we search through all docs every time! + _.each(toUpdate, function(editedDoc) { + var realDoc = self.model.currentDocuments.get(editedDoc.id); + realDoc.set(editedDoc); + realDoc.save().then(onCompletedUpdate).fail(onCompletedUpdate) + }); + }, + + onEditorKeydown: function(e) { + var self = this; + // if you don't setTimeout it won't grab the latest character if you call e.target.value + window.setTimeout( function() { + var errors = self.el.find('.expression-preview-parsing-status'); + var editFunc = costco.evalFunction(e.target.value); + if (!editFunc.errorMessage) { + errors.text('No syntax error.'); + var docs = self.model.currentDocuments.map(function(doc) { + return doc.toJSON(); + }); + var previewData = costco.previewTransform(docs, editFunc, self.state.currentColumn); + util.render('editPreview', 'expression-preview-container', {rows: previewData}); + } else { + errors.text(editFunc.errorMessage); + } + }, 1, true); + } +}); + +})(jQuery, recline.View); +this.recline = this.recline || {}; +this.recline.View = this.recline.View || {}; + (function($, my) { // ## DataExplorer // @@ -1099,6 +1411,10 @@ my.DataExplorer = Backbone.View.extend({ my.clearNotifications(); self.el.find('.doc-count').text(self.model.docCount || 'Unknown'); my.notify('Data loaded', {category: 'success'}); + // update navigation + var qs = my.parseHashQueryString(); + qs['reclineQuery'] = JSON.stringify(self.model.queryState.toJSON()); + my.setHashQueryString(qs); }); this.model.bind('query:fail', function(error) { my.clearNotifications(); @@ -1122,8 +1438,11 @@ my.DataExplorer = Backbone.View.extend({ // note this.model and dataset returned are the same this.model.fetch() .done(function(dataset) { - self.el.find('.doc-count').text(self.model.docCount || 'Unknown'); - self.model.query(); + var queryState = my.parseHashQueryString().reclineQuery; + if (queryState) { + queryState = JSON.parse(queryState); + } + self.model.query(queryState); }) .fail(function(error) { my.notify(error.message, {category: 'error', persist: true}); @@ -1185,21 +1504,31 @@ my.QueryEditor = Backbone.View.extend({ className: 'recline-query-editor', template: ' \
      \ - \ +
      \ + \ + \ +
      \ + \ + \ +
      \ +
      \ \ - \
      \ ', events: { - 'submit form': 'onFormSubmit', - 'click .action-pagination-update': 'onPaginationUpdate' + 'submit form': 'onFormSubmit' + , 'click .action-pagination-update': 'onPaginationUpdate' + , 'click .menu li a': 'onMenuItemClick' }, initialize: function() { @@ -1210,10 +1539,8 @@ my.QueryEditor = Backbone.View.extend({ }, onFormSubmit: function(e) { e.preventDefault(); - var newFrom = parseInt(this.el.find('input[name="from"]').val()); - var newSize = parseInt(this.el.find('input[name="to"]').val()) - newFrom; - var query = this.el.find('.text-query').val(); - this.model.set({size: newSize, from: newFrom, q: query}); + var query = this.el.find('.text-query input').val(); + this.model.set({q: query}); }, onPaginationUpdate: function(e) { e.preventDefault(); @@ -1225,6 +1552,20 @@ my.QueryEditor = Backbone.View.extend({ } this.model.set({from: newFrom}); }, + onMenuItemClick: function(e) { + e.preventDefault(); + var attrName = $(e.target).attr('data-action'); + var msg = _.template('New value (<%= value %>)', + {value: this.model.get(attrName)} + ); + var newValue = prompt(msg); + if (newValue) { + newValue = parseInt(newValue); + var update = {}; + update[attrName] = newValue; + this.model.set(update); + } + }, render: function() { var tmplData = this.model.toJSON(); tmplData.to = this.model.get('from') + this.model.get('size'); @@ -1254,6 +1595,9 @@ my.parseHashUrl = function(hashUrl) { // Parse a URL query string (?xyz=abc...) into a dictionary. my.parseQueryString = function(q) { + if (!q) { + return {}; + } var urlParams = {}, e, d = function (s) { return unescape(s.replace(/\+/g, " ")); @@ -1281,7 +1625,7 @@ my.composeQueryString = function(queryParams) { var queryString = '?'; var items = []; $.each(queryParams, function(key, value) { - items.push(key + '=' + JSON.stringify(value)); + items.push(key + '=' + value); }); queryString += items.join('&'); return queryString; @@ -1333,212 +1677,6 @@ my.clearNotifications = function() { })(jQuery, recline.View); -this.recline = this.recline || {}; -this.recline.View = this.recline.View || {}; - -// Views module following classic module pattern -(function($, my) { - -// View (Dialog) for doing data transformations on whole dataset. -my.DataTransform = Backbone.View.extend({ - className: 'transform-view', - template: ' \ -
      \ - Recursive transform on all rows \ -
      \ -
      \ -
      \ -

      Traverse and transform objects by visiting every node on a recursive walk using js-traverse.

      \ - \ - \ - \ - \ - \ - \ -
      \ -
      \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -
      \ - Expression \ -
      \ -
      \ - \ -
      \ -       		\ - No syntax error. \ -
      \ -
      \ - Preview \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ - \ - \ -
      \ - ', - - initialize: function() { - this.el = $(this.el); - }, - - render: function() { - this.el.html(this.template); - } -}); - - -// View (Dialog) for doing data transformations (on columns of data). -my.ColumnTransform = Backbone.View.extend({ - className: 'transform-column-view', - template: ' \ -
      \ - Functional transform on column {{name}} \ -
      \ -
      \ -
      \ - \ - \ - \ - \ - \ - \ -
      \ -
      \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -
      \ - Expression \ -
      \ -
      \ - \ -
      \ -       		\ - No syntax error. \ -
      \ -
      \ - Preview \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ - \ - \ -
      \ - ', - - events: { - 'click .okButton': 'onSubmit' - , 'keydown .expression-preview-code': 'onEditorKeydown' - }, - - initialize: function() { - this.el = $(this.el); - }, - - render: function() { - var htmls = $.mustache(this.template, - {name: this.state.currentColumn} - ) - this.el.html(htmls); - // Put in the basic (identity) transform script - // TODO: put this into the template? - var editor = this.el.find('.expression-preview-code'); - editor.val("function(doc) {\n doc['"+ this.state.currentColumn+"'] = doc['"+ this.state.currentColumn+"'];\n return doc;\n}"); - editor.focus().get(0).setSelectionRange(18, 18); - editor.keydown(); - }, - - onSubmit: function(e) { - var self = this; - var funcText = this.el.find('.expression-preview-code').val(); - var editFunc = costco.evalFunction(funcText); - if (editFunc.errorMessage) { - my.notify("Error with function! " + editFunc.errorMessage); - return; - } - util.hide('dialog'); - my.notify("Updating all visible docs. This could take a while...", {persist: true, loader: true}); - var docs = self.model.currentDocuments.map(function(doc) { - return doc.toJSON(); - }); - // TODO: notify about failed docs? - var toUpdate = costco.mapDocs(docs, editFunc).edited; - var totalToUpdate = toUpdate.length; - function onCompletedUpdate() { - totalToUpdate += -1; - if (totalToUpdate === 0) { - my.notify(toUpdate.length + " documents updated successfully"); - alert('WARNING: We have only updated the docs in this view. (Updating of all docs not yet implemented!)'); - self.remove(); - } - } - // TODO: Very inefficient as we search through all docs every time! - _.each(toUpdate, function(editedDoc) { - var realDoc = self.model.currentDocuments.get(editedDoc.id); - realDoc.set(editedDoc); - realDoc.save().then(onCompletedUpdate).fail(onCompletedUpdate) - }); - }, - - onEditorKeydown: function(e) { - var self = this; - // if you don't setTimeout it won't grab the latest character if you call e.target.value - window.setTimeout( function() { - var errors = self.el.find('.expression-preview-parsing-status'); - var editFunc = costco.evalFunction(e.target.value); - if (!editFunc.errorMessage) { - errors.text('No syntax error.'); - var docs = self.model.currentDocuments.map(function(doc) { - return doc.toJSON(); - }); - var previewData = costco.previewTransform(docs, editFunc, self.state.currentColumn); - util.render('editPreview', 'expression-preview-container', {rows: previewData}); - } else { - errors.text(editFunc.errorMessage); - } - }, 1, true); - } -}); - -})(jQuery, recline.View); // # Recline Backends // // Backends are connectors to backend data sources and stores @@ -1786,13 +1924,33 @@ this.recline.Backend = this.recline.Backend || {}; // ); // my.GDoc = Backbone.Model.extend({ + getUrl: function(dataset) { + var url = dataset.get('url'); + if (url.indexOf('feeds/list') != -1) { + return url; + } else { + // https://docs.google.com/spreadsheet/ccc?key=XXXX#gid=0 + var regex = /.*spreadsheet\/ccc?.*key=([^#?&+]+).*/ + var matches = url.match(regex); + if (matches) { + var key = matches[1]; + var worksheet = 1; + var out = 'https://spreadsheets.google.com/feeds/list/' + key + '/' + worksheet + '/public/values?alt=json' + return out; + } else { + alert('Failed to extract gdocs key from ' + url); + } + } + }, sync: function(method, model, options) { var self = this; if (method === "read") { var dfd = $.Deferred(); var dataset = model; - $.getJSON(model.get('url'), function(d) { + var url = this.getUrl(model); + + $.getJSON(url, function(d) { result = self.gdocsToJavascript(d); model.fields.reset(_.map(result.field, function(fieldId) { return {id: fieldId}; @@ -1982,64 +2140,3 @@ this.recline.Backend = this.recline.Backend || {}; recline.Model.backends['memory'] = new my.Memory(); }(jQuery, this.recline.Backend)); -this.recline = this.recline || {}; -this.recline.Backend = this.recline.Backend || {}; - -(function($, my) { - // ## Webstore Backend - // - // Connecting to [Webstores](http://github.com/okfn/webstore) - // - // To use this backend ensure your Dataset has a webstore_url in its attributes. - my.Webstore = Backbone.Model.extend({ - sync: function(method, model, options) { - if (method === "read") { - if (model.__type__ == 'Dataset') { - var base = model.get('webstore_url'); - var schemaUrl = base + '/schema.json'; - var jqxhr = $.ajax({ - url: schemaUrl, - dataType: 'jsonp', - jsonp: '_callback' - }); - var dfd = $.Deferred(); - my.wrapInTimeout(jqxhr).done(function(schema) { - var fieldData = _.map(schema.data, function(item) { - item.id = item.name; - delete item.name; - return item; - }); - model.fields.reset(fieldData); - model.docCount = schema.count; - dfd.resolve(model, jqxhr); - }) - .fail(function(arguments) { - dfd.reject(arguments); - }); - return dfd.promise(); - } - } - }, - query: function(model, queryObj) { - var base = model.get('webstore_url'); - var data = { - _limit: queryObj.size - , _offset: queryObj.from - }; - var jqxhr = $.ajax({ - url: base + '.json', - data: data, - dataType: 'jsonp', - jsonp: '_callback', - cache: true - }); - var dfd = $.Deferred(); - jqxhr.done(function(results) { - dfd.resolve(results.data); - }); - return dfd.promise(); - } - }); - recline.Model.backends['webstore'] = new my.Webstore(); - -}(jQuery, this.recline.Backend)); diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html index c1a498be8aa..9cdfbb94705 100644 --- a/ckan/templates/package/resource_read.html +++ b/ckan/templates/package/resource_read.html @@ -18,16 +18,14 @@