Merge pull request daldal-Mango#37 from dddooo9/main

날짜체크, 목적 마감 체크
hyeoneedyou · Aug 28, 2021 · 9677580 · 9677580
2 parents 24e6cc3 + 4591ea0
commit 9677580
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/Miracle30/templates/shared/_navbar.html b/Miracle30/templates/shared/_navbar.html
@@ -32,15 +32,15 @@ <h4 class="nav_star">⭐<span id="cash">{{request.user.profile.cash}}</span>별<
           {% for goal in request.user.goal_set.all %}
           {% if goal.category == 'study' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
 
           {% for goal in request.user.members.all %}
           {% if goal.category == 'study' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
@@ -55,15 +55,15 @@ <h4 class="nav_star">⭐<span id="cash">{{request.user.profile.cash}}</span>별<
           {% for goal in request.user.goal_set.all %}
           {% if goal.category == 'hobby' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
 
           {% for goal in request.user.members.all %}
           {% if goal.category == 'hobby' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
@@ -78,15 +78,15 @@ <h4 class="nav_star">⭐<span id="cash">{{request.user.profile.cash}}</span>별<
           {% for goal in request.user.goal_set.all %}
           {% if goal.category == 'etc' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
 
           {% for goal in request.user.members.all %}
           {% if goal.category == 'etc' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}

diff --git a/groups/urls.py b/groups/urls.py
@@ -7,5 +7,6 @@
     path('<int:goal_id>/certify/', views.certify, name="certify"),
     path('group_list/', views.group_list, name="group_list"),
     path('group_detail/', views.group_detail, name="group_detail"),
-    path('make_group/', views.make_group, name="make_group")
+    path('make_group/', views.make_group, name="make_group"),
+    path('<int:goal_id>/date_check', views.date_check, name="date_check"),
 ]
diff --git a/groups/views.py b/groups/views.py
@@ -5,6 +5,13 @@
 import datetime
 from django.utils import timezone
 
+def date_check(request, goal_id):
+    goal = get_object_or_404(Goal, pk=goal_id)
+    today = datetime.date.today()
+    if today < goal.start_date:
+        return redirect('main:goal_detail', goal_id)
+    else:
+        return redirect('groups:main', goal_id)
 
 def main(request, goal_id):
     level = []

diff --git a/main/templates/main/goal_main.html b/main/templates/main/goal_main.html
@@ -9,9 +9,11 @@ <h1 class="title">그룹 참여하기</h1>
   <div class="container">
     <div class="main_container">
       {% for goal in goals %}
+      {% if goal.member_limit > goal.member.count %}
       <div class="main_card">
         <a href="{% url 'main:goal_detail' goal.pk %}" class="a_deco">{{goal.name}}</a>
       </div>
+      {% endif %}
       {% endfor %}
     </div>
     <a href="{% url 'main:add_goal' %}" class="btn1 btn_center a_deco">그룹 만들기</a>

diff --git a/main/views.py b/main/views.py
@@ -1,6 +1,9 @@
 from django.shortcuts import render, redirect
 from django.utils import *
 from .models import Goal
+from datetime import datetime
+import datetime
+
 
 def main_login(request):
     return render(request, 'main/main_login.html')
@@ -11,7 +14,8 @@ def main_logout(request):
 
 
 def goal_main(request):
-    goals = Goal.objects.all()
+    today = datetime.date.today()
+    goals = Goal.objects.filter(deadline__gte=today)    
     return render(request, 'main/goal_main.html', {'goals':goals})
 
 

diff --git a/users/templates/users/mypage.html b/users/templates/users/mypage.html
@@ -18,7 +18,7 @@ <h3>내가 개설한 목표</h3>
         <div class="my_make">
           {% for goal in my_goal %}
           <div class="my_goalItem">
-            <a href="{% url 'groups:main' goal.pk %}" class="a_deco">{{goal.name}}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{goal.name}}</a>
           </div>
           {% endfor %}
         </div>
@@ -28,7 +28,7 @@ <h3>내가 참여한 목표</h3>
         <div class="my_join">
           {% for goal in participate_goal %}
           <div class="my_goalItem">
-            <a href="{% url 'groups:main' goal.pk %}" class="a_deco">{{goal.name}}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{goal.name}}</a>
           </div>
           {% endfor %}
         </div>