Commit 80444b17 authored by Anze Vavpetic's avatar Anze Vavpetic

Added alter table widget for editing orange tables. Still TODO: for discrete...

Added alter table widget for editing orange tables. Still TODO: for discrete variables a dropdown list of legal values should appear when editing.
parent 663acc01
......@@ -82,3 +82,8 @@ def build_subgroups(request, input_dict, output_dict, widget):
def kepner_tregoe(request, input_dict, output_dict, widget):
attributes = [att.name for att in input_dict['data'].domain.features]
return render(request, 'interactions/kepner_tregoe.html', {'widget':widget, 'attributes':attributes})
def alter_table(request, input_dict, output_dict, widget):
from visualization_views import orng_table_to_dict
data = input_dict['data']
return render(request, 'interactions/alter_table.html', {'widget' : widget,'input_dict' : input_dict,'output_dict' : orng_table_to_dict(data)})
from workflows.security import safeOpen
import nlp
import cPickle
import json
def test_interaction(input_dict):
return input_dict
......@@ -845,7 +846,7 @@ def kepner_tregoe(input_dict):
class KepnerTregoe:
'''
Kepner Tregoe model.
Kepner-Tregoe model.
'''
def __init__(self, data, weights, smaller_is_better=None):
self.data = data
......@@ -904,3 +905,26 @@ def ds_charts(input_dict):
def string_to_file(input_dict):
return {}
def alter_table(input_dict):
return {'altered_data' : None}
def alter_table_finished(postdata, input_dict, output_dict):
import Orange
from Orange.feature import Type
from visualization_views import orng_table_to_dict
widget_id = postdata['widget_id'][0]
# Parse the changes
altered_cells = json.loads(postdata['alteredCells'+widget_id][0])
new_table = Orange.data.Table(input_dict['data'])
for cell, new_value in altered_cells.items():
tokens = cell.split('_')
inst_idx, att = int(tokens[1]), str(tokens[2])
if new_table[inst_idx][att].var_type == Type.Continuous:
new_table[inst_idx][att] = float(new_value)
else: # Discrete or string
# TODO:
# This crashes if new_value is not among the legal values for the discrete attribute
# - add a dropdown list of legal values when editing the table!
new_table[inst_idx][att] = str(new_value)
return {'altered_data' : new_table}
......@@ -439,9 +439,7 @@ class Widget(models.Model):
self.finished=False
self.save()
raise
print outputs
for o in self.outputs.all():
print o
if not self.abstract_widget is None:
o.value = outputs[o.variable]
o.save()
......
......@@ -226,4 +226,10 @@ html[xmlns] .dataTables_wrapper {
}
* html .dataTables_wrapper {
height: 1%;
}
\ No newline at end of file
}
.ui-widget input {
margin-bottom: 0px;
}
.dataTables_filter input {
margin-bottom: 5px;
}
(function($){$.fn.editable=function(target,options){if('disable'==target){$(this).data('disabled.editable',true);return;}
if('enable'==target){$(this).data('disabled.editable',false);return;}
if('destroy'==target){$(this).unbind($(this).data('event.editable')).removeData('disabled.editable').removeData('event.editable');return;}
var settings=$.extend({},$.fn.editable.defaults,{target:target},options);var plugin=$.editable.types[settings.type].plugin||function(){};var submit=$.editable.types[settings.type].submit||function(){};var buttons=$.editable.types[settings.type].buttons||$.editable.types['defaults'].buttons;var content=$.editable.types[settings.type].content||$.editable.types['defaults'].content;var element=$.editable.types[settings.type].element||$.editable.types['defaults'].element;var reset=$.editable.types[settings.type].reset||$.editable.types['defaults'].reset;var callback=settings.callback||function(){};var onedit=settings.onedit||function(){};var onsubmit=settings.onsubmit||function(){};var onreset=settings.onreset||function(){};var onerror=settings.onerror||reset;if(settings.tooltip){$(this).attr('title',settings.tooltip);}
settings.autowidth='auto'==settings.width;settings.autoheight='auto'==settings.height;return this.each(function(){var self=this;var savedwidth=$(self).width();var savedheight=$(self).height();$(this).data('event.editable',settings.event);if(!$.trim($(this).html())){$(this).html(settings.placeholder);}
$(this).bind(settings.event,function(e){if(true===$(this).data('disabled.editable')){return;}
if(self.editing){return;}
if(false===onedit.apply(this,[settings,self])){return;}
e.preventDefault();e.stopPropagation();if(settings.tooltip){$(self).removeAttr('title');}
if(0==$(self).width()){settings.width=savedwidth;settings.height=savedheight;}else{if(settings.width!='none'){settings.width=settings.autowidth?$(self).width():settings.width;}
if(settings.height!='none'){settings.height=settings.autoheight?$(self).height():settings.height;}}
if($(this).html().toLowerCase().replace(/(;|")/g,'')==settings.placeholder.toLowerCase().replace(/(;|")/g,'')){$(this).html('');}
self.editing=true;self.revert=$(self).html();$(self).html('');var form=$('<form />');if(settings.cssclass){if('inherit'==settings.cssclass){form.attr('class',$(self).attr('class'));}else{form.attr('class',settings.cssclass);}}
if(settings.style){if('inherit'==settings.style){form.attr('style',$(self).attr('style'));form.css('display',$(self).css('display'));}else{form.attr('style',settings.style);}}
var input=element.apply(form,[settings,self]);var input_content;if(settings.loadurl){var t=setTimeout(function(){input.disabled=true;content.apply(form,[settings.loadtext,settings,self]);},100);var loaddata={};loaddata[settings.id]=self.id;if($.isFunction(settings.loaddata)){$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings]));}else{$.extend(loaddata,settings.loaddata);}
$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:false,success:function(result){window.clearTimeout(t);input_content=result;input.disabled=false;}});}else if(settings.data){input_content=settings.data;if($.isFunction(settings.data)){input_content=settings.data.apply(self,[self.revert,settings]);}}else{input_content=self.revert;}
content.apply(form,[input_content,settings,self]);input.attr('name',settings.name);buttons.apply(form,[settings,self]);$(self).append(form);plugin.apply(form,[settings,self]);$(':input:visible:enabled:first',form).focus();if(settings.select){input.select();}
input.keydown(function(e){if(e.keyCode==27){e.preventDefault();reset.apply(form,[settings,self]);}});var t;if('cancel'==settings.onblur){input.blur(function(e){t=setTimeout(function(){reset.apply(form,[settings,self]);},500);});}else if('submit'==settings.onblur){input.blur(function(e){t=setTimeout(function(){form.submit();},200);});}else if($.isFunction(settings.onblur)){input.blur(function(e){settings.onblur.apply(self,[input.val(),settings]);});}else{input.blur(function(e){});}
form.submit(function(e){if(t){clearTimeout(t);}
e.preventDefault();if(false!==onsubmit.apply(form,[settings,self])){if(false!==submit.apply(form,[settings,self])){if($.isFunction(settings.target)){var str=settings.target.apply(self,[input.val(),settings]);$(self).html(str);self.editing=false;callback.apply(self,[self.innerHTML,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}}else{var submitdata={};submitdata[settings.name]=input.val();submitdata[settings.id]=self.id;if($.isFunction(settings.submitdata)){$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings]));}else{$.extend(submitdata,settings.submitdata);}
if('PUT'==settings.method){submitdata['_method']='put';}
$(self).html(settings.indicator);var ajaxoptions={type:'POST',data:submitdata,dataType:'html',url:settings.target,success:function(result,status){if(ajaxoptions.dataType=='html'){$(self).html(result);}
self.editing=false;callback.apply(self,[result,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr]);}};$.extend(ajaxoptions,settings.ajaxoptions);$.ajax(ajaxoptions);}}}
$(self).attr('title',settings.tooltip);return false;});});this.reset=function(form){if(this.editing){if(false!==onreset.apply(form,[settings,self])){$(self).html(self.revert);self.editing=false;if(!$.trim($(self).html())){$(self).html(settings.placeholder);}
if(settings.tooltip){$(self).attr('title',settings.tooltip);}}}};});};$.editable={types:{defaults:{element:function(settings,original){var input=$('<input type="hidden"></input>');$(this).append(input);return(input);},content:function(string,settings,original){$(':input:first',this).val(string);},reset:function(settings,original){original.reset(this);},buttons:function(settings,original){var form=this;if(settings.submit){if(settings.submit.match(/>$/)){var submit=$(settings.submit).click(function(){if(submit.attr("type")!="submit"){form.submit();}});}else{var submit=$('<button type="submit" />');submit.html(settings.submit);}
$(this).append(submit);}
if(settings.cancel){if(settings.cancel.match(/>$/)){var cancel=$(settings.cancel);}else{var cancel=$('<button type="cancel" />');cancel.html(settings.cancel);}
$(this).append(cancel);$(cancel).click(function(event){if($.isFunction($.editable.types[settings.type].reset)){var reset=$.editable.types[settings.type].reset;}else{var reset=$.editable.types['defaults'].reset;}
reset.apply(form,[settings,original]);return false;});}}},text:{element:function(settings,original){var input=$('<input />');if(settings.width!='none'){input.width(settings.width);}
if(settings.height!='none'){input.height(settings.height);}
input.attr('autocomplete','off');$(this).append(input);return(input);}},textarea:{element:function(settings,original){var textarea=$('<textarea />');if(settings.rows){textarea.attr('rows',settings.rows);}else if(settings.height!="none"){textarea.height(settings.height);}
if(settings.cols){textarea.attr('cols',settings.cols);}else if(settings.width!="none"){textarea.width(settings.width);}
$(this).append(textarea);return(textarea);}},select:{element:function(settings,original){var select=$('<select />');$(this).append(select);return(select);},content:function(data,settings,original){if(String==data.constructor){eval('var json = '+data);}else{var json=data;}
for(var key in json){if(!json.hasOwnProperty(key)){continue;}
if('selected'==key){continue;}
var option=$('<option />').val(key).append(json[key]);$('select',this).append(option);}
$('select',this).children().each(function(){if($(this).val()==json['selected']||$(this).text()==$.trim(original.revert)){$(this).attr('selected','selected');}});}}},addInputType:function(name,input){$.editable.types[name]=input;}};$.fn.editable.defaults={name:'value',id:'id',type:'text',width:'auto',height:'auto',event:'click.editable',onblur:'cancel',loadtype:'GET',loadtext:'Loading...',placeholder:'Click to edit',loaddata:{},submitdata:{},ajaxoptions:{}};})(jQuery);
\ No newline at end of file
......@@ -30,6 +30,7 @@
<script src="{{ STATIC_URL }}js/jquery.treeview.edit.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}js/jquery.jstree.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}js/jquery.dataTables.min.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}js/jquery.jeditable.mini.js" type="text/javascript"></script>
<!-- <script type="text/javascript" src="{{ STATIC_URL }}js/graphics.js"></script>-->
<script type="text/javascript" src="{{ STATIC_URL }}js/fileuploader.js"></script>
<script src="{{ STATIC_URL }}js/jquery.contextmenu.js" type="text/javascript"></script>
......
<div id="widgetinteract-{{widget.pk}}" rel="{{widget.pk}}" class="widgetinteractdialog" title="{{widget.name}} interaction" width="700" height="500">
<center>
<table cellpadding="0" cellspacing="0" border="0" class="display" id="datasetTable{{widget.pk}}">
<!-- header -->
<thead>
<tr>
{% for att in output_dict.attrs %}
<th>{{att}}</th>
{% endfor %}
{% if output_dict.class_var %}
<th>{{output_dict.class_var}} [class]</th>
{% endif %}
{% for att in output_dict.metas %}
<th>{{att}} [meta]</th>
{% endfor %}
</tr>
</thead>
<tbody>
<!-- instances -->
{% for inst in output_dict.data %}
<tr>
{% for att, v in inst %}
<td id="cell_{{forloop.parentloop.counter0}}_{{att}}">{{v}}</td>
{% endfor %}
</tr>
{% endfor %}
</tbody>
</table>
<form>
<input type="hidden" name="alteredCells{{widget.pk}}" id="alteredCells{{widget.pk}}" value=""/>
<input type="hidden" name="widget_id" value="{{widget.pk}}"/>
</form>
</center>
<script type="text/javascript">
$(function () {
$(document).ready(function() {
var alteredCells = {};
var oTable = $('#datasetTable{{widget.pk}}').dataTable( {
"bSortCellsTop" : true,
"bJQueryUI": true,
"sPaginationType": "full_numbers"
});
oTable.$('td').editable(function(value, settings) {
// Update the hidden input value
var id = $(this).attr("id");
// Update the value
alteredCells[id] = value;
$('#alteredCells{{widget.pk}}').val(JSON.stringify(alteredCells));
// On edit just return the new value (no need to make a server call).
return value;
}, {
width: '100%'
});
});
});
</script>
</div>
\ No newline at end of file
......@@ -19,7 +19,7 @@
<!-- instances -->
{% for inst in output_dict.data %}
<tr>
{% for v in inst %}
{% for _, v in inst %}
<td>{{v}}</td>
{% endfor %}
</tr>
......
......@@ -55,42 +55,34 @@ def object_viewer(request,input_dict,output_dict,widget):
import pprint
output_dict = {'object_string':pprint.pformat(input_dict['object'])}
return render(request, 'visualizations/object_viewer.html',{'widget':widget,'input_dict':input_dict,'output_dict':output_dict})
def table_viewer(request,input_dict,output_dict,widget):
import Orange
data = input_dict['data']
attrs = []
metas = []
data_new = []
def orng_table_to_dict(data):
import Orange
attrs, metas, data_new = [], [], []
try:
class_var = data.domain.class_var.name
except:
class_var = ''
for m in data.domain.get_metas():
metas.append(data.domain.get_meta(m).name)
for a in data.domain.attributes:
attrs.append(a.name)
pretty_float = lambda x, a: '%.3f' % x if a.var_type == Orange.feature.Type.Continuous else x
for inst in xrange(len(data)):
inst_new = []
for a in data.domain.variables:
value = data[inst][a.name].value
inst_new.append(pretty_float(value, a))
inst_new.append((a.name, pretty_float(value, a)))
for m in data.domain.get_metas():
value = data[inst][m].value
a = data.domain.get_meta(m)
inst_new.append(pretty_float(value, a))
inst_new.append((a.name, pretty_float(value, a)))
data_new.append(inst_new)
return {'attrs':attrs, 'metas':metas, 'data':data_new, 'class_var':class_var}
output_dict = {'attrs':attrs, 'metas':metas, 'data':data_new, 'class_var':class_var}
return render(request, 'visualizations/table_viewer.html',{'widget':widget,'input_dict':input_dict,'output_dict':output_dict})
def table_viewer(request,input_dict,output_dict,widget):
data = input_dict['data']
return render(request, 'visualizations/table_viewer.html',{'widget':widget,'input_dict':input_dict,'output_dict':orng_table_to_dict(data)})
def pr_space_view(request,input_dict,output_dict,widget):
return render(request, 'visualizations/pr_space.html',{'widget':widget,'input_dict':input_dict,'output_dict':output_dict})
......@@ -260,6 +252,11 @@ def sensitivity_analysis_viewer(request, input_dict, output_dict, widget):
})
def ds_charts_viewer(request, input_dict, output_dict, widget):
'''
Decision support visualization.
@author: Anze Vavpeltic, 2012
'''
model = input_dict['model']
norm_data = model()
weight_shares = [ [att, weight] for att, weight in model.weights.items() ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment