#4 메인페이지 관심학과 추천코멘트 띄우기

sparcs-kaist · May 27, 2016 · 837d238 · 837d238
1 parent 77037dd
commit 837d238
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/apps/review/management/commands/cron.py b/apps/review/management/commands/cron.py
@@ -3,12 +3,15 @@
 from datetime import datetime, timedelta, time, date
 from django.utils import timezone
 from django.db.models import Q
+from apps.subject.models import Department
 class Command(BaseCommand):
     help = 'BestComment Changer'
     def handle(self, *args, **options):
         print "BestComment changing start!"
         last_date = timezone.now()
-        first_date = timezone.now() - timedelta(hours = 2 )
+        first_date = timezone.now() - timedelta(days = 1 )
+        last_date_all = timezone.now()
+        first_date_all = timezone.now() - timedelta(days = 600)
         Comment_latest = Comment.objects.filter(written_datetime__range=(first_date, last_date))
         Comment_liberal = list(Comment_latest.filter(Q(course__department__code="HSS")))
         Comment_major = list(Comment_latest.filter(~Q(course__department__code="HSS")))
@@ -24,7 +27,7 @@ def cmp1(a,b):
 
 
         try :
-            bComment_liberal=list(LiberalBestComment.objects.all())
+            bComment_liberal=list(LiberalBestComment.objects.filter(written_datetime__range=(first_date_all, last_date_all)))
         except:
             bComment_liberal=[]
 
@@ -41,7 +44,7 @@ def cmp1(a,b):
 
 
         try :
-            bComment_major=list(MajorBestComment.objects.all())
+            bComment_major=list(MajorBestComment.objects.filter(written_datetime__range=(first_date_all, last_date_all)))
         except:
             bComment_major=[]
 
@@ -50,11 +53,16 @@ def cmp1(a,b):
         bComment_major.sort(cmp1)
         mbcl = MajorBestComment.objects.all()
         mbcl.delete()
-        for i in range(50):
-            try :
-                bComment_major[i].save()
-            except:
-                continue
+        for department in Department.objects.all():
+            comment_d = []
+            for i in range(len(bComment_major)):
+                if bComment_major[i].comment.course.department.code == department.code:
+                    comment_d.append(bComment_major[i])
+                for i in range(15):
+                    try :
+                        comment_d[i].save()
+                    except:
+                        continue
 
 
         print "BestComment was changed"
diff --git a/apps/review/views.py b/apps/review/views.py
@@ -75,12 +75,14 @@ def search_view(request):
     auto_source = [i.title for i in course_source] + [i.title_en for i in course_source] + [i.professor_name for i in professor_source] + [i.professor_name_en for i in professor_source]
     auto_source = ','.join(auto_source)
 
+
+    comment_liberal = list(LiberalBestComment.objects.all())
     if request.user.is_authenticated():
         user = request.user
         user_profile = UserProfile.objects.get(user=user)
-
-    comment_liberal = list(LiberalBestComment.objects.all())
-    comment_major = list(MajorBestComment.objects.all())
+        comment_major = list(MajorBestComment.objects.filter(comment__course__department = user_profile.favorite_departments.all()))
+    else:
+        comment_major = list(MajorBestComment.objects.all())
 
     liberal_comment = []
     major_comment = []

diff --git a/apps/session/views.py b/apps/session/views.py
@@ -15,12 +15,12 @@
 import subprocess
 
 # TESTING #
-#sso_client = Client(is_test=True)
+sso_client = Client(is_test=True)
 
 # PRODUCTION #
-sso_client = Client(is_test=False,
-                     app_name='otlplus',
-                     secret_key=settings.SSO_KEY)
+#sso_client = Client(is_test=False,
+#                     app_name='otlplus',
+#                     secret_key=settings.SSO_KEY)
 
 
 def home(request):
@@ -116,7 +116,7 @@ def settings(request):
             dpt = Department.objects.get(id=dpt_id)
             user_profile.favorite_departments.add(dpt)
         for dpt in user_profile.favorite_departments.all():
-            favorite_departments.append(dpt.id)
+            favorite_departments.append(dpt)
             if str(dpt.id) not in request.POST.getlist('fav_department', []):
                user_profile.favorite_departments.remove(dpt)
 

diff --git a/otlplus/settings.py b/otlplus/settings.py
@@ -28,7 +28,7 @@
         SSO_KEY = f.read().strip()
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ['*']
 

diff --git a/templates/session/settings.html b/templates/session/settings.html
@@ -49,7 +49,7 @@ <h3>관심 학과 </h3>
         <div id="favorites">
             {% for dpt in department %}
             <div class="col-xs-12 col-lg-8">
-                <input type="checkbox" style="display:inline-block"name="fav_department" value="{{ dpt.id }}" {% if dpt.id in fav_department %} checked {% endif %}>
+                <input type="checkbox" style="display:inline-block"name="fav_department" value="{{ dpt.id }}" {% if dpt in fav_department %} checked {% endif %}>
                 <p style="display:inline-block;margin:1px">{{ dpt.name }} </p>
             </div>
             {% endfor %}