X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhazelnut%2Fstatic%2Fjs%2Fhazelnut.js;h=7c042b188de2492cd3e6447fa90eb3bec1d5e686;hb=2baef1cc1dd5bd77c4a949cd60721122d1b55a46;hp=9374cf50d9f093272c987dc335fc39fda4fb49e0;hpb=b7ea95fe5deab2ed8f9e55dd8654ce0c7e944b39;p=unfold.git
diff --git a/plugins/hazelnut/static/js/hazelnut.js b/plugins/hazelnut/static/js/hazelnut.js
index 9374cf50..7c042b18 100644
--- a/plugins/hazelnut/static/js/hazelnut.js
+++ b/plugins/hazelnut/static/js/hazelnut.js
@@ -6,9 +6,8 @@
(function($){
- // TEMP
var debug=false;
- debug=true
+// debug=true
var Hazelnut = Plugin.extend({
@@ -24,6 +23,9 @@
this.received_all_query = false;
this.received_query = false;
+ // We need to remember the active filter for datatables filtering
+ this.filters = Array();
+
// an internal buffer for records that are 'in' and thus need to be checked
this.buffered_records_to_check = [];
// an internal buffer for keeping lines and display them in one call to fnAddData
@@ -50,10 +52,6 @@
this.initialize_table();
},
- default_options: {
- 'checkboxes': false
- },
-
/* PLUGIN EVENTS */
on_show: function(e)
@@ -84,14 +82,14 @@
{
/* Transforms the table into DataTable, and keep a pointer to it */
var self = this;
- actual_options = {
+ var actual_options = {
// Customize the position of Datatables elements (length,filter,button,...)
// we use a fluid row on top and another on the bottom, making sure we take 12 grid elt's each time
- sDom: "<'row'<'col-md-5'l><'col-md-1'r><'col-md-6'f>>t<'row'<'col-md-5'i><'col-md-7'p>>",
+ sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>",
// XXX as of sept. 2013, I cannot locate a bootstrap3-friendly mode for now
// hopefully this would come with dataTables v1.10 ?
// in any case, search for 'sPaginationType' all over the code for more comments
- sPaginationType: 'full_numbers',
+ sPaginationType: 'bootstrap',
// Handle the null values & the error : Datatables warning Requested unknown parameter
// http://datatables.net/forums/discussion/5331/datatables-warning-...-requested-unknown-parameter/p2
aoColumnDefs: [{sDefaultContent: '',aTargets: [ '_all' ]}],
@@ -105,13 +103,19 @@
// xxx DISABLED by jordan: was causing errors in datatables.js
// xxx turned back on by Thierry - this is the code that takes python-provided options into account
// check your datatables_options tag instead
+ // however, we have to accumulate in aoColumnDefs from here (above)
+ // and from the python wrapper (checkboxes management, plus any user-provided aoColumnDefs)
+ if ( 'aoColumnDefs' in this.options.datatables_options) {
+ actual_options['aoColumnDefs']=this.options.datatables_options['aoColumnDefs'].concat(actual_options['aoColumnDefs']);
+ delete this.options.datatables_options['aoColumnDefs'];
+ }
$.extend(actual_options, this.options.datatables_options );
this.table = this.elmt('table').dataTable(actual_options);
/* Setup the SelectAll button in the dataTable header */
/* xxx not sure this is still working */
var oSelectAll = $('#datatableSelectAll-'+ this.options.plugin_uuid);
- oSelectAll.html("Select All");
+ oSelectAll.html("Select All");
oSelectAll.button();
oSelectAll.css('font-size','11px');
oSelectAll.css('float','right');
@@ -125,13 +129,14 @@
*/
$.fn.dataTableExt.afnFiltering.push(function( oSettings, aData, iDataIndex ) {
/* No filtering if the table does not match */
- if (oSettings.nTable.id != "hazelnut-" + self.options.plugin_uuid)
+ if (oSettings.nTable.id != self.options.plugin_uuid + '__table')
return true;
- return this._hazelnut_filter.call(self, oSettings, aData, iDataIndex);
+ return self._hazelnut_filter.call(self, oSettings, aData, iDataIndex);
});
/* Processing hidden_columns */
$.each(this.options.hidden_columns, function(i, field) {
+ //manifold.raise_event(self.options.query_all_uuid, FIELD_REMOVED, field);
self.hide_column(field);
});
}, // initialize_table
@@ -146,13 +151,13 @@
return (tabIndex.length > 0) ? tabIndex[0] : -1;
}, // getColIndex
- checkbox: function (key, value)
+ checkbox_html : function (key, value)
{
var result="";
// Prefix id with plugin_uuid
result += " '+record['hrn']);
} else {
if (record[colnames[j]])
line.push(record[colnames[j]]);
@@ -193,16 +201,15 @@
}
}
- /* catch up with the last column if checkboxes were requested */
- if (this.options.checkboxes)
+ // catch up with the last column if checkboxes were requested
+ if (this.options.checkboxes) {
// Use a key instead of hostname (hard coded...)
- // XXX remove the empty checked attribute
- line.push(this.checkbox(this.key, record[this.key]));
+ line.push(this.checkbox_html(this.key, record[this.key]));
+ }
-// adding an array in one call is *much* more efficient
-// this.table.fnAddData(line);
- this.buffered_lines.push(line)
-
+ // adding an array in one call is *much* more efficient
+ // this.table.fnAddData(line);
+ this.buffered_lines.push(line);
},
clear_table: function()
@@ -236,8 +243,7 @@
set_checkbox: function(record, checked)
{
/* Default: checked = true */
- if (typeof checked === 'undefined')
- checked = true;
+ if (checked === undefined) checked = true;
var key_value;
/* The function accepts both records and their key */
@@ -255,11 +261,12 @@
}
- var checkbox_id = this.id('checkbox', this.id_from_key(this.key, key_value));
- checkbox_id = '#' + checkbox_id.replace(/\./g, '\\.');
-
- var element = $(checkbox_id, this.table.fnGetNodes());
-
+ var checkbox_id = this.flat_id(this.id('checkbox', key_value));
+ // function escape_id(myid) is defined in portal/static/js/common.functions.js
+ checkbox_id = escape_id(checkbox_id);
+ // using dataTables's $ to search also in nodes that are not currently displayed
+ var element = this.table.$(checkbox_id);
+ if (debug) messages.debug("set_checkbox checked=" + checked + " id=" + checkbox_id + " matches=" + element.length);
element.attr('checked', checked);
},
@@ -267,13 +274,16 @@
on_filter_added: function(filter)
{
- // XXX
+ this.filters.push(filter);
this.redraw_table();
},
on_filter_removed: function(filter)
{
- // XXX
+ // Remove corresponding filters
+ this.filters = $.grep(this.filters, function(x) {
+ return x != filter;
+ });
this.redraw_table();
},
@@ -298,18 +308,56 @@
alert('Hazelnut::clear_fields() not implemented');
},
+ /* XXX TODO: make this generic a plugin has to subscribe to a set of Queries to avoid duplicated code ! */
+ /*************************** ALL QUERY HANDLER ****************************/
+
+ on_all_filter_added: function(filter)
+ {
+ // XXX
+ this.redraw_table();
+ },
+
+ on_all_filter_removed: function(filter)
+ {
+ // XXX
+ this.redraw_table();
+ },
+
+ on_all_filter_clear: function()
+ {
+ // XXX
+ this.redraw_table();
+ },
+
+ on_all_field_added: function(field)
+ {
+ this.show_column(field);
+ },
+
+ on_all_field_removed: function(field)
+ {
+ this.hide_column(field);
+ },
+
+ on_all_field_clear: function()
+ {
+ alert('Hazelnut::clear_fields() not implemented');
+ },
+
+
/*************************** RECORD HANDLER ***************************/
on_new_record: function(record)
{
if (this.received_all_query) {
- // if the 'all' query has been dealt with already we may turn on the checkbox
+ // if the 'all' query has been dealt with already we may turn on the checkbox
+ if (debug) messages.debug("turning on checkbox for record "+record[this.key]);
this.set_checkbox(record, true);
- } else {
- // otherwise we need to remember that and do it later on
+ } else {
+ // otherwise we need to remember that and do it later on
+ if (debug) messages.debug("Remembering record to check " + record[this.key]);
this.buffered_records_to_check.push(record);
- console.log ("Remembering record to check " + record);
- }
+ }
},
on_clear_records: function()
@@ -324,9 +372,9 @@
on_query_done: function()
{
- if (this.received_all_query)
- this.unspin();
this.received_query = true;
+ // unspin once we have received both
+ if (this.received_all_query && this.received_query) this.unspin();
},
on_field_state_changed: function(data)
@@ -345,7 +393,23 @@
}
},
+ /* XXX TODO: make this generic a plugin has to subscribe to a set of Queries to avoid duplicated code ! */
// all
+ on_all_field_state_changed: function(data)
+ {
+ switch(data.request) {
+ case FIELD_REQUEST_ADD:
+ case FIELD_REQUEST_ADD_RESET:
+ this.set_checkbox(data.value, true);
+ break;
+ case FIELD_REQUEST_REMOVE:
+ case FIELD_REQUEST_REMOVE_RESET:
+ this.set_checkbox(data.value, false);
+ break;
+ default:
+ break;
+ }
+ },
on_all_new_record: function(record)
{
@@ -366,21 +430,22 @@
on_all_query_done: function()
{
- var self = this;
- if (this.received_query) {
- /* XXX needed ? XXX We uncheck all checkboxes ... */
- $("[id^='datatables-checkbox-" + this.options.plugin_uuid +"']").attr('checked', false);
-
- /* ... and check the ones specified in the resource list */
- $.each(this.buffered_records_to_check, function(i, record) {
- self.set_checkbox(record, true);
- });
-
- this.unspin();
- }
+ if (debug) messages.debug("1-shot initializing dataTables content with " + this.buffered_lines.length + " lines");
this.table.fnAddData (this.buffered_lines);
this.buffered_lines=[];
+
+ var self = this;
+ // if we've already received the slice query, we have not been able to set
+ // checkboxes on the fly at that time (dom not yet created)
+ $.each(this.buffered_records_to_check, function(i, record) {
+ if (debug) messages.debug ("delayed turning on checkbox " + i + " record= " + record);
+ self.set_checkbox(record, true);
+ });
+ this.buffered_records_to_check = [];
+
this.received_all_query = true;
+ // unspin once we have received both
+ if (this.received_all_query && this.received_query) this.unspin();
}, // on_all_query_done
@@ -391,19 +456,8 @@
*/
_hazelnut_filter: function(oSettings, aData, iDataIndex)
{
- var cur_query = this.current_query;
- if (!cur_query) return true;
var ret = true;
-
- /* We have an array of filters : a filter is an array (key op val)
- * field names (unless shortcut) : oSettings.aoColumns = [ sTitle ]
- * can we exploit the data property somewhere ?
- * field values (unless formatting) : aData
- * formatting should leave original data available in a hidden field
- *
- * The current line should validate all filters
- */
- $.each (cur_query.filters, function(index, filter) {
+ $.each (this.filters, function(index, filter) {
/* XXX How to manage checkbox ? */
var key = filter[0];
var op = filter[1];
@@ -483,6 +537,7 @@
var self = e.data;
// XXX this.value = key of object to be added... what about multiple keys ?
+ if (debug) messages.debug("hazelnut click handler checked=" + this.checked + " hrn=" + this.value);
manifold.raise_event(self.options.query_uuid, this.checked?SET_ADD:SET_REMOVED, this.value);
//return false; // prevent checkbox to be checked, waiting response from manifold plugin api