knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,049 Commits 65 Branches 60 Tags
Commit Graph

702 Commits

Author SHA1 Message Date
John Glover
8439cc5522 [#287] Add view.flot.js. 
Allows flot to be used for graphs as well as
flotr2.
Based on view.graph.js in the ckan-updates branch.
 2013-01-09 15:53:44 +01:00
Stefan Wehrmeyer
2c79d00f09 Remove weird date parsing hack to fix tests 2013-01-07 10:33:29 +01:00
Rufus Pollock
965bf6e9bb [#172,refactor][s]: switch everything to use underscore.deferred rather than jQuery.Deferred - fixes #172. 
* In addition reduced pattern of passing in $ to backend modules - instead just use jQuery explicitly (this should make it easier to mock-out jQuery if you waned to
 2013-01-04 20:13:16 +00:00
Rufus Pollock
e8ad368347 [backend.memory][s]: rename Store.data attribute to records to be more consistent (and more meaningful). 2013-01-03 21:50:47 +00:00
Rufus Pollock
64af7b2150 Merge branch 'master' of github.com:okfn/recline 2012-12-22 19:54:48 +00:00
Rufus Pollock
3610d95e74 [#291,bugfix][s]: memory backend transform function now works even when records do not have id - fixes #291. 
* Also simplified (and made more efficient) by removing dependency on (not very useful) recline.Data.Transform.mapDocs function
* As documented in #291 issue was that an id was required in the docs
 2012-12-22 19:51:03 +00:00
John Glover
9bfbce776b [#264] Fix for #264 from ckan-updates branch. 
Uses _.defaults rather than performing an explicit
deep copy.
 2012-12-10 16:57:44 +01:00
Rufus Pollock
5a322e2c7c [#286,bugfix]: fix for case where fields array has nulls in it. 
If passed fields = [ null, ..., ...] or [ ... , null, ...] we fail in Dataset._normalizeRecordsAndFields method because:

1. If null is first element we do not do field generation correctly because typeof(null) is object - ede211646a/src/model.js (L108)
2.  We call toString on field names which fails for null ede211646a/src/model.js (L113)
 2012-12-09 18:58:52 +00:00
Rufus Pollock
f093fcebfe Merge pull request #263 from Integral/master 
[backend/couchdb,#229]: Fixes for CouchDB sorting and filtering from @integral.
 2012-12-01 06:40:01 -08:00
Rufus Pollock
b2cd87cec4 Revert "Merge pull request #275 from citizen-cyberscience-centre/master". 
This reverts commit b900581605e7612bd896e4f1bec7837784a1ebbc, reversing
changes made to 3226d8b11b1d41bdafcdab6f9ea424d3f553cbe3.
 2012-11-19 12:24:06 +00:00
Daniel Lombraña González
7af166ed85 Create a Date using the Date type. 
This commit fixes an error in Safari that was not working. Moment.JS was not
converting correctly a string, while with thix fix works. More info here:
http://stackoverflow.com/questions/2587345/javascript-date-parse
 2012-11-13 16:00:15 +01:00
Rufus Pollock
53a417abde [bugfix,backend/memory][xs]: map 'number' type correctly for filter application. 2012-11-13 12:06:47 +00:00
Rufus Pollock
b89e6a8a65 Merge pull request #272 from demiurg/master 
[view/graph][s]: Ability to extend graph options with general options - thx to @demiurg.
 2012-11-10 00:44:05 -08:00
Rufus Pollock
ede211646a [#264,bugfix,filtereditor][s]: track down and fix bug with addFilter (and hence filtereditor) - fixes #264. 
* Quite a subtle bug due to the fact that we were not doing a deep copy on the filter template in addFilter
 2012-11-08 20:35:03 +00:00
User
c74c329c21 Added a line to document graphOptions, changed attribute access method 2012-11-08 13:02:49 -05:00
User
b501b7123c Added ability to extend graph options with state parameter 'graphOptions' 2012-11-08 12:31:05 -05:00
Frederick Ros
24ee9fa019 Update the grid when a record is changed 
Fixes #255
 2012-11-02 22:26:45 +04:00
Frederick Ros
c7ff853acb Fixed typo in comments 2012-11-02 22:26:45 +04:00
Rufus Pollock
98e346b270 Merge pull request #261 from sleeper/fix_typo 
[view/slickgrid][xs]: Fixed typo in comments.
 2012-10-29 02:18:09 -07:00
Daniel Beilinson
7a12003a35 undfinded _id for couchDB, 33 symbols ID generator 2012-10-29 01:43:52 +04:00
Daniel Beilinson
7e471407a3 _createDocument fixed, randomId function added 2012-10-24 23:13:28 +04:00
Frederick Ros
0aa85c9560 Update the grid when a record is changed 
Fixes #255
 2012-10-24 00:01:08 +02:00
Daniel Beilinson
b3e68c152d couchDB broken sort and filter fixed 2012-10-23 23:06:52 +04:00
Rufus Pollock
df935091fd [#244,view/map][m]: support for customizing rendering of map features in all ways supported by Leaflet - fixes #244. 
* This automatically provides support for things like custom markers via
  pointToLayer etc

* Also a significant bugfix for a bug that surfaced when using different marker
  (like the CircleMarker) - and which took ~30m to track down. Bug was that the
  call to zoom (or, more specifically, call to getBounds) occurred before
  features were added to the map and getBounds for some objects (such as
  circles) requires map to exit (so you can do a projection!)
 2012-10-23 00:19:59 +01:00
Rufus Pollock
80626485ce [#223,map][xs]: small improvements to in file docs for Map view. 2012-10-22 21:39:18 +01:00
Frederick Ros
abb23cc5e3 Fixed typo in comments 2012-10-22 19:07:57 +02:00
Rufus Pollock
97dcf08780 [backend/gdocs][s]: minor improvement to support handling spreadsheet urls where #gid=xxx is missing. 2012-10-20 01:57:13 +01:00
Rufus Pollock
4aeabbe3a1 Merge branch '120-solr-backend' 2012-10-19 09:55:18 +01:00
Rufus Pollock
bc1c84944a Merge branch 'master' of github.com:okfn/recline 2012-10-19 08:00:51 +01:00
Rufus Pollock
f6a3395b40 [#258,model][xs]: tiny bugfix for cases where fields in raw state contain a non-string - fixes #258. 2012-10-19 07:57:47 +01:00
Rufus Pollock
dd8641ded2 [backend/csv,docs][s]: minor improvements to docs plus explicitly pass $/jQuery to module function (thanks to @acouch for the spot). 2012-10-19 07:41:11 +01:00
Rufus Pollock
59c90df391 Merge branch 'master' into 120-solr-backend 2012-10-16 21:14:09 +01:00
Frederick Ros
1cc8df020d The slickgrid view can now be edited. 2012-10-14 20:56:25 +02:00
Rufus Pollock
75ef00182e [#246,bugfix,slickgrid][s]: fix for issue where slickgrid view not presenting columns in order of Dataset Fields - fixes #246. 
Bug details: Issue was that sorting of columns was happening inside SlickGrid view even though not supposed to (no special column order had been provided). Specific issue is at following lines 4737d7ecc5/src/view.slickgrid.js (L88):

    // Order them if there is ordering info on the state
    if (this.state.get('columnsOrder')) {

Problem is that state.columnsOrder is the empty array (by default) and in javascript `Boolean([])` is true.
 2012-10-14 18:13:13 +01:00
Rufus Pollock
88dfa0b314 [#250,backend/ckan][s]: nicer way to do configuration of CKAN API endpoint including parsing of url - fixes #250. 2012-10-14 17:52:29 +01:00
Rufus Pollock
046ee8c1a0 [#240,bugfix,backend/memory][s]: range filters now work as expected when one end of range is null - fixes #240. 
* see ticket and comments for more details
 2012-10-12 22:29:55 +01:00
Rufus Pollock
7819b3b185 [#248,model][s]: normalize Field types where possible by mapping standard type aliases to default type name - fixes #248. 
* view.graph.js improve graph view by making sure datetime for an axis is judged by whether it is date, datetime or time not just date!
* backend.ckan.js some type conversions now done in core model so can be removed
 2012-10-12 22:06:56 +01:00
Rufus Pollock
f8bcf28d14 [#242,bugfix][s]: remove filter in filtereditor now removes correct filter rather than first one - fixes #242. 
* Also tweak so that name of field comes before type of filter
 2012-10-12 20:08:05 +01:00
Rufus Pollock
cc9389a689 [facetviewer][s]: change from dropdown and simplify styling plus make some minor fixes. 2012-10-04 07:26:19 +01:00
Rufus Pollock
1bcb163ebe [filter,refactor][s]: remove fieldType attribute on filters as can (and should) get fieldType from model if needed. 
* fieldType is needed now as we parse values to specific type before doing filters
* needed to correct some tests for this change
 2012-10-04 07:01:41 +01:00
Rufus Pollock
9ea3b05524 [facetviewer][xs]: minor tweaks to facetviewer to remove things that aren't generic. 2012-10-03 18:47:40 +01:00
John Martin
a4e1b53c06 Fix to make clearfix work in Internet Explorer 7 2012-10-02 14:47:43 +01:00
John Martin
6ee9e98e5e Fixes for Internet Explorer 7 and its strict JSON object modelling 2012-10-02 14:36:46 +01:00
John Martin
1e4a2760f9 Added fix js file for adding support for ECMA262-5 Array methods for browsers that don\'t support them 2012-10-02 14:20:32 +01:00
John Martin
1d931b9239 Renamed all methods called delete to remove 
This is because Internet Explorer <= 8 has `delete` as a reserved keyword that you cannot name your methods
 2012-10-02 14:10:25 +01:00
Rufus Pollock
a16dd6b2d4 [backend/ckan,bugfix][s]: map types better. 2012-10-01 16:13:34 +01:00
Rufus Pollock
1377672da2 Merge pull request #231 from domoritz/markercluster 
[view/map][m]: Cluster markers to enable better handling of large dataset - thanks to @domoritz.
 2012-09-25 07:28:22 -07:00
Rufus Pollock
98393498ab Merge branch 'master' of github.com:okfn/recline 2012-09-25 14:29:20 +01:00
Dominik Moritz
16fc21ac03 fix popups (all popups were the same) 2012-09-25 11:49:43 +01:00
Dominik Moritz
2d26afb435 Merge branch 'master' into markercluster 
Conflicts:
	src/view.map.js
 2012-09-25 11:49:16 +01:00