Fix access rights, prepare finer seminar timer display

diff --git a/example/manage.py b/example/manage.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py
old mode 100755 (executable)
new mode 100644 (file)

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 (executable)
new mode 100644 (file)

diff --git a/teleforma/static/teleforma/js/application.js b/teleforma/static/teleforma/js/application.js
index fddb5a89b2c9e24327119e2701cbb969eb75b64f..a43febbd8d4e1a3d6d5b327baba8d9d1ba7a5597 100644 (file)
--- 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 (executable)
new mode 100644 (file)

diff --git a/teleforma/static/teleforma/swf/1pixeloutplayer.xml b/teleforma/static/teleforma/swf/1pixeloutplayer.xml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/teleforma/static/teleforma/swf/player.swf b/teleforma/static/teleforma/swf/player.swf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/teleforma/templates/teleforma/answer_form.html b/teleforma/templates/teleforma/answer_form.html
index 83d474e44a4188dd91d4219660b3c7edd185e0fd..c23f72cc950997f544872d2d3dd8073a14db434e 100644 (file)
--- a/teleforma/templates/teleforma/answer_form.html
+++ b/teleforma/templates/teleforma/answer_form.html
@@ -113,7 +113,11 @@ $(document).ready(function(){
     <li>{% trans "Answer" %} : <span id="answer-progress">0</span>%
      <div id="progressbar-answer"></div>
     </li>
-
+    {% if timer %}
+    <li>
+      {% trans "chronometer" %} : <span class="autotimer">{{ timer }}</span> sur {{ seminar.duration }}
+    </li>
+    {% endif %}
   </ul>
 
  </div>

diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html
index 060cfad482d8068e5f92f38cb0c195f8be6f5849..be059fad2e79cce5227d3d99d83d7b70f038463c 100644 (file)
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -237,6 +237,11 @@ $(window).ready(function( ){
     <li>{% trans "Seminar" %} : {{ seminar_progress }}%
      <div id="progressbar-seminar"></div>
     </li>
+    {% if timer %}
+    <li>
+      {% trans "chronometer" %} : <span class="autotimer">{{ timer }}</span> sur {{ seminar.duration }}
+    </li>
+    {% endif %}
   </ul>
  </div>
 </div>

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index eaff17d4c89f886d2de297eb2e18720fef34d080..29a28d2ef1261d618fa02ebc2bad217ed496b5cf 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -48,6 +48,7 @@
 <script src="{{ STATIC_URL }}teleforma/js/messi.min.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}teleforma/js/rainbowvis.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}jqchat/jqchat.js" type="text/javascript" ></script>
+<script src="{{ STATIC_URL }}teleforma/easytimer.min.js" type="text/javascript" ></script>
 <script src="{{ STATIC_URL }}telemeta/js/locale.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}telemeta/js/application.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}teleforma/js/application.js" type="text/javascript"></script>

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index 8804d141212b76c46f8c9a77a5220800d6250dbc..7757736eb5e7a794e366c237720ba99e6897864f 100644 (file)
--- 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 (executable)
new mode 100644 (file)

diff --git a/tools/dev/make_doc.sh b/tools/dev/make_doc.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/tools/dev/merge_master_all.sh b/tools/dev/merge_master_all.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/tools/dev/merge_master_to.sh b/tools/dev/merge_master_to.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/tools/dev/push.sh b/tools/dev/push.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/tools/dev/pypi.sh b/tools/dev/pypi.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/tools/dev/translate.sh b/tools/dev/translate.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/tools/trans/transcode.py b/tools/trans/transcode.py
old mode 100755 (executable)
new mode 100644 (file)