From: Guillaume Pellerin Date: Tue, 5 Dec 2017 16:00:19 +0000 (+0100) Subject: Fix access rights, prepare finer seminar timer display X-Git-Tag: 2.8.1-pro~216^2~3 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=389c6056a4795dcd2889631c78781935a043df0f;p=teleforma.git Fix access rights, prepare finer seminar timer display --- diff --git a/example/manage.py b/example/manage.py old mode 100755 new mode 100644 diff --git a/teleforma/models/core.py b/teleforma/models/core.py old mode 100755 new mode 100644 diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py old mode 100755 new mode 100644 diff --git a/teleforma/static/teleforma/images/1pixelout-player-colour-scheme.png b/teleforma/static/teleforma/images/1pixelout-player-colour-scheme.png old mode 100755 new mode 100644 diff --git a/teleforma/static/teleforma/js/application.js b/teleforma/static/teleforma/js/application.js index fddb5a89..a43febbd 100644 --- a/teleforma/static/teleforma/js/application.js +++ b/teleforma/static/teleforma/js/application.js @@ -34,4 +34,14 @@ $(window).ready(function() { var pageHeight = $(window).height(); var navHeight = pageHeight - 125; $('#desk_center').css({"max-height": navHeight + 'px'}); + + $('.autotimer').each(function(){ + var timer = new Timer(); + $timer = $(this); + timer.start({precision: 'seconds', startValues: {seconds: 90}, target: {seconds: 120}}); + $(this).html(timer.getTimeValues().toString()); + timer.addEventListener('secondsUpdated', function (e) { + $(this).html(timer.getTimeValues().toString()); + }); + }); }); diff --git a/teleforma/static/teleforma/js/rainbowvis.js b/teleforma/static/teleforma/js/rainbowvis.js old mode 100755 new mode 100644 diff --git a/teleforma/static/teleforma/swf/1pixeloutplayer.xml b/teleforma/static/teleforma/swf/1pixeloutplayer.xml old mode 100755 new mode 100644 diff --git a/teleforma/static/teleforma/swf/player.swf b/teleforma/static/teleforma/swf/player.swf old mode 100755 new mode 100644 diff --git a/teleforma/templates/teleforma/answer_form.html b/teleforma/templates/teleforma/answer_form.html index 83d474e4..c23f72cc 100644 --- a/teleforma/templates/teleforma/answer_form.html +++ b/teleforma/templates/teleforma/answer_form.html @@ -113,7 +113,11 @@ $(document).ready(function(){
  • {% trans "Answer" %} : 0%
    • - + {% if timer %} +
  • + {% trans "chronometer" %} : {{ timer }} sur {{ seminar.duration }} +
    • + {% endif %} diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html index 060cfad4..be059fad 100644 --- a/teleforma/templates/teleforma/seminar_detail.html +++ b/teleforma/templates/teleforma/seminar_detail.html @@ -237,6 +237,11 @@ $(window).ready(function( ){
  • {% trans "Seminar" %} : {{ seminar_progress }}%
    • + {% if timer %} +
  • + {% trans "chronometer" %} : {{ timer }} sur {{ seminar.duration }} +
    • + {% endif %} diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index eaff17d4..29a28d2e 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -48,6 +48,7 @@ + diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 8804d141..7757736e 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -115,6 +115,20 @@ def get_seminar_delta(user, seminar): class SeminarAccessMixin(object): + def get_context_data(self, **kwargs): + context = super(SeminarAccessMixin, self).get_context_data(**kwargs) + seminar = context.get('seminar') + if not seminar: + seminar = Seminar.objects.get(pk=self.kwargs.get('id', 'pk')) + context['seminar'] = seminar + user = self.request.user + + timer = get_seminar_timer(user, seminar) + delta_sec = get_seminar_delta(user, seminar) + context['delta_sec'] = delta_sec + context['timer'] = str(timer).split('.')[0] + return context + def render_to_response(self, context): seminar = context['seminar'] if not seminar in all_seminars(self.request)['all_seminars']: @@ -175,10 +189,10 @@ class SeminarView(SeminarAccessMixin, DetailView): context['seminar_progress'] = progress context['seminar_validated'] = validated - timer = get_seminar_timer(user, seminar) - delta_sec = get_seminar_delta(user, seminar) - context['delta_sec'] = delta_sec - context['timer'] = str(timer).split('.')[0] + # timer = get_seminar_timer(user, seminar) + # delta_sec = get_seminar_delta(user, seminar) + # context['delta_sec'] = delta_sec + # context['timer'] = str(timer).split('.')[0] if progress == 100 and not validated and self.template_name == 'teleforma/seminar_detail.html': messages.info(self.request, _("You have successfully terminated your e-learning seminar. A training testimonial will be available as soon as the pedagogical team validate all your answers (48h maximum).")) @@ -288,9 +302,9 @@ class SeminarMediaView(SeminarAccessMixin, SeminarRevisionMixin, MediaView): def get_context_data(self, **kwargs): context = super(SeminarMediaView, self).get_context_data(**kwargs) user = self.request.user - seminar = Seminar.objects.get(pk=self.kwargs['id']) - context['seminar'] = seminar - context['seminar_progress'] = seminar_progress(user, seminar) + # seminar = Seminar.objects.get(pk=self.kwargs['id']) + # context['seminar'] = seminar + context['seminar_progress'] = seminar_progress(user, context['seminar']) # set_revision(user, seminar) return context @@ -301,13 +315,13 @@ class SeminarMediaView(SeminarAccessMixin, SeminarRevisionMixin, MediaView): class SeminarDocumentView(SeminarAccessMixin, DocumentReadView): - def get_context_data(self, **kwargs): - context = super(SeminarDocumentView, self).get_context_data(**kwargs) - user = self.request.user - seminar = Seminar.objects.get(pk=self.kwargs['id']) - context['seminar'] = seminar - # set_revision(user, seminar) - return context + # def get_context_data(self, **kwargs): + # context = super(SeminarDocumentView, self).get_context_data(**kwargs) + # user = self.request.user + # # seminar = Seminar.objects.get(pk=self.kwargs['id']) + # # context['seminar'] = seminar + # # set_revision(user, seminar) + # return context @method_decorator(login_required) def dispatch(self, *args, **kwargs): @@ -316,13 +330,13 @@ class SeminarDocumentView(SeminarAccessMixin, DocumentReadView): class SeminarDocumentDownloadView(SeminarAccessMixin, DocumentDownloadView): - def get_context_data(self, **kwargs): - context = super(SeminarDocumentDownloadView, self).get_context_data(**kwargs) - user = self.request.user - seminar = Seminar.objects.get(pk=self.kwargs['id']) - context['seminar'] = seminar - # set_revision(user, seminar) - return context + # def get_context_data(self, **kwargs): + # context = super(SeminarDocumentDownloadView, self).get_context_data(**kwargs) + # user = self.request.user + # # seminar = Seminar.objects.get(pk=self.kwargs['id']) + # # context['seminar'] = seminar + # # set_revision(user, seminar) + # return context @method_decorator(login_required) def dispatch(self, *args, **kwargs): diff --git a/tools/dev/fix_svn_authors.sh b/tools/dev/fix_svn_authors.sh old mode 100755 new mode 100644 diff --git a/tools/dev/make_doc.sh b/tools/dev/make_doc.sh old mode 100755 new mode 100644 diff --git a/tools/dev/merge_master_all.sh b/tools/dev/merge_master_all.sh old mode 100755 new mode 100644 diff --git a/tools/dev/merge_master_to.sh b/tools/dev/merge_master_to.sh old mode 100755 new mode 100644 diff --git a/tools/dev/push.sh b/tools/dev/push.sh old mode 100755 new mode 100644 diff --git a/tools/dev/pypi.sh b/tools/dev/pypi.sh old mode 100755 new mode 100644 diff --git a/tools/dev/translate.sh b/tools/dev/translate.sh old mode 100755 new mode 100644 diff --git a/tools/trans/transcode.py b/tools/trans/transcode.py old mode 100755 new mode 100644