From c78ca647e61028a75ed17d732fab6493450b24d4 Mon Sep 17 00:00:00 2001 From: tkupek Date: Sat, 5 Mar 2016 15:02:08 +0100 Subject: [PATCH] added popup when elearning is completed, added handler for multiple settings --- db.sqlite3 | Bin 137216 -> 137216 bytes .../0025_user_completed_message_shown.py | 20 +++++ .../migrations/0026_auto_20160305_1331.py | 25 +++++++ .../migrations/0027_auto_20160305_1333.py | 70 ++++++++++++++++++ .../migrations/0028_auto_20160305_1338.py | 20 +++++ tkupek_elearning/elearning/models.py | 33 ++++++--- .../elearning/static/js/elearning.js | 16 +++- .../elearning/templates/elearning.html | 30 +++++++- tkupek_elearning/elearning/views.py | 13 +++- tkupek_elearning/settings.py | 2 +- 10 files changed, 210 insertions(+), 19 deletions(-) create mode 100644 tkupek_elearning/elearning/migrations/0025_user_completed_message_shown.py create mode 100644 tkupek_elearning/elearning/migrations/0026_auto_20160305_1331.py create mode 100644 tkupek_elearning/elearning/migrations/0027_auto_20160305_1333.py create mode 100644 tkupek_elearning/elearning/migrations/0028_auto_20160305_1338.py diff --git a/db.sqlite3 b/db.sqlite3 index c2c53834cfc130732713e70c3143192ba0c001ad..0a4db407d2a075cae1cb3265592ffaad39d13d50 100644 GIT binary patch delta 5666 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 sw^%>DOY&+@x_eazI( z>^f(bcc8atXs~Z^ zikn-uiq)jM`uw-n`MiFdlG1K0E;|1Tif=w-d8NjBI?K3sck`07IEuq4 z;#oXS7wI#ar@vxcgxE<@Q)i4(II9rejEkX07fr`S!{$04OS=<~8O)>Ai-2?ORf`&} z7CW1AvRTW@@u~LcV^1@^sQ>8SkiAdSC^w&6UG+Em3w=Om=q)-yN9iyX=~)`5$BEOZ zpjb=Wlny82ig(IvHMdJ$-S#EjR*9?I3c9+}PC|Vz6^Og&Z%~*pVlH~zV#iUh=5eZ1 zb&A)jX{>Ukixn%lfBattV<$CsQt)}1MRwRMtTh+9?)Oy{!iC=LsET!uoxhruPv3Pd z^V2~gvQzdO6$}@#8n5H;XvJ$dkBxWASF z4`Llgu?J�^_K~Pw_k|MEaxZm{o?e9x&$3NE>RD)^wy5CnL9i%L?gwENR1OY4wz} zNJ>iy9X=N4v-_Q*{?tXR@vB~()38PGumzJLd@eFp;{tBQ0&c=NtVIPrzyQkddzkng zt_8!JIDtFqb9|jH;1ycH44vcFp>hM0cn*sN)dv*SbrD6Z%$B)Jzrd+PaSAFK(xdcS%gi}UNrEq-d|il^&BM&Hx^9uvRI65-;nRQeW3S$kMQQ<-l6}W z)$?6*OZmX*W`1*JkUzXV#OF^}Rp&SL_YPiOb6?NUH}2{gie{`>&Dze6j+)N3*WJ*0 zb?o3-Jrwk4+coidk?j&E`H0AVFRmez%Hl`6_{72z^HNOS`tfIatgWz^&n&Fc*S8gd!bvfw`0+w{O~{}T4Kw1V zei=kB(TM2708NjSvK@A*$>ud25gd~AF72UJY+mf1V*XoOeOgH~YiEpq^2GA#l55x} z%r8%|cqKGkEV7?{3LWtIUg%(~$^FMT#KyckSW`KEjsxOi{TM&Mcj+B^gI=Xy(jgJ| zYm_jv9?=GGn9PiFyf7P;6M}dY)YzY6~zE zYK36LJ)-Hp=@%bjt966nZ4GaW#K)n>(d`>svxY@q*v-t);wmBKK`}%Zw1Kh6lWcu> qM7aH8+$~0_7!A|nfAv3I)1iIr;lPBKypzJyAM=uD+7l6P$$tS44#2no diff --git a/tkupek_elearning/elearning/migrations/0025_user_completed_message_shown.py b/tkupek_elearning/elearning/migrations/0025_user_completed_message_shown.py new file mode 100644 index 0000000..a572c60 --- /dev/null +++ b/tkupek_elearning/elearning/migrations/0025_user_completed_message_shown.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-03-05 12:48 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('elearning', '0024_auto_20160305_1222'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='completed_message_shown', + field=models.BooleanField(default=False), + ), + ] diff --git a/tkupek_elearning/elearning/migrations/0026_auto_20160305_1331.py b/tkupek_elearning/elearning/migrations/0026_auto_20160305_1331.py new file mode 100644 index 0000000..2b7c44e --- /dev/null +++ b/tkupek_elearning/elearning/migrations/0026_auto_20160305_1331.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-03-05 13:31 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('elearning', '0025_user_completed_message_shown'), + ] + + operations = [ + migrations.AddField( + model_name='setting', + name='popup_completed_message', + field=models.TextField(null=True), + ), + migrations.AddField( + model_name='setting', + name='popup_completed_title', + field=models.CharField(max_length=100, null=True), + ), + ] diff --git a/tkupek_elearning/elearning/migrations/0027_auto_20160305_1333.py b/tkupek_elearning/elearning/migrations/0027_auto_20160305_1333.py new file mode 100644 index 0000000..d56f81b --- /dev/null +++ b/tkupek_elearning/elearning/migrations/0027_auto_20160305_1333.py @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-03-05 13:33 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('elearning', '0026_auto_20160305_1331'), + ] + + operations = [ + migrations.AddField( + model_name='setting', + name='popup_leave_message', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='setting', + name='footer', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='setting', + name='logo', + field=models.CharField(blank=True, max_length=256), + ), + migrations.AlterField( + model_name='setting', + name='message_access_denied', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='setting', + name='message_already_answered', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='setting', + name='message_welcome_user', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='setting', + name='popup_completed_message', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='setting', + name='popup_completed_title', + field=models.CharField(blank=True, max_length=100, null=True), + ), + migrations.AlterField( + model_name='setting', + name='text_answer', + field=models.CharField(blank=True, max_length=100, null=True), + ), + migrations.AlterField( + model_name='setting', + name='text_next', + field=models.CharField(blank=True, max_length=100, null=True), + ), + migrations.AlterField( + model_name='setting', + name='text_solution', + field=models.CharField(blank=True, max_length=100, null=True), + ), + ] diff --git a/tkupek_elearning/elearning/migrations/0028_auto_20160305_1338.py b/tkupek_elearning/elearning/migrations/0028_auto_20160305_1338.py new file mode 100644 index 0000000..ddd36d6 --- /dev/null +++ b/tkupek_elearning/elearning/migrations/0028_auto_20160305_1338.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-03-05 13:38 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('elearning', '0027_auto_20160305_1333'), + ] + + operations = [ + migrations.AlterField( + model_name='setting', + name='active', + field=models.BooleanField(default=False), + ), + ] diff --git a/tkupek_elearning/elearning/models.py b/tkupek_elearning/elearning/models.py index 4e4f6f3..45855a0 100644 --- a/tkupek_elearning/elearning/models.py +++ b/tkupek_elearning/elearning/models.py @@ -13,20 +13,34 @@ def gen_token(): class Setting(models.Model): title = models.CharField(max_length=100, null=True) - footer = models.TextField(null=True) - message_welcome_user = models.TextField(null=True) - message_access_denied = models.TextField(null=True) - message_already_answered = models.TextField(null=True) - text_answer = models.CharField(max_length=100, null=True) - text_solution = models.CharField(max_length=100, null=True) - text_next = models.CharField(max_length=100, null=True) - logo = models.CharField(max_length=256, null=False) - active = models.BooleanField(unique=True, default=False) + footer = models.TextField(null=True, blank=True) + message_welcome_user = models.TextField(null=True, blank=True) + message_access_denied = models.TextField(null=True, blank=True) + message_already_answered = models.TextField(null=True, blank=True) + text_answer = models.CharField(max_length=100, null=True, blank=True) + text_solution = models.CharField(max_length=100, null=True, blank=True) + text_next = models.CharField(max_length=100, null=True, blank=True) + popup_completed_title = models.CharField(max_length=100, null=True, blank=True) + popup_completed_message = models.TextField(null=True, blank=True) + popup_leave_message = models.TextField(null=True, blank=True) + logo = models.CharField(max_length=256, null=False, blank=True) + active = models.BooleanField(default=False) statistic_token = models.CharField(max_length=40, null=True, default=gen_token, unique=True) def __unicode__(self): return self.title + def save(self, *args, **kwargs): + if self.active: + try: + temp = Setting.objects.get(active=True) + if self != temp: + temp.active = False + temp.save() + except Setting.DoesNotExist: + pass + super(Setting, self).save(*args, **kwargs) + class Question(models.Model): id = models.AutoField(primary_key=True) @@ -52,6 +66,7 @@ class User(models.Model): token = models.CharField(max_length=40, null=True, default=gen_token, unique=True) name = models.CharField(max_length=100, null=False) last_seen = models.DateTimeField(null=True, blank=True) + completed_message_shown = models.BooleanField(null=False, default=False) def __unicode__(self): return self.name diff --git a/tkupek_elearning/elearning/static/js/elearning.js b/tkupek_elearning/elearning/static/js/elearning.js index 1d92732..346dabe 100644 --- a/tkupek_elearning/elearning/static/js/elearning.js +++ b/tkupek_elearning/elearning/static/js/elearning.js @@ -22,6 +22,10 @@ var QueryString = function () { }(); window.onload = init(); +//window.onbeforeunload = function() { + //var message = document.getElementById("popup-leave-message").innerHTML; + //return message; + //} function init() { enable_disable_question(); @@ -45,7 +49,6 @@ function enable_disable_question() { } } - function toggle_solution(id) { var element = document.getElementById("explanation_" + id); @@ -137,8 +140,13 @@ function getCheckboxAnswers(id) { function parseResponse(id, responseText) { - var correctOptions = JSON.parse(responseText).options_id; - var progress = JSON.parse(responseText).progress; + var parse = JSON.parse(responseText); + var correctOptions = parse.options_id; + var progress = parse.progress; + + if(parse.show_completed) { + $('#completed-modal').modal('show'); + } setCorrectOptions(correctOptions, id) setProgress(progress) @@ -176,6 +184,7 @@ function setCorrectOptions(correctOptions, id) { function setProgress(progress) { progressbar = document.getElementById("progressbar"); progressbar.style.width = progress + "%"; + progressbar.innerHTML = progress + "%"; } function ajaxRequest() { @@ -196,4 +205,3 @@ function ajaxRequest() { else return false } - diff --git a/tkupek_elearning/elearning/templates/elearning.html b/tkupek_elearning/elearning/templates/elearning.html index 7ca0743..4b2d4b4 100644 --- a/tkupek_elearning/elearning/templates/elearning.html +++ b/tkupek_elearning/elearning/templates/elearning.html @@ -11,22 +11,50 @@ {{ settings.title }} + + + + + + + + + +
- + {% if settings.logo %} + + {% endif %}

{{ settings.title }}

{{ settings.message_welcome_user|safe }}

+ {{ progress }}%
diff --git a/tkupek_elearning/elearning/views.py b/tkupek_elearning/elearning/views.py index f1ad9b9..4e381ad 100644 --- a/tkupek_elearning/elearning/views.py +++ b/tkupek_elearning/elearning/views.py @@ -14,8 +14,7 @@ from tkupek_elearning.elearning.models import Setting, Question, Option, UserAns def get_progress(user): progress_max = Question.objects.all().count() progress_current = UserAnswer.objects.filter(user=user.id).count() - progress = str(int(progress_current / progress_max * 100)) - return progress + return int(progress_current / progress_max * 100) def start(request): @@ -84,7 +83,6 @@ def get_answer(request): options_id = [] for option in correct_options: options_id.append(option.id) - options_id = json.dumps(options_id) user_answer = get_user_answer(question, user) @@ -111,7 +109,14 @@ def get_answer(request): user_answer_options.option = Option.objects.get(id=option) user_answer_options.save() - holder = {'options_id': options_id, 'progress': get_progress(user)} + progress = get_progress(user) + show_completed = False + if progress is 100 and user.completed_message_shown is False: + show_completed = True + user.completed_message_shown = True + user.save() + + holder = {'options_id': options_id, 'progress': str(progress), 'show_completed': show_completed} holder = json.dumps(holder) return HttpResponse(holder) diff --git a/tkupek_elearning/settings.py b/tkupek_elearning/settings.py index 381b514..5b3dca0 100644 --- a/tkupek_elearning/settings.py +++ b/tkupek_elearning/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = '_*hrxgzo(8hkrp5f8n4j9vo15acsy0b88yiy$6d5ezwi&pns(j' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["127.0.0.1", "localhost"] # Application definition