From d6f0c2ea2461a827644677d6cd0d857b1ea8c044 Mon Sep 17 00:00:00 2001
From: s1rai <floatraee@gmail.com>
Date: Wed, 12 Aug 2015 10:23:15 +1000
Subject: [PATCH 1/4] Completion of project and client form

---
 formexample/formexample/urls.py             |  1 -
 slides/CLASS.md                             |  2 +-
 timetracker/entries/forms.py                | 25 ++++++++++--
 timetracker/entries/models.py               |  3 +-
 timetracker/entries/templates/clients.html  |  8 +++-
 timetracker/entries/templates/entries.html  |  2 +-
 timetracker/entries/templates/projects.html | 11 +++++-
 timetracker/entries/views.py                | 43 +++++++++++++++++----
 8 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/formexample/formexample/urls.py b/formexample/formexample/urls.py
index 1ac88b3..380c474 100644
--- a/formexample/formexample/urls.py
+++ b/formexample/formexample/urls.py
@@ -18,7 +18,6 @@
 
 import formapp.views
 
-
 urlpatterns = [
     url(r'^$', formapp.views.example, name='html_form'),
     url(r'^django-form/$', formapp.views.django_example, name='django_form'),
diff --git a/slides/CLASS.md b/slides/CLASS.md
index 1713724..d8a3881 100644
--- a/slides/CLASS.md
+++ b/slides/CLASS.md
@@ -176,7 +176,7 @@ class HelloWorldForm(forms.Form):
 - It takes two optional arguments for validation
   - `max_length`
   - `min_length`
-
+  
 ```
 class HelloWorldForm(forms.Form):
     name = forms.CharField(label="Say Hello", required=True)
diff --git a/timetracker/entries/forms.py b/timetracker/entries/forms.py
index 51e18f1..a3714af 100644
--- a/timetracker/entries/forms.py
+++ b/timetracker/entries/forms.py
@@ -1,10 +1,29 @@
 from django import forms
+from django.utils import timezone
 
-from .models import Project
-
+from .models import Project, Client
 
 class EntryForm(forms.Form):
     start = forms.DateTimeField(label="Start Time", help_text="Format: 2006-10-25 14:30")
-    end = forms.DateTimeField(label="End Time", help_text="Format: 2006-10-25 14:30")
+    stop = forms.DateTimeField(label="End Time", help_text="Format: 2006-10-25 14:30")
     project = forms.ModelChoiceField(queryset=Project.objects.all())
     description = forms.CharField()
+
+    def ValidDate(self):
+        start = self.cleaned_data['start']
+        stop = self.cleand_data['end']
+
+        if start > end:
+           raise forms.ValidationError("Start time is greater then stop time")
+           return start
+
+class ClientForm(forms.Form):
+    name = forms.CharField(required=False, label="name")
+
+class ProjectForm(forms.Form):
+    client= forms.ModelChoiceField(queryset=Client.objects.all())
+    name = forms.CharField(required=False, label="name")
+
+
+
+
diff --git a/timetracker/entries/models.py b/timetracker/entries/models.py
index 824b284..5404bab 100644
--- a/timetracker/entries/models.py
+++ b/timetracker/entries/models.py
@@ -4,7 +4,7 @@
 
 class Client(models.Model):
     name = models.CharField(max_length=200)
-
+    
     def __str__(self):
         return self.name
 
@@ -16,7 +16,6 @@ class Project(models.Model):
     def __str__(self):
         return '<{}> {}'.format(self.client, self.name)
 
-
 # Create your models here.
 class Entry(models.Model):
     start = models.DateTimeField(default=timezone.now)
diff --git a/timetracker/entries/templates/clients.html b/timetracker/entries/templates/clients.html
index e8e4209..952a750 100644
--- a/timetracker/entries/templates/clients.html
+++ b/timetracker/entries/templates/clients.html
@@ -4,9 +4,15 @@
 
 {% block content %}
   <h2>Clients</h2>
+    <form method="post"> 
+     {% csrf_token %}
+     {{ client_form.as_p }}
+     <input type="submit" name="client_submit" value="Create Client">
+     </form>
+     
   <ul>
     {% for client in client_list %}
-    <li><a href="{% url 'client-detail' pk=client.pk %}">{{ client.name }}</a></li>
+    <li>{{ client.name }}</li>
     {% endfor %}
   </ul>
 {% endblock %}
diff --git a/timetracker/entries/templates/entries.html b/timetracker/entries/templates/entries.html
index 335f5bb..ee4b763 100644
--- a/timetracker/entries/templates/entries.html
+++ b/timetracker/entries/templates/entries.html
@@ -7,7 +7,7 @@ <h2>Entries</h2>
   <form method="post">
     {% csrf_token %}
     {{ entry_form.as_p }}
-    <input type="submit" name="name" value="Create Entry">
+    <input type="submit" name="project_name" value="Create Entry">
   </form>
 
   <ul>
diff --git a/timetracker/entries/templates/projects.html b/timetracker/entries/templates/projects.html
index 7b32f9b..edf6fc2 100644
--- a/timetracker/entries/templates/projects.html
+++ b/timetracker/entries/templates/projects.html
@@ -4,9 +4,16 @@
 
 {% block content %}
   <h2>Projects</h2>
-  <ul>
+    <form method="post">
+     {% csrf_token %}
+     {{ project_form.as_p }}
+     <input type="submit" name="test" value="Create Project">
+    </form>
+
+  <ul> 
     {% for project in project_list %}
-    <li>{{ project.name }} (<a href="{% url 'client-detail' pk=project.client.pk %}">{{ project.client.name }}</a>)</li>
+    <li>{{ project.name }}</li>
+    <li>{{ project.client}} 
     {% endfor %}
   </ul>
 {% endblock %}
diff --git a/timetracker/entries/views.py b/timetracker/entries/views.py
index 561027e..d07ac48 100644
--- a/timetracker/entries/views.py
+++ b/timetracker/entries/views.py
@@ -1,10 +1,26 @@
 from django.shortcuts import render, get_object_or_404
 
-from .forms import EntryForm
+from .forms import EntryForm, ProjectForm, ClientForm
 from .models import Client, Entry, Project
 
-
 def clients(request):
+    if request.method == 'POST':
+        # Create our form object with our POST data
+        client_form = ClientForm(request.POST)
+        if client_form.is_valid():
+            # If the form is valid, let's create and Entry with the submitted data
+            client = Client()
+            client.name = client_form.cleaned_data['name']
+            client.save()
+    else:
+        client_form = ClientForm(request.POST)
+
+    client_list = Client.objects.all()
+    return render(request, 'clients.html', {
+        'client_list': client_list,
+        'client_form': client_form,
+    })
+
     client_list = Client.objects.all()
     return render(request, 'clients.html', {
         'client_list': client_list,
@@ -17,16 +33,13 @@ def client_detail(request, pk):
         'client': client,
     })
 
-
 def entries(request):
     if request.method == 'POST':
-        # Create our form object with our POST data
         entry_form = EntryForm(request.POST)
         if entry_form.is_valid():
-            # If the form is valid, let's create and Entry with the submitted data
             entry = Entry()
             entry.start = entry_form.cleaned_data['start']
-            entry.end = entry_form.cleaned_data['end']
+            entry.stop = entry_form.cleaned_data['stop']
             entry.project = entry_form.cleaned_data['project']
             entry.description = entry_form.cleaned_data['description']
             entry.save()
@@ -39,9 +52,23 @@ def entries(request):
         'entry_form': entry_form,
     })
 
-
 def projects(request):
+    if request.method == 'POST':
+
+        project_form = ProjectForm(request.POST)
+        if project_form.is_valid():
+            project = Project()
+            project.client = project_form.cleaned_data['client']
+            project.name = project_form.cleaned_data['name']
+            project.save()
+    else:
+        project_form = ProjectForm(request.POST)
+
     project_list = Project.objects.all()
-    return render(request, 'projects.html', {
+    return render(request,'projects.html',{
         'project_list': project_list,
+        'project_form': project_form,
     })
+
+
+

From 976b2a7f307b560b1fccf7fc1cde6bbdc168242c Mon Sep 17 00:00:00 2001
From: s1rai <floatraee@gmail.com>
Date: Wed, 12 Aug 2015 20:30:55 +1000
Subject: [PATCH 2/4] Added validation

---
 README.md                                  | 55 +++-------------------
 timetracker/entries/forms.py               | 23 +++++----
 timetracker/entries/templates/clients.html |  6 +--
 timetracker/entries/templates/entries.html | 10 ++--
 timetracker/entries/views.py               |  3 ++
 5 files changed, 32 insertions(+), 65 deletions(-)

diff --git a/README.md b/README.md
index ac45a63..dcc8025 100644
--- a/README.md
+++ b/README.md
@@ -1,53 +1,12 @@
-# MelbDjango School Lesson Four
-
-### Assignment 1
-
-**Important:** Check out our first assignment here: https://github.com/melbdjango/melbdjango-assignment
-
----
-
-
-Congratulations, you've made it to the git repository for our fourth lesson. Hopefully you also made it to the class
-and some of this makes sense to you.
-
-Check our RESOURCES.md for some links we think you'll find handy.
-
-
 ## Homework Checklist
 
-- [ ] [Fork this repository][gh-fork]
-- [ ] Clone the repo to your own machine
-- [ ] Use the virtualenv you created in previous lesson
-- [ ] Create forms to create new Projects and Clients (look at our EntryForm to see how to handle ForeignKey relationships)
-- [ ] Add those forms to your views and templates so that users can create new Clients and Projects
-- [ ] Add some validation to make sure that start time is in the past
-- [ ] Validate that the end time is after the start time
+- [X] [Fork this repository][gh-fork]
+- [X] Clone the repo to your own machine
+- [X] Use the virtualenv you created in previous lesson
+- [X] Create forms to create new Projects and Clients (look at our EntryForm to see how to handle ForeignKey relationships)
+- [X] Add those forms to your views and templates so that users can create new Clients and Projects
+- [X] Add some validation to make sure that start time is in the past
+- [X] Validate that the end time is after the start time
 - [ ] Bonus Points #1: Think about making our form look a little nice with some CSS
 - [ ] Bonus Points #2: Add the ability to edit existing Projects and Clients
 
-When you've completed some or all of the homework please make a [Pull Request][gh-pr] against this repository. If you submit
-your work before Wednesday evening we'll give you feedback before the next class.
-
-If you'd like help, make a Pull Request with your incomplete work and ask a question to @darrenfrenkel, @sesh or
-@funkybob.
-
-
-## Displaying the class slides
-
-Install reveal-md with npm and use that to display the class slides.
-
-```
-    npm install -g reveal-md
-```
-
-From within the `lesson-four` repo:
-
-```
-    cd slides
-    reveal-md CLASS.md --theme melbdjango
-```
-
-[gh-fork]: https://help.github.com/articles/fork-a-repo/
-[gh-pr]: https://help.github.com/articles/using-pull-requests/
-[dj-request-response]: https://docs.djangoproject.com/en/1.8/ref/request-response/
-[mdn-html]: https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Introduction
diff --git a/timetracker/entries/forms.py b/timetracker/entries/forms.py
index a3714af..fd6f9a5 100644
--- a/timetracker/entries/forms.py
+++ b/timetracker/entries/forms.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils import timezone
-
 from .models import Project, Client
 
 class EntryForm(forms.Form):
@@ -8,14 +7,20 @@ class EntryForm(forms.Form):
     stop = forms.DateTimeField(label="End Time", help_text="Format: 2006-10-25 14:30")
     project = forms.ModelChoiceField(queryset=Project.objects.all())
     description = forms.CharField()
-
-    def ValidDate(self):
-        start = self.cleaned_data['start']
-        stop = self.cleand_data['end']
-
-        if start > end:
-           raise forms.ValidationError("Start time is greater then stop time")
-           return start
+    
+    def clean(self):
+        cleaned_start = super(EntryForm,self).clean()
+        start = cleaned_start.get("start")
+        stop = cleaned_start.get("stop")
+
+        if start and stop:
+            if start > timezone.now():
+                raise forms.ValidationError("Error:Project date exceeds current time")
+                return start
+
+            if stop < start:
+                 raise forms.ValidationError("Error: Project end date is before start time")
+                 return stop
 
 class ClientForm(forms.Form):
     name = forms.CharField(required=False, label="name")
diff --git a/timetracker/entries/templates/clients.html b/timetracker/entries/templates/clients.html
index 952a750..fe4e6d0 100644
--- a/timetracker/entries/templates/clients.html
+++ b/timetracker/entries/templates/clients.html
@@ -5,10 +5,10 @@
 {% block content %}
   <h2>Clients</h2>
     <form method="post"> 
-     {% csrf_token %}
-     {{ client_form.as_p }}
+      {% csrf_token %}
+      {{ client_form.as_p }}
      <input type="submit" name="client_submit" value="Create Client">
-     </form>
+    </form>
      
   <ul>
     {% for client in client_list %}
diff --git a/timetracker/entries/templates/entries.html b/timetracker/entries/templates/entries.html
index ee4b763..da81e6c 100644
--- a/timetracker/entries/templates/entries.html
+++ b/timetracker/entries/templates/entries.html
@@ -4,11 +4,11 @@
 
 {% block content %}
   <h2>Entries</h2>
-  <form method="post">
-    {% csrf_token %}
-    {{ entry_form.as_p }}
-    <input type="submit" name="project_name" value="Create Entry">
-  </form>
+    <form method="post">
+      {% csrf_token %}
+      {{ entry_form.as_p }}
+      <input type="submit" name="project_name" value="Create Entry">
+   </form>
 
   <ul>
     {% for entry in entry_list %}
diff --git a/timetracker/entries/views.py b/timetracker/entries/views.py
index d07ac48..839625c 100644
--- a/timetracker/entries/views.py
+++ b/timetracker/entries/views.py
@@ -1,8 +1,11 @@
 from django.shortcuts import render, get_object_or_404
+from django.utils import timezone
 
 from .forms import EntryForm, ProjectForm, ClientForm
+
 from .models import Client, Entry, Project
 
+
 def clients(request):
     if request.method == 'POST':
         # Create our form object with our POST data

From 8b8920b07632ddb01f687d2ef89b6ec67912f1b6 Mon Sep 17 00:00:00 2001
From: s1rai <floatraee@gmail.com>
Date: Wed, 12 Aug 2015 23:56:23 +1000
Subject: [PATCH 3/4] edit project and clients

---
 README.md                    |  2 +-
 timetracker/entries/forms.py |  4 ++--
 timetracker/entries/urls.py  |  3 +++
 timetracker/entries/views.py | 41 ++++++++++++++++++++++++++----------
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index dcc8025..98ed24d 100644
--- a/README.md
+++ b/README.md
@@ -8,5 +8,5 @@
 - [X] Add some validation to make sure that start time is in the past
 - [X] Validate that the end time is after the start time
 - [ ] Bonus Points #1: Think about making our form look a little nice with some CSS
-- [ ] Bonus Points #2: Add the ability to edit existing Projects and Clients
+- [X] Bonus Points #2: Add the ability to edit existing Projects and Clients
 
diff --git a/timetracker/entries/forms.py b/timetracker/entries/forms.py
index fd6f9a5..b341a24 100644
--- a/timetracker/entries/forms.py
+++ b/timetracker/entries/forms.py
@@ -15,11 +15,11 @@ def clean(self):
 
         if start and stop:
             if start > timezone.now():
-                raise forms.ValidationError("Error:Project date exceeds current time")
+                raise forms.ValidationError("Error:Project date exceeds current date")
                 return start
 
             if stop < start:
-                 raise forms.ValidationError("Error: Project end date is before start time")
+                 raise forms.ValidationError("Error: Project end date is before start date")
                  return stop
 
 class ClientForm(forms.Form):
diff --git a/timetracker/entries/urls.py b/timetracker/entries/urls.py
index ea0e88e..4c9cdea 100644
--- a/timetracker/entries/urls.py
+++ b/timetracker/entries/urls.py
@@ -6,6 +6,9 @@
 urlpatterns = [
     url(r'^clients/$', views.clients, name='client-list'),
     url(r'^clients/(?P<pk>\d+)/$', views.client_detail, name='client-detail'),
+    url(r'^clients/(?P<pk>\d+)/edit/$', views.client_edit, name='client-edit'),
     url(r'^entries/$', views.entries, name='entry-list'),
     url(r'^projects/$', views.projects, name='project-list'),
+    url(r'^projects/(?P<pk>\d+)/edit/$', views.project_edit, name='project-edit'),
 ]
+
diff --git a/timetracker/entries/views.py b/timetracker/entries/views.py
index 839625c..84038b3 100644
--- a/timetracker/entries/views.py
+++ b/timetracker/entries/views.py
@@ -5,13 +5,10 @@
 
 from .models import Client, Entry, Project
 
-
 def clients(request):
     if request.method == 'POST':
-        # Create our form object with our POST data
         client_form = ClientForm(request.POST)
         if client_form.is_valid():
-            # If the form is valid, let's create and Entry with the submitted data
             client = Client()
             client.name = client_form.cleaned_data['name']
             client.save()
@@ -24,18 +21,27 @@ def clients(request):
         'client_form': client_form,
     })
 
-    client_list = Client.objects.all()
-    return render(request, 'clients.html', {
-        'client_list': client_list,
-    })
-
-
 def client_detail(request, pk):
     client = get_object_or_404(Client, pk=pk)
     return render(request, 'client_detail.html', {
         'client': client,
     })
 
+def client_edit(request,pk):
+    client = get_object_or_404(Client, pk=pk)
+    if request.method == 'POST':
+        client_form = ClientForm(request.POST)
+        if client_form.is_valid():
+            client.name = client_form.cleaned_data['name']
+            client.save()
+    else:
+        client_form = ClientForm(initial={'name':client.name})
+     
+    return render(request, 'client_edit.html', {
+        'client': client,
+        'client_form': client_form,
+    })
+
 def entries(request):
     if request.method == 'POST':
         entry_form = EntryForm(request.POST)
@@ -57,7 +63,6 @@ def entries(request):
 
 def projects(request):
     if request.method == 'POST':
-
         project_form = ProjectForm(request.POST)
         if project_form.is_valid():
             project = Project()
@@ -73,5 +78,19 @@ def projects(request):
         'project_form': project_form,
     })
 
-
+def project_edit(request,pk):
+    project = get_object_or_404(Project, pk=pk)
+    if request.method == 'POST':
+        project_form = ProjectForm(request.POST)
+        if project_form.is_valid():
+            project.client = project_form.cleaned_data['client']
+            project.name = project_form.cleaned_data['name']
+            project.save()
+    else:
+        project_form = ProjectForm(initial={'name':project.name})
+     
+    return render(request, 'project_edit.html', {
+        'project': project,
+        'project_form': project_form,
+    })
 

From 4ff68fd6f33bd7e2f3a0593e5f44e0592ccd062c Mon Sep 17 00:00:00 2001
From: s1rai <floatraee@gmail.com>
Date: Wed, 12 Aug 2015 23:59:12 +1000
Subject: [PATCH 4/4] bonus added

---
 timetracker/entries/templates/client_edit.html  | 16 ++++++++++++++++
 timetracker/entries/templates/project_edit.html | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 timetracker/entries/templates/client_edit.html
 create mode 100644 timetracker/entries/templates/project_edit.html

diff --git a/timetracker/entries/templates/client_edit.html b/timetracker/entries/templates/client_edit.html
new file mode 100644
index 0000000..0b73f05
--- /dev/null
+++ b/timetracker/entries/templates/client_edit.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% block title %}Clients{% endblock %}
+
+{% block content %}
+  <h2>Clients</h2>
+    <form method="post"> 
+      {% csrf_token %}
+      {{ client_form.as_p }}
+     <input type="submit" name="client_submit" value="Update Client">
+    </form>
+     
+  <ul>
+    <li>{{ client.name }}</li>
+  </ul>
+{% endblock %}
diff --git a/timetracker/entries/templates/project_edit.html b/timetracker/entries/templates/project_edit.html
new file mode 100644
index 0000000..402551a
--- /dev/null
+++ b/timetracker/entries/templates/project_edit.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% block title %}Projects{% endblock %}
+
+{% block content %}
+  <h2>Projects</h2>
+    <form method="post">
+     {% csrf_token %}
+     {{ project_form.as_p }}
+     <input type="submit" name="test" value="Update Project">
+    </form>
+
+  <ul> 
+    <li>{{ project.name }}</li>
+  </ul>
+{% endblock %}