Conjunto 59e991d en sapic

Fecha y hora:

25/09/2017 15:52:36 (hace 7 años)

Autor:

Erwin Paredes <eparedes@…>

Branches:

gestion_usuarios, taller_django

Children:

af91b4e

Parents:

371f822

Mensaje:

curso django

Ubicación:

curso_django

Ficheros:

• curso/encuesta/templates/encuesta/index.html (modificado) (1 diferencia)
• curso/encuesta/urls.py (modificado) (2 diferencias)
• curso/encuesta/views.py (modificado) (2 diferencias)
• curso/templates/encuesta/question_detail.html (añadido)
• curso/templates/encuesta/question_list.html (añadido)
• curso_django.pdf (modificado) (anterior)
• curso_django.tex (modificado) (4 diferencias)

curso_django/curso/encuesta/templates/encuesta/index.html

@@ -79 +79 @@
         {% endif %}
         {% block contenido %}
+        
           <div class="post-preview">
             <a href="#">

curso_django/curso/encuesta/urls.py

@@ -1 +1 @@
 from django.conf.urls import url
-
+from encuesta.views import QuestionListView,QuestionDetailView
 from . import views
 
@@ -13 +13 @@
     url(r'^(?P<question_id>[0-9]+)/vote/$', views.vote, name='vote'),
     url(r'^addencuesta/$', views.addencuesta, name='addencuesta'),
+    url(r'^preguntas-list/$',QuestionListView.as_view(),name='preguntas-list'),
+    url(r'^preguntas-detail/(?P<pk>[-\w]+)/$',QuestionDetailView.as_view(), name='preguntas-detail'),
 ]

curso_django/curso/encuesta/views.py

@@ -8 +8 @@
 from encuesta.models import Question
 from encuesta.forms import QuestionForm
+from django.views.generic.list import ListView
+from django.views.generic.detail import DetailView
+from django.utils import timezone
+
 
 def index(request):
@@ -43 +47 @@
         formset = QuestionFormSet()
     return render(request, 'encuesta/addencuesta.html',{'formset':formset})
+
+
+class QuestionListView(ListView):
+    model = Question
+    
+    def get_context_data(self, **kwargs):
+        context = super(QuestionListView,self).get_context_data(**kwargs)
+#        context['now'] = timezone.now()
+        return context
+
+
+class QuestionDetailView(DetailView):
+
+    model = Question
+
+    def get_context_data(self, **kwargs):
+        context = super(QuestionDetailView, self).get_context_data(**kwargs)
+        context['now'] = timezone.now()
+        return context
+

curso_django/curso_django.tex

@@ -842 +842 @@
 from django.views.generic.list import ListView
 from django.utils import timezone
-
-from articles.models import Article
-
-class ArticleListView(ListView):
-
-    model = Article
-
+from articles.models import Question
+
+
+class QuestionListView(ListView):
+    model = Question
+    
     def get_context_data(self, **kwargs):
-        context = super(ArticleListView, 
-                        self).get_context_data(**kwargs)
-        context['now'] = timezone.now()
+        context = super(QuestionListView,self)
+                     .get_context_data(**kwargs)
         return context
+
 
 \end{verbatim}
@@ -863 +862 @@
 # En el archivo urls.py
 from django.conf.urls import url
-
-from article.views import ArticleListView
+from encuesta.views import QuestionListView
 
 urlpatterns = [
- url(r'^$',ArticleListView.as_view(),name='article-list'),
+  ...
+  url(r'preguntas-list/^$',QuestionListView.as_view(),
+                                        name='preguntas-list'),
 ]
-
-# El template
-<h1>Articles</h1>
+# El template crear un directorio 
+  templates/encuesta/question-list.html
+<h1>Preguntas</h1>
 <ul>
-{% for article in object_list %}
+{% for question in object_list %}
     <li>
-    {{ article.pub_date|date }} - {{ article.headline }}
+    {{ question.pub_date|date }} - {{ question.question_text }}
     </li>
 {% empty %}
-    <li>No articles yet.</li>
+    <li>No hay preguntas.</li>
 {% endfor %}
 </ul>
@@ -893 +893 @@
 from django.utils import timezone
 
-from articles.models import Article
-
-class ArticleDetailView(DetailView):
-
-    model = Article
+from encuesta.models import Question
+
+class QuestionDetailView(DetailView):
+
+    model = Question
 
     def get_context_data(self, **kwargs):
-        context = super(ArticleDetailView, self).
+        context = super(QuestionDetailView, self).
                   get_context_data(**kwargs)
         context['now'] = timezone.now()
@@ -915 +915 @@
 from django.conf.urls import url
 
-from article.views import ArticleDetailView
+from encuesta.views import QuestionDetailView
 
 urlpatterns = [
- url(r'^(?P<slug>[-\w]+)/$',ArticleDetailView.as_view(),
-                            name='article-detail'),
+ url(r'^preguntas-detail/(?P<pk>[-\w]+)/$',QuestionDetailView.as_view(),
+                            name='preguntas-detail'),
 ]