Merge pull request #144 from giuse88/giuseppe-fixes

Giuseppe bug fixes

Author: giuse88

seeVcam/answers/admin.py

@@ -1,3 +1,10 @@
 from django.contrib import admin
+from .models import Answer
+
+
+class AnswerAdmin(admin.ModelAdmin):
+    fields = ('question', 'content', 'rating', 'interview')
+    list_display = ('id',) + fields
+
+admin.site.register(Answer, AnswerAdmin)
 
-# Register your models here.

seeVcam/answers/models.py

@@ -1,8 +1,9 @@
 from django.core.exceptions import ValidationError
+from django.db import models
+
 from common.mixins.model import UpdateCreateTimeStamp
 from interviews.models import Interview
 from questions.models import Question
-from django.db import models
 
 
 def validate_rating(value):
@@ -16,6 +17,10 @@ class Answer(UpdateCreateTimeStamp):
     question = models.ForeignKey(Question, null=False, blank=False, db_column='question_id')
     interview = models.ForeignKey(Interview, null=False, blank=False, db_column='interview_id')
 
+    def __str__(self):
+        return "Question:{0} Content:{1} Rating:{2} Interview:{3}"\
+            .format(self.question, self.content, self.rating, self.interview)
+
     class Meta:
         verbose_name = 'answer'
         verbose_name_plural = 'answers'

seeVcam/authentication/models.py

@@ -93,6 +93,9 @@ class SeevcamUser(AbstractBaseUser, PermissionsMixin):
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['first_name', 'last_name']
 
+    def __str__(self):
+        return self.get_full_name()
+
     class Meta:
         db_table = "users"
         verbose_name = _('user')

seeVcam/company_profile/models.py

@@ -2,9 +2,11 @@
 
 
 class Company(models.Model):
-
     name = models.CharField(max_length=255, null=False, blank=False, db_index=True)
 
+    def __str__(self):
+        return "{0}".format(self.name)
+
     class Meta:
         verbose_name = 'company'
         verbose_name_plural = 'companies'

seeVcam/dashboard/templates/dashboard.html

@@ -50,20 +50,22 @@
 
 <div id="content-wrap">
     <div id="container" class="container">
-      <div class="row logo-loader">
-        <div class="col-md-6 col-md-offset-3">
-          <img alt="seeVcam" src="/static/images/logo-black.png">
-        </div>
-        <span>
-          <div class="spinner">
-            <div class="rect1"></div>
-            <div class="rect2"></div>
-            <div class="rect3"></div>
-            <div class="rect4"></div>
-            <div class="rect5"></div>
-          </div>
-        </span>
-      </div>
+       {% block content %}
+            <div class="row logo-loader">
+                <div class="col-md-6 col-md-offset-3">
+                  <img alt="seeVcam" src="/static/images/logo-black.png">
+                </div>
+            <span>
+              <div class="spinner">
+                <div class="rect1"></div>
+                <div class="rect2"></div>
+                <div class="rect3"></div>
+                <div class="rect4"></div>
+                <div class="rect5"></div>
+              </div>
+            </span>
+           </div>
+       {% endblock content %}
     </div>
 </div>
 

seeVcam/interview_room/views.py

@@ -49,6 +49,7 @@ def get_context_data(self, **kwargs):
                                                   role=Roles.publisher)
         return context
 
+
 # ======================= END TO BE DELETED ========================
 
 
@@ -83,7 +84,7 @@ def is_interview_open(self):
         real_open_time = interview.start - datetime.timedelta(minutes=settings.INTERVIEW_OPEN)
         real_close_time = interview.end + datetime.timedelta(minutes=settings.INTERVIEW_CLOSE)
         opened = now_timezone() >= real_open_time
-        closed = now_timezone() <= real_close_time and interview.status is not Interview.CLOSED
+        closed = now_timezone() <= real_close_time and (interview.status != Interview.CLOSED)
         return opened and closed
 
     def generate_opentok_token(self, session_id):
@@ -99,6 +100,5 @@ def get_role(self):
 
 
 class InterviewerView(LoginRequired, IsOwnerOr404, InterviewRoomView):
-
     def get_role(self):
         return "interviewer"

seeVcam/interviews/admin.py

@@ -1,8 +1,24 @@
 from django.contrib import admin
 from interviews.models import Interview, Candidate, JobPosition
 
-admin.site.register(Interview)
-admin.site.register(Candidate)
-admin.site.register(JobPosition)
+
+class CandidateAdmin(admin.ModelAdmin):
+    fields = ('name', 'surname', 'email', 'cv')
+    list_display = ('id',) + fields
+
+
+class JobPositionAdmin(admin.ModelAdmin):
+    fields = ('position', 'job_description')
+    list_display = ('id',) + fields
+
+
+class InterviewAdmin(admin.ModelAdmin):
+    fields = ('status', 'start', 'end', 'catalogue', 'owner', 'job_position', 'candidate',
+              'session_id', 'token', 'overall_score')
+    list_display = ('id',) + fields
+
+admin.site.register(Interview, InterviewAdmin)
+admin.site.register(Candidate, CandidateAdmin)
+admin.site.register(JobPosition, JobPositionAdmin)
 
 

seeVcam/interviews/models.py

@@ -12,6 +12,9 @@ class Candidate(UpdateCreateTimeStamp, CompanyInfo):
     email = models.EmailField(db_index=True, null=False, blank=False)
     cv = models.OneToOneField(UploadedFile, primary_key=False, null=False, blank=False, unique=True)
 
+    def __str__(self):
+        return "{0} {1} {2}".format(self.name, self.surname, self.email)
+
     class Meta:
         verbose_name = 'candidate'
         verbose_name_plural = 'candidates'
@@ -23,6 +26,9 @@ class JobPosition(UpdateCreateTimeStamp, CompanyInfo):
     position = models.CharField(max_length=255, null=False, blank=False)
     job_description = models.OneToOneField(UploadedFile, null=False, blank=False)
 
+    def __str__(self):
+        return "{0}".format(self.position)
+
     class Meta:
         verbose_name = 'job_position'
         verbose_name_plural = 'job_positions'
@@ -50,7 +56,7 @@ class Interview(UpdateCreateTimeStamp):
     candidate = models.ForeignKey(Candidate, null=False, blank=False)
     session_id = models.CharField(max_length=255, null=False, blank=False, default='UNKNOWN')
     token = models.CharField(max_length=255, null=False, blank=False, default='UNKNOWN')
-    overall_score = models.FloatField(null=True)
+    overall_score = models.FloatField(null=True, blank=True)
 
     @property
     def job_position_name(self):

seeVcam/interviews/rest_views.py

@@ -1,13 +1,17 @@
-import string, random
+import string
+import random
+
 from django.core.mail import send_mail
 from rest_framework import generics
 from opentok import OpenTok
+from django.conf import settings
+from django.db.models import Q
 
+from common.helpers.timezone import now_timezone
 from common.helpers.views_helper import set_company_info
 from interviews.models import Interview, JobPosition
 from interviews.serializers import InterviewSerializer, JobPositionSerializer
 from notes.models import Notes
-from django.conf import settings
 from overall_ratings.models import OverallRatingQuestion, OverallRating
 from questions.models import Question
 from questions.serializers import QuestionSerializer
@@ -31,18 +35,21 @@ def post_save(self, obj, created=False):
             self.send_email_to_user(obj)
 
     def get_queryset(self):
-        return Interview.objects.filter(owner=self.request.user.id).order_by('start')
+        owner = Q(owner=self.request.user.id)
+        interviews = Q(end__gt=now_timezone(), status=Interview.OPEN)
+        reports = Q(status=Interview.CLOSED)
+        return Interview.objects.filter(owner, interviews | reports).order_by('start')
 
-    #TODO this should be in the model done with signals
-    #private
+    # TODO this should be in the model done with signals
+    # private
     @staticmethod
     def create_interview_session():
         # this should be a singleton
         opentok = OpenTok(settings.OPENTOK_API_KEY, settings.OPENTOK_SECRET)
         session = opentok.create_session()
         return session.session_id
 
-    #private
+    # private
     @staticmethod
     def create_authentication_token():
         return ''.join(random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(80))

seeVcam/static/apps/dashboard/boot.js

@@ -45,6 +45,7 @@ require.config({
     "moment"        : "bower_components/moment/moment",
     "notification"  : "lib/components/notification/notification",
     "utils"         : "lib/misc/utils",
+    "redactor"      : "bower_components/redactor/redactor/redactor",
     "nanobar"       : "lib/misc/nanobar",
     "backbone-modal" : "lib/misc/backbone-modal"
   },
@@ -87,7 +88,9 @@ require.config({
     "bootstrap": {
       deps: ["jquery"]
     },
-
+    "redactor" : {
+      deps: ["jquery"]
+    },
     "underscore": {
       deps: [],
       exports: "_"