fix delayed courses countdown, some other fixes

remotes/origin/hasaccess
Sanasol 8 years ago
parent 15a58f77a2
commit 7cf0f4fd86
  1. 2
      apps/course/templates/course/course.html
  2. 4
      project/templates/lilcity/edit_index.html
  3. 2
      web/src/js/modules/courses.js
  4. 54
      web/src/js/modules/mixpanel.js

@ -174,7 +174,7 @@
{% if course.is_deferred_start %} {% if course.is_deferred_start %}
<div class="video__soon"> <div class="video__soon">
<div class="video__title">Курс начнется:</div> <div class="video__title">Курс начнется:</div>
<div class="video__time">{{ course.deferred_start_at_humanize }}</div> <div class="video__time" data-future>{{ course.deferred_start_at_humanize }}</div>
</div> </div>
{% else %} {% else %}
{% comment %} <svg class="icon icon-play"> {% comment %} <svg class="icon icon-play">

@ -345,6 +345,10 @@
</div> </div>
</div> </div>
<script type="text/javascript" src={% static "app.js" %}></script> <script type="text/javascript" src={% static "app.js" %}></script>
<script>
var schoolDiscount = parseFloat({{ config.SERVICE_DISCOUNT }});
var schoolAmountForDiscount = parseFloat({{ config.SERVICE_DISCOUNT_MIN_AMOUNT }});
</script>
{% block foot %}{% endblock foot %} {% block foot %}{% endblock foot %}
</body> </body>

@ -17,7 +17,9 @@ $(document).ready(function () {
$('div[data-future-course]').each((_, element) => { $('div[data-future-course]').each((_, element) => {
const courseTime = parseInt($(element).attr('data-future-course-time')) + LIL_SERVER_TIME_DIFF; const courseTime = parseInt($(element).attr('data-future-course-time')) + LIL_SERVER_TIME_DIFF;
const relativeTimeString = moment(courseTime, 'X').fromNow(); const relativeTimeString = moment(courseTime, 'X').fromNow();
$(element).find('div.courses__time').text(relativeTimeString); $(element).find('div.courses__time').text(relativeTimeString);
$(element).find('div.video__time').text(relativeTimeString);
}); });
}, 1000); }, 1000);

@ -1,34 +1,36 @@
import $ from 'jquery'; import $ from 'jquery';
$(document).ready(function (e) { $(document).ready(function (e) {
mixpanel.identify(USER_ID); if (typeof mixpanel != 'undefined') {
let body = $('body'), mixpanel.identify(USER_ID);
cource = $('.course'); let body = $('body'),
cource = $('.course');
if (cource.length) { if (cource.length) {
mixpanel.track(
'Open course',
{ 'course_id': COURSE_ID }
);
};
body.on('click', '[data-popup]', function (e) {
let data = $(this).data('popup');
if (data === '.js-popup-buy') {
mixpanel.track( mixpanel.track(
'Open school buy popup' 'Open course',
{ 'course_id': COURSE_ID }
); );
} };
});
body.on('click', '[data-course-buy]', function (e) { body.on('click', '[data-popup]', function (e) {
e.preventDefault(); let data = $(this).data('popup');
let href = $(this).attr('href'); if (data === '.js-popup-buy') {
let t = mixpanel.track( mixpanel.track(
'Click course buy button', 'Open school buy popup'
{ 'course_id': COURSE_ID }, );
function () {
window.location = href;
} }
); });
}); body.on('click', '[data-course-buy]', function (e) {
e.preventDefault();
let href = $(this).attr('href');
let t = mixpanel.track(
'Click course buy button',
{ 'course_id': COURSE_ID },
function () {
window.location = href;
}
);
});
}
}); });

Loading…
Cancel
Save