diff --git a/core/templates/guest.html b/core/templates/guest.html new file mode 100644 index 0000000..48c36e1 --- /dev/null +++ b/core/templates/guest.html @@ -0,0 +1,177 @@ +{% extends 'base.html' %} + +{% block breadcrumbs %} +
+
+
+
+
+ + + +
+
+
+ +
+
+ Todos + {% for category_course in categorys_courses %} + {{category_course.name}} + {% endfor %} +
+
+ +{% endblock %} + + +{% block content %} + + {% for course in courses %} +
+
+

{{course.name}}

+
+ +
+

Course Name: {{course.name}}

+

Begining: {{course.init_date}}

+

End: {{course.end_date}}

+

Professor: {{course.professors.name}}

+

+ Description: + + {{course.content}} + +

+
+
+ {% endfor %} +{% endblock %} + + + +{% comment %} + + + + + +
+ {% if courses|length > 0 %} + {% if request.GET.category == 'all' or none or request.GET.category == '' %} + {% for course in list_courses %} +
+
+
+ +
+
+

Course Name: {{course.name}}

+

Duration (in semesters): 09

+

Coordinator: {{course.professors}}

+

+ Description: + + {{course.description}} + +

+ 'View Course
 +
+
+
+
+
+ {% endfor %} + {% else %} + {% for course in courses_category %} + {% if course.category.name == request.GET.category %} + +
+
+
+ +
+
+

Course Name: {{course.name}}

+

Duration (in semesters): 09

+

Coordinator: {{course.professors}}

+

+ Description: + + {{course.description}} + +

+ View Course
 +
+
+
+
+
+ {% endif %} + {% endfor %} + {% endif %} + {% else %} + No courses found + {% endif %} +
+ +
+
+
+ +
+{% endcomment %} diff --git a/core/templates/index.html b/core/templates/index.html index 4ae76a0..4dc9d79 100644 --- a/core/templates/index.html +++ b/core/templates/index.html @@ -64,7 +64,7 @@ {# #} {#
#}
- + {% trans 'Guest' %}
diff --git a/core/urls.py b/core/urls.py index b6559a7..f702ede 100644 --- a/core/urls.py +++ b/core/urls.py @@ -11,6 +11,7 @@ urlpatterns = [ url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'), url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'), url(r'^getNotifications/$', views.getNotifications, name='getNotifications'), + url(r'^guest/$', views.guest, name='guest'), #Reset Password diff --git a/core/views.py b/core/views.py index 07bfe59..fd5c64a 100644 --- a/core/views.py +++ b/core/views.py @@ -18,7 +18,7 @@ from .forms import RegisterUserForm from .decorators import log_decorator, notification_decorator from users.models import User - +from courses.models import Course, CourseCategory def index(request): context = { @@ -113,3 +113,9 @@ def getNotifications(request): html = render_to_string("notifications.html", context) return HttpResponse(html) + +def guest (request): + context = { + 'courses': Course.objects.filter(public=True) + } + return render(request, 'guest.html', context) \ No newline at end of file diff --git a/courses/migrations/0003_course_public.py b/courses/migrations/0003_course_public.py new file mode 100644 index 0000000..c1d9dbe --- /dev/null +++ b/courses/migrations/0003_course_public.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-19 13:19 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0002_auto_20161018_1842'), + ] + + operations = [ + migrations.AddField( + model_name='course', + name='public', + field=models.BooleanField(default=False, verbose_name='Public'), + preserve_default=False, + ), + ] diff --git a/courses/models.py b/courses/models.py index 76db812..1ff9d6a 100644 --- a/courses/models.py +++ b/courses/models.py @@ -46,6 +46,7 @@ class Course(models.Model): category = models.ForeignKey(CourseCategory, verbose_name = _('Category'), related_name='course_category') professors = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='courses_professors') students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='courses_student') + public = models.BooleanField(_('Public')) class Meta: ordering = ('create_date','name') -- libgit2 0.21.2