# HG changeset patch # User ymh # Date 1467564700 -7200 # Node ID ada126bb171a75613f8af6634e2b7db0563a0703 # Parent fa4fd5e8b54e8ad382c0f1e2d9c1722df6fb3840 add registration info diff -r fa4fd5e8b54e -r ada126bb171a server/src/metaeducation/static/metaeducation/js/mtdc-tracking-worker.js --- a/server/src/metaeducation/static/metaeducation/js/mtdc-tracking-worker.js Sun Jul 03 14:16:07 2016 +0200 +++ b/server/src/metaeducation/static/metaeducation/js/mtdc-tracking-worker.js Sun Jul 03 18:51:40 2016 +0200 @@ -28,16 +28,14 @@ }, data: JSON.stringify(trackingMessages), contentType: 'application/json' - }).done(function(data) { - console.log('Send tracking info success', data); }).fail(function(){ console.log('send tracking data failed', trackingMessages); - }); + }); // this is fire and forget. Nothong to do on done } var trackingWorker = { trackingMessages: [], - currentUser: renkan.currentUser, + currentUser: renkan.current_user, renkan: renkan, trackingUrl: trackingUrl, trackingCloseUrl: trackingCloseUrl, @@ -189,6 +187,7 @@ $.ajax({ method: 'POST', url: this.trackingCloseUrl, + async: false, headers: { 'X-CSRFToken': this.csrftoken }, @@ -197,11 +196,9 @@ 'registration': this.registration } - }).done(function() { - console.log('Send close tracking info success'); }).fail(function(){ console.log('send tracking data failed'); - }); + }); // this is fire and forget. Nothong tpo do on failed } }; diff -r fa4fd5e8b54e -r ada126bb171a server/src/metaeducation/templates/renkan_edit.html --- a/server/src/metaeducation/templates/renkan_edit.html Sun Jul 03 14:16:07 2016 +0200 +++ b/server/src/metaeducation/templates/renkan_edit.html Sun Jul 03 18:51:40 2016 +0200 @@ -50,7 +50,7 @@ }); _renkan.setCurrentUser('{{ user.external_id }}', '{{ user.username }}'); - var trackingWorker = Mtdc.TrackingWorker(_renkan, "{% url 'tracking_view' %}", "{% url 'tracking_view_close' %}"); + var trackingWorker = Mtdc.TrackingWorker(_renkan, "{% url 'tracking_view' %}", "{% url 'tracking_view_close' %}", "{{ registration }}"); Rkns.mtdcTracking(_renkan, trackingWorker); Rkns.mtdcJsonIO(_renkan, { diff -r fa4fd5e8b54e -r ada126bb171a server/src/metaeducation/templates/renkan_view.html --- a/server/src/metaeducation/templates/renkan_view.html Sun Jul 03 14:16:07 2016 +0200 +++ b/server/src/metaeducation/templates/renkan_view.html Sun Jul 03 18:51:40 2016 +0200 @@ -4,6 +4,7 @@ {% block js_import %} {{block.super}} + @@ -16,6 +17,7 @@ + {% endblock js_import %} @@ -78,4 +86,4 @@ -{% endblock main_content %} \ No newline at end of file +{% endblock main_content %} diff -r fa4fd5e8b54e -r ada126bb171a server/src/metaeducation/views/renkan.py --- a/server/src/metaeducation/views/renkan.py Sun Jul 03 14:16:07 2016 +0200 +++ b/server/src/metaeducation/views/renkan.py Sun Jul 03 18:51:40 2016 +0200 @@ -1,4 +1,4 @@ -import logging, json +import logging, json, uuid from django.conf import settings from django.core.urlresolvers import reverse from django.http import HttpResponse, HttpResponseRedirect @@ -42,10 +42,19 @@ class ViewRenkanView(TemplateView): template_name = "renkan_view.html" + def get_context_data(self, **kwargs): + context = super(ViewRenkanView, self).get_context_data(**kwargs) + context['registration'] = str(uuid.uuid4()) + return context class EditRenkanView(TemplateView): template_name = "renkan_edit.html" + def get_context_data(self, **kwargs): + context = super(EditRenkanView, self).get_context_data(**kwargs) + context['registration'] = str(uuid.uuid4()) + return context + class DeleteRenkanView(View):