From b730c75e29b05b6a3138b7eb63ab296835d7efa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20Ar=C4=B1c=C4=B1?= <mustafa.arici90@gmail.com>
Date: Sun, 13 Feb 2011 08:56:53 +0000
Subject: [PATCH] A better  date selector in query page.

---
 .../mustafa_branch/djagen/collector/views.py  | 26 ++++++++++---
 .../djagen/templates/main/query.html          | 39 +++++++++++--------
 2 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/DJAGEN/branches/mustafa_branch/djagen/collector/views.py b/DJAGEN/branches/mustafa_branch/djagen/collector/views.py
index b3e465a..c0d5caa 100755
--- a/DJAGEN/branches/mustafa_branch/djagen/collector/views.py
+++ b/DJAGEN/branches/mustafa_branch/djagen/collector/views.py
@@ -123,19 +123,33 @@ def query(request):
 
         # Determine if all of them were valid.
         if (form.is_valid()):
+            cdata = form.cleaned_data
+            
 
             ## If Yes:
 
-            q_author_name = request.POST['q_author_name']
-            q_author_surname = request.POST['q_author_surname']
-            q_text = request.POST['q_text']
-            q_date_year = request.POST['q_date_year']
-            q_date_month = request.POST['q_date_month']
-            q_date_day = request.POST['q_date_day']
+            #q_author_name = request.POST.get('q_author_name','')
+            q_author_name = cdata.get('q_author_name','')
+            q_author_surname = cdata.get('q_author_surname','')
+            q_text = cdata.get('q_text','')
+
+            q_date = cdata.get('q_date','')
+            if (q_date != None):
+                
+                q_date_year = str(q_date.year)
+                q_date_month = str(q_date.month)
+                q_date_day = str(q_date.day)
+            else:
+                
+                q_date_year,q_date_month,q_date_day = None,None,None
+                
+            
             # Redirect or call /archive/ view with the existing POST arguments.
             #++ Complex string operations in order to form needed target_url.
             args_part = "?q_author_name=%s&q_author_surname=%s&q_text=%s" % (q_author_name,q_author_surname,q_text)
             date_part = ''
+            
+            
             if (q_date_year):
                 date_part = q_date_year
                 if(q_date_month):
diff --git a/DJAGEN/branches/mustafa_branch/djagen/templates/main/query.html b/DJAGEN/branches/mustafa_branch/djagen/templates/main/query.html
index 3e96059..eeac925 100755
--- a/DJAGEN/branches/mustafa_branch/djagen/templates/main/query.html
+++ b/DJAGEN/branches/mustafa_branch/djagen/templates/main/query.html
@@ -1,29 +1,36 @@
 {% extends "main/base.html" %}
 {% block body %}
-{% comment %}
-<form action="{{ BASE_URL }}/query" method='GET'>
-    <b>Yazar<br> Adı:</b><input type="text" name="q_author_name">
-    ve/veya
-    <b>Soyadı:</b><input type="text" name="q_author_surname"><br>
-    veya<br>
-    <b>Aradığınız Metin:</b><input type="text" name="q_text">
-    <input type="submit" value="Listele">
-</form>
-{% endcomment %}
 
 <form action="{{ BASE_URL }}/query/" method="POST" enctype="multipart/form-data">
+    <table border="0px">
             {% for field in q_form %}
+            <tr>
                 <div class="fieldWrapper">
-                    {% if field.errors %}
-                    <span class="error">{{ field.errors }}</span>
-                    {% endif %}
-                    {{ field.label_tag }}
+                    <td>{{ field.label_tag }}</td>
+                    
+                    <td>
+                        {{ field }}
+                    </td>
                     {% if field.help_text %}
-                    <span class="small">{{ field.help_text }}</span>
+                    <td>
+                    <span class="small">
+                        {{ field.help_text }}
+                    </span>
+                    </td>
                     {% endif %}
-                    {{ field }}
+                        {% if field.errors %}
+                      <td>
+                    <span class="error">
+                        {{ field.errors }}
+                    </span>
+                      </td>
+                        {% endif %}
+                      
+                    
                 </div>
+    </tr>
             {% endfor %}
+    </table>
         <div class="spacer"></div>
         <input type="submit" value="Listele" />
         </form>