From a6589b9e844dc9a409e0d1e6a7c5af38ca1bd510 Mon Sep 17 00:00:00 2001
From: tkupek <mail@tkupek.eu>
Date: Tue, 9 Feb 2016 21:46:52 +0100
Subject: [PATCH] small improvement to admin panel (userAnswer is now in user)

---
 db.sqlite3                           | Bin 70656 -> 70656 bytes
 tkupek_elearning/elearning/admin.py  |  13 +++++++++++--
 tkupek_elearning/elearning/models.py |   6 +++---
 tkupek_elearning/elearning/views.py  |   4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/db.sqlite3 b/db.sqlite3
index 20ea58516864e20b63204d3869b8ae5bc9149869..ff2ac8a938b98f5fb56ecfbaea73cbf36150970d 100644
GIT binary patch
delta 818
zcmZuuTS!zv7@nDb&TSX3>t0$VBMCKJn?1XG_9CGY;;T<VS)5L}EgQC)7lI&jv*&W1
z3VbaHUnF#2B7@vr@S#F{lAsW=3mQU17owz^U3=*Q^Zow}^Znlp-#0!($7kqdZPhG7
zs7oLsP$n>uX$j!jxl{KP&oU*O&;m(VfN3}aEAWo|B+KOfTslK2I8Zdx>9UDlk36*y
z!c(~#ugyu|5bir?r4j??`D9|q8c7bMhF#TrIJO_dS9!0!k-`jeXF46(X?x;YjZM5M
z!zzMr@DaA*4XnXxwu<KAph7XmgxF+?HB2;_su)wX)IcdUB1=@&urz;DZm}_h7<xq<
zWR+JgdNVyTq}fsKTWrEQ@4xQhsl~x^-*Lqq3gL;%Bi8BuxcIPGI8?g!<=XkDoR>ei
z(amp<HS-ram%TaN(W|(v5Kdp@Yk9A8bT~d_Ci~1tD4++<^jYR;DtTclSI5<fa^6sI
z{-3}*3VZp(yrV*l?r%=loKW1|LNZ#El*5+A&KmqjKE}&$d3aC3rS8%yPx8US<eg3W
z+o3fC-{CcU7XG}4E#c4;uuC8evQf~m#<!l<R?4tmWPO1T!pXO=E?CbXxXUV4je?5R
zVo{1kE*7bnx(rJQz6#|HcrJoo5|i@~Q*9Eez}O%})+AIWQczV1Rbkcdr*=g`ZmfpQ
zh#3`e6p5-K0udWc^=I*lqH^VBle0~zhXo9Qpg=(2fRKL#Q+2djAyEX6VGItF9kM_!
zk?35yfm~^KNvOW9Gu|J!hEmB?f-yfct<jMIQ)hmI=`1QXLA`kJG2O?a`*aoy>ajqu
uH5|~xVWZvow}2S=M?eVuA;4m~(aJ&$j9?_Yu+b&m#Vb^NGfTI38h-)iM$i@j

delta 610
zcmXw#O=wd=5XX0S_I>0fnitdbmHKfg6q6WfK1>>wLQ!gsC$B}}^~J>SL=&4BJP4&v
zdhll36`^?R!Nz0EF@kB*gCJ;y9(qu0g+MFD4^Tuc=q9m;-^_oRng0$mQ=&5^I(N{u
zj1U^*#5wyo$@xG8FPA4DOMOiWcOd{KRACX$!Ww)ee@PSEWvf9%m_SGRdf1wxfqcNt
zuzdoT*d_Z>%|l=ar>+^<OisUHX7a`@GnXy&R2J=-S+)HGg>?i!p#|?@z2c&)5U|Mt
z!q`PgDCCgZQUfxq$Muu4*nT+)iAjQhY+Qw&J`e+nA0a<_N1SAxskMHvg6CMI=EbMk
z<=Q>l(72>Uqj(mxR_!>Otjp|5&BIy^g*695%2Y93Xm6BAvC+W+w!5ORFZWgUaN5Up
zFUzeQw)?Cz=OxXEV(SjutoQqig>+swQ+hO<jt8$slX@|0PNlD>jeOS3X7qO1$QEv=
z^I>Mx!}4AmdsL6P5-C18;In!Yk~YpAN7{~}VI+e_YN2uJzha{eud>&wUSKyHbE?ug
z)fR$Z@C|lgi=XNZ9Fr)<m{7T!LF#5AiWJ*05xPS=2>!s2iu&Re%wKe}&DWH*UTO{s
z+X#NcclZq3+-(DRMR3aka7U>V#ZD9|_^ae#(p#@*m@g6IL^&ro5l)!TK7)lrbiY8V
b2%f_<jF4SYEn81WrTSq^SX!k^pS=G7SQV@#

diff --git a/tkupek_elearning/elearning/admin.py b/tkupek_elearning/elearning/admin.py
index 0c57a08..5d349c4 100644
--- a/tkupek_elearning/elearning/admin.py
+++ b/tkupek_elearning/elearning/admin.py
@@ -12,7 +12,16 @@ class QuestionAdmin(admin.ModelAdmin):
         OptionInline,
     ]
 
+
+class UserAnswerInline(admin.TabularInline):
+    model = UserAnswer
+
+
+class UserAdmin(admin.ModelAdmin):
+    inlines = [
+        UserAnswerInline,
+    ]
+
 admin.site.register(Question, QuestionAdmin)
 admin.site.register(Setting),
-admin.site.register(UserAnswer),
-admin.site.register(User)
+admin.site.register(User, UserAdmin)
diff --git a/tkupek_elearning/elearning/models.py b/tkupek_elearning/elearning/models.py
index d1e55c4..42bf6fe 100644
--- a/tkupek_elearning/elearning/models.py
+++ b/tkupek_elearning/elearning/models.py
@@ -46,11 +46,11 @@ class User(models.Model):
 
 class UserAnswer(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE, null=False)
-    questionId = models.ForeignKey(Question, on_delete=models.CASCADE, null=False)
+    question = models.ForeignKey(Question, on_delete=models.CASCADE, null=False)
     answers = models.CharField(max_length=100, null=True)
 
     def __str__(self):
-        return str(self.user) + " - " + str(self.questionId)
+        return str(self.user) + " - " + str(self.question)
 
     class Meta:
-        unique_together = (('user', 'questionId'),)
\ No newline at end of file
+        unique_together = (('user', 'question'),)
\ No newline at end of file
diff --git a/tkupek_elearning/elearning/views.py b/tkupek_elearning/elearning/views.py
index 9ef3d06..dc452e8 100644
--- a/tkupek_elearning/elearning/views.py
+++ b/tkupek_elearning/elearning/views.py
@@ -31,13 +31,13 @@ def get_answer(request):
         user = User.objects.get(token=request_token)
 
         try:
-            user_answer = UserAnswer.objects.get(questionId=question.id, user=user.id)
+            user_answer = UserAnswer.objects.get(question=question.id, user=user.id)
         except ObjectDoesNotExist:
             user_answer = None
 
         if user_answer is None:
             user_answer = UserAnswer()
-            user_answer.questionId = question
+            user_answer.question = question
             user_answer.user = user
             user_answer.answers = request_answers
             user_answer.save()