[virtualcommons-developer] commit/vcweb: alllee: removing static dajaxice js file and wiring up exp
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-developer] commit/vcweb: alllee: removing static dajaxice js file and wiring up experimenter notes
|
From: <com...@bi...> - 2013-03-20 20:34:00
|
1 new commit in vcweb: https://bitbucket.org/virtualcommons/vcweb/commits/898a73743093/ changeset: 898a73743093 user: alllee date: 2013-03-20 21:33:59 summary: removing static dajaxice js file and wiring up experimenter notes affected #: 8 files diff -r 3aa5801c8f2ea252f88a43f2f8147f38e2b59fb2 -r 898a737430938ef8b03991a745c2247fa4a0d203 fabfile.py --- a/fabfile.py +++ b/fabfile.py @@ -8,7 +8,7 @@ logger = logging.getLogger(__name__) # needed to push vcweb.settings onto the path. -sys.path.append(os.path.abspath('.')) +sys.path.append(os.path.abspath(os.path.dirname(__file__))) # default env configuration env.python = 'python' @@ -136,8 +136,7 @@ env.apache = 'apache2' env.hosts = ['localhost'] -def staticg(): - local('%(python)s manage.py generate_static_dajaxice > static/js/dajaxice.core.js' % env) +def collectstatic(): local('%(python)s manage.py collectstatic' % env) def setup(): diff -r 3aa5801c8f2ea252f88a43f2f8147f38e2b59fb2 -r 898a737430938ef8b03991a745c2247fa4a0d203 vcweb/core/ajax.py --- a/vcweb/core/ajax.py +++ b/vcweb/core/ajax.py @@ -76,7 +76,7 @@ return HttpResponse(render_template_block(t, block, c), mimetype=mimetype) def _get_experiment(request, pk): - experiment = get_object_or_404(Experiment, pk=pk) + experiment = get_object_or_404(Experiment.objects.select_related('experimenter'), pk=pk) if request.user.experimenter == experiment.experimenter: return experiment raise Experiment.DoesNotExist("Sorry, %s - you do not have access to experiment %s" % (experiment.experimenter, pk)) @@ -87,6 +87,19 @@ @experimenter_required @dajaxice_register +def submit_experimenter_notes(request, experiment_id, notes=None): + experiment = _get_experiment(request, experiment_id) + if notes: + current_round_data = experiment.current_round_data + current_round_data.experimenter_notes = notes + current_round_data.save() + return dumps({ 'success': True }) + else: + return dumps({ 'success': False }) + + +@experimenter_required +@dajaxice_register def get_experiment_model(request, pk): return _get_experiment(request, pk).to_json() @@ -94,14 +107,12 @@ @dajaxice_register def experiment_controller(request, pk, action=None): experiment = _get_experiment(request, pk) - if experiment.experimenter == request.user.experimenter: - try: - experiment.invoke(action) - return experiment.to_json() - except AttributeError as e: - logger.warning("no attribute %s on experiment %s (%s)", action, experiment.status_line, e) - - return dumps({ - 'success': False, - 'message': 'Invalid experiment action %s' % action - }) + try: + experiment.invoke(action) + return experiment.to_json() + except AttributeError as e: + logger.warning("no attribute %s on experiment %s (%s)", action, experiment.status_line, e) + return dumps({ + 'success': False, + 'message': 'Invalid experiment action %s' % action + }) diff -r 3aa5801c8f2ea252f88a43f2f8147f38e2b59fb2 -r 898a737430938ef8b03991a745c2247fa4a0d203 vcweb/core/models.py --- a/vcweb/core/models.py +++ b/vcweb/core/models.py @@ -851,6 +851,7 @@ experiment_dict['allRoundData'] = self.all_round_data() experiment_dict['chatMessages'] = [chat_message.to_dict() for chat_message in self.all_chat_messages] experiment_dict['messages'] = [escape(log) for log in self.activity_log_set.order_by('-date_created')] + experiment_dict['experimenterNotes'] = self.current_round_data.experimenter_notes return experiment_dict def as_dict(self, *args, **kwargs): diff -r 3aa5801c8f2ea252f88a43f2f8147f38e2b59fb2 -r 898a737430938ef8b03991a745c2247fa4a0d203 vcweb/core/templates/base.html --- a/vcweb/core/templates/base.html +++ b/vcweb/core/templates/base.html @@ -1,3 +1,4 @@ +{% load dajaxice_templatetags %} {% load tags %} {% load url from future %} {% load static from staticfiles %} @@ -140,12 +141,7 @@ <script type='text/javascript' src='{{STATIC_URL}}js/ko/knockout.mapping.min.js'></script><script type='text/javascript' src='{{STATIC_URL}}js/common.js'></script><script type='text/javascript' src='//cdnjs.cloudflare.com/ajax/libs/d3/3.0.1/d3.v3.min.js'></script> - {% if DEBUG %} - {% load dajaxice_templatetags %} {% dajaxice_js_import %} - {% else %} - <script type='text/javascript' src='{{STATIC_URL}}js/dajaxice.core.js' charset='utf-8'></script> - {% endif %} {% block javascript %} {% endblock %} </footer> diff -r 3aa5801c8f2ea252f88a43f2f8147f38e2b59fb2 -r 898a737430938ef8b03991a745c2247fa4a0d203 vcweb/core/templates/experimenter/monitor.html --- a/vcweb/core/templates/experimenter/monitor.html +++ b/vcweb/core/templates/experimenter/monitor.html @@ -79,6 +79,13 @@ <span data-bind='text: $data'></span></div></div> + <h4>Notes</h4> + <form id="experimenterLogForm" class='form-horizontal'> + <div class='controls-row'> + <textarea class='input-block-level' id='experimenterNotes' data-bind='text: experimenterNotes' placeholder="Experimenter notes to be stored with this round's data" rows="3" id='experimenterNote'></textarea> + <button id='submitExperimenterNotesButton' class='btn btn-primary' type='submit' data-bind='click: submitExperimenterNotes'>Save</button> + </div> + </form></div></div><h3>Experiment Data</h3> @@ -159,6 +166,15 @@ function ExperimentModel(experimentModelJson) { var self = this; var model = ko.mapping.fromJS(experimentModelJson); + model.submitExperimenterNotes = function(localModel, evt) { + var notes = $('#experimenterNotes').val(); + Dajaxice.vcweb.core.submit_experimenter_notes(function(data) { + if (data.success) { + $('#submitExperimenterNotesButton').val('Saved!'); + } + }, + { 'experiment_id': {{ experiment.pk }}, 'notes': notes }); + } model.advanceToNextRound = function(localModel, evt) { confirmExperimentControllerAction(evt.target, model, function(confirmed) { if (confirmed) { diff -r 3aa5801c8f2ea252f88a43f2f8147f38e2b59fb2 -r 898a737430938ef8b03991a745c2247fa4a0d203 vcweb/core/urls.py --- a/vcweb/core/urls.py +++ b/vcweb/core/urls.py @@ -3,7 +3,7 @@ from vcweb import settings from vcweb.core.views import (Dashboard, LoginView, LogoutView, RegistrationView, MonitorExperimentView, CloneExperimentView, RegisterEmailListView, RegisterSimpleParticipantsView, ClearParticipantsExperimentView, add_experiment, - Participate, download_data, export_configuration, experiment_controller, api_logger, participant_ready) + Participate, download_data, export_configuration, api_logger, participant_ready) import logging import urllib @@ -31,14 +31,9 @@ url(r'^experiment/(?P<pk>\d+)/download/(?P<file_type>[\w]+)$', download_data, name='download_data'), url(r'^experiment/(?P<pk>\d+)/export/configuration(?P<file_extension>.[\w]+)$', export_configuration, name='export_configuration'), # experiment controller actions are the most general, needs to be matched at the very end - url(r'^experiment/(?P<pk>\d+)/(?P<experiment_action>[\w-]+)$', experiment_controller, name='experiment_controller'), # deliberately match any prefix to api/2525/log url(r'api/log/(?P<participant_group_id>\d+)$', api_logger, name='api-logger'), ) -# add ajax actions -urlpatterns += patterns('vcweb.core.ajax', - url(r'^ajax/(?P<pk>\d+)/(<?P<experiment_action[\w-]+)$', 'experiment_controller'), - ) def foursquare_auth_dict(**kwargs): return dict(kwargs, client_id=settings.FOURSQUARE_CONSUMER_KEY, client_secret=settings.FOURSQUARE_CONSUMER_SECRET, v=settings.FOURSQUARE_CONSUMER_DATE_VERIFIED) diff -r 3aa5801c8f2ea252f88a43f2f8147f38e2b59fb2 -r 898a737430938ef8b03991a745c2247fa4a0d203 vcweb/static/js/dajaxice.core.js --- a/vcweb/static/js/dajaxice.core.js +++ /dev/null @@ -1,100 +0,0 @@ -var Dajaxice = { - - vcweb: { - - - - - - core: { - - experiment_controller: function(callback_function, argv){ - Dajaxice.call('vcweb.core.experiment_controller', callback_function, argv); - } - - - - } - - - - } - , - - get_cookie: function(name) - { - var cookieValue = null; - if (document.cookie && document.cookie != '') { - var cookies = document.cookie.split(';'); - for (var i = 0; i < cookies.length; i++) { - var cookie = cookies[i].toString().replace(/^\s+/, "").replace(/\s+$/, ""); - // Does this cookie string begin with the name we want? - if (cookie.substring(0, name.length + 1) == (name + '=')) { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } - } - return cookieValue; - }, - - call: function(dajaxice_function, dajaxice_callback, argv) - { - var send_data = []; - is_callback_a_function = (typeof(dajaxice_callback) == 'function'); - - if (!is_callback_a_function){ - /* Backward compatibility for old callback as string usage. */ - send_data.push('callback='+dajaxice_callback); - } - - send_data.push('argv='+encodeURIComponent(JSON.stringify(argv))); - send_data = send_data.join('&'); - var oXMLHttpRequest = new XMLHttpRequest; - oXMLHttpRequest.open('POST', '/dajaxice/'+dajaxice_function+'/'); - oXMLHttpRequest.setRequestHeader("X-Requested-With", "XMLHttpRequest"); - oXMLHttpRequest.setRequestHeader("X-CSRFToken",Dajaxice.get_cookie('csrftoken')); - oXMLHttpRequest.onreadystatechange = function() { - if (this.readyState == XMLHttpRequest.DONE) { - if (is_callback_a_function){ - try{ - dajaxice_callback(JSON.parse(this.responseText)); - } - catch(exception){ - dajaxice_callback(this.responseText); - } - } - else{ - /* Backward compatibility for old callback as string usage. */ - eval(this.responseText); - } - } - } - oXMLHttpRequest.send(send_data); - } -}; -Dajaxice.EXCEPTION = "DAJAXICE_EXCEPTION"; -window['Dajaxice'] = Dajaxice; - - - -(function(){function b(){this._object=i?new i:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[]}function k(a){b.onreadystatechange&&b.onreadystatechange.apply(a);a.dispatchEvent({type:"readystatechange",bubbles:false,cancelable:false,timeStamp:new Date+0})}function p(a){var c=a.responseXML,d=a.responseText;if(h&&d&&c&&!c.documentElement&&a.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/)){c=new window.ActiveXObject("Microsoft.XMLDOM");c.async=false;c.validateOnParse=false; -c.loadXML(d)}if(c)if(h&&c.parseError!=0||!c.documentElement||c.documentElement&&c.documentElement.tagName=="parsererror")return null;return c}function o(a){try{a.responseText=a._object.responseText}catch(c){}try{a.responseXML=p(a._object)}catch(d){}try{a.status=a._object.status}catch(g){}try{a.statusText=a._object.statusText}catch(e){}}function l(a){a._object.onreadystatechange=new window.Function}var i=window.XMLHttpRequest,j=!!window.controllers,h=window.document.all&&!window.opera;if(j&&i.wrapped)b.wrapped= -i.wrapped;b.UNSENT=0;b.OPENED=1;b.HEADERS_RECEIVED=2;b.LOADING=3;b.DONE=4;b.prototype.readyState=b.UNSENT;b.prototype.responseText="";b.prototype.responseXML=null;b.prototype.status=0;b.prototype.statusText="";b.prototype.onreadystatechange=null;b.onreadystatechange=null;b.onopen=null;b.onsend=null;b.onabort=null;b.prototype.open=function(a,c,d,g,e){delete this._headers;if(arguments.length<3)d=true;this._async=d;var f=this,m=this.readyState,n;if(h&&d){n=function(){if(m!=b.DONE){l(f);f.abort()}};window.attachEvent("onunload", -n)}b.onopen&&b.onopen.apply(this,arguments);if(arguments.length>4)this._object.open(a,c,d,g,e);else arguments.length>3?this._object.open(a,c,d,g):this._object.open(a,c,d);if(!j&&!h){this.readyState=b.OPENED;k(this)}this._object.onreadystatechange=function(){if(!(j&&!d)){f.readyState=f._object.readyState;o(f);if(f._aborted)f.readyState=b.UNSENT;else{if(f.readyState==b.DONE){l(f);h&&d&&window.detachEvent("onunload",n)}m!=f.readyState&&k(f);m=f.readyState}}}};b.prototype.send=function(a){b.onsend&&b.onsend.apply(this, -arguments);if(a&&a.nodeType){a=window.XMLSerializer?(new window.XMLSerializer).serializeToString(a):a.xml;this._headers["Content-Type"]||this._object.setRequestHeader("Content-Type","application/xml")}this._object.send(a);if(j&&!this._async){this.readyState=b.OPENED;for(o(this);this.readyState<b.DONE;){this.readyState++;k(this);if(this._aborted)return}}};b.prototype.abort=function(){b.onabort&&b.onabort.apply(this,arguments);if(this.readyState>b.UNSENT)this._aborted=true;this._object.abort();l(this)}; -b.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders()};b.prototype.getResponseHeader=function(a){return this._object.getResponseHeader(a)};b.prototype.setRequestHeader=function(a,c){if(!this._headers)this._headers={};this._headers[a]=c;return this._object.setRequestHeader(a,c)};b.prototype.addEventListener=function(a,c,d){for(var g=0,e;e=this._listeners[g];g++)if(e[0]==a&&e[1]==c&&e[2]==d)return;this._listeners.push([a,c,d])};b.prototype.removeEventListener=function(a, -c,d){for(var g=0,e;e=this._listeners[g];g++)if(e[0]==a&&e[1]==c&&e[2]==d)break;e&&this._listeners.splice(g,1)};b.prototype.dispatchEvent=function(a){a={type:a.type,target:this,currentTarget:this,eventPhase:2,bubbles:a.bubbles,cancelable:a.cancelable,timeStamp:a.timeStamp,stopPropagation:function(){},preventDefault:function(){},initEvent:function(){}};if(a.type=="readystatechange"&&this.onreadystatechange)(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[a]);for(var c=0,d;d= -this._listeners[c];c++)if(d[0]==a.type&&!d[2])(d[1].handleEvent||d[1]).apply(this,[a])};b.prototype.toString=function(){return"[object XMLHttpRequest]"};b.toString=function(){return"[XMLHttpRequest]"};if(!window.Function.prototype.apply)window.Function.prototype.apply=function(a,c){c||(c=[]);a.__func=this;a.__func(c[0],c[1],c[2],c[3],c[4]);delete a.__func};window.XMLHttpRequest=b})(); - - - - -if(!this.JSON)this.JSON={}; -(function(){function k(a){return a<10?"0"+a:a}function n(a){o.lastIndex=0;return o.test(a)?'"'+a.replace(o,function(c){var d=q[c];return typeof d==="string"?d:"\\u"+("0000"+c.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function l(a,c){var d,f,i=g,e,b=c[a];if(b&&typeof b==="object"&&typeof b.toJSON==="function")b=b.toJSON(a);if(typeof j==="function")b=j.call(c,a,b);switch(typeof b){case "string":return n(b);case "number":return isFinite(b)?String(b):"null";case "boolean":case "null":return String(b);case "object":if(!b)return"null"; -g+=m;e=[];if(Object.prototype.toString.apply(b)==="[object Array]"){f=b.length;for(a=0;a<f;a+=1)e[a]=l(a,b)||"null";c=e.length===0?"[]":g?"[\n"+g+e.join(",\n"+g)+"\n"+i+"]":"["+e.join(",")+"]";g=i;return c}if(j&&typeof j==="object"){f=j.length;for(a=0;a<f;a+=1){d=j[a];if(typeof d==="string")if(c=l(d,b))e.push(n(d)+(g?": ":":")+c)}}else for(d in b)if(Object.hasOwnProperty.call(b,d))if(c=l(d,b))e.push(n(d)+(g?": ":":")+c);c=e.length===0?"{}":g?"{\n"+g+e.join(",\n"+g)+"\n"+i+"}":"{"+e.join(",")+"}"; -g=i;return c}}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+k(this.getUTCMonth()+1)+"-"+k(this.getUTCDate())+"T"+k(this.getUTCHours())+":"+k(this.getUTCMinutes())+":"+k(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(){return this.valueOf()}}var p=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, -o=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,g,m,q={"\u0008":"\\b","\t":"\\t","\n":"\\n","\u000c":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},j;if(typeof JSON.stringify!=="function")JSON.stringify=function(a,c,d){var f;m=g="";if(typeof d==="number")for(f=0;f<d;f+=1)m+=" ";else if(typeof d==="string")m=d;if((j=c)&&typeof c!=="function"&&(typeof c!=="object"||typeof c.length!=="number"))throw new Error("JSON.stringify");return l("", -{"":a})};if(typeof JSON.parse!=="function")JSON.parse=function(a,c){function d(f,i){var e,b,h=f[i];if(h&&typeof h==="object")for(e in h)if(Object.hasOwnProperty.call(h,e)){b=d(h,e);if(b!==undefined)h[e]=b;else delete h[e]}return c.call(f,i,h)}p.lastIndex=0;if(p.test(a))a=a.replace(p,function(f){return"\\u"+("0000"+f.charCodeAt(0).toString(16)).slice(-4)});if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, -"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){a=eval("("+a+")");return typeof c==="function"?d({"":a},""):a}throw new SyntaxError("JSON.parse");}})(); - diff -r 3aa5801c8f2ea252f88a43f2f8147f38e2b59fb2 -r 898a737430938ef8b03991a745c2247fa4a0d203 vcweb/urls.py --- a/vcweb/urls.py +++ b/vcweb/urls.py @@ -24,7 +24,7 @@ url(r'^accounts/password_reset/done/$', 'django.contrib.auth.views.password_reset_done', { 'template_name': 'account/password_reset_done.html' }), url(r'^accounts/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm'), url(r'^accounts/reset/done/$', 'django.contrib.auth.views.password_reset_complete'), - +# dajaxice core url(dajaxice_config.dajaxice_url, include('dajaxice.urls')), # FIXME: ideally this should be set up dynamically by iterating through each @@ -48,8 +48,5 @@ handler500 = 'vcweb.core.views.handler500' if settings.DEBUG: - urlpatterns += patterns('', - (r'^500/$', TemplateView.as_view(template_name='500.html'),), - ) urlpatterns += staticfiles_urlpatterns() Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
