Skip to content

Commit

Permalink
Updated semantic UI to 2.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
brian committed Sep 17, 2015
1 parent 32f6cdd commit 9b907c1
Show file tree
Hide file tree
Showing 9 changed files with 223 additions and 23 deletions.
27 changes: 27 additions & 0 deletions scrumtools/apps/scrumboard/migrations/0007_auto_20150915_1009.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
import datetime


class Migration(migrations.Migration):

dependencies = [
('scrumboard', '0006_auto_20150703_2246'),
]

operations = [
migrations.AlterField(
model_name='story',
name='modified_on',
field=models.DateTimeField(default=datetime.datetime(2015, 9, 15, 10, 9, 27, 217894)),
preserve_default=True,
),
migrations.AlterField(
model_name='task',
name='modified_on',
field=models.DateTimeField(default=datetime.datetime(2015, 9, 15, 10, 9, 27, 218858)),
preserve_default=True,
),
]
27 changes: 27 additions & 0 deletions scrumtools/apps/scrumboard/migrations/0008_auto_20150915_1011.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
import datetime


class Migration(migrations.Migration):

dependencies = [
('scrumboard', '0007_auto_20150915_1009'),
]

operations = [
migrations.AlterField(
model_name='story',
name='modified_on',
field=models.DateTimeField(default=datetime.datetime(2015, 9, 15, 10, 11, 40, 204135)),
preserve_default=True,
),
migrations.AlterField(
model_name='task',
name='modified_on',
field=models.DateTimeField(default=datetime.datetime(2015, 9, 15, 10, 11, 40, 205204)),
preserve_default=True,
),
]
27 changes: 27 additions & 0 deletions scrumtools/apps/scrumboard/migrations/0009_auto_20150917_1203.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
import datetime


class Migration(migrations.Migration):

dependencies = [
('scrumboard', '0008_auto_20150915_1011'),
]

operations = [
migrations.AlterField(
model_name='story',
name='modified_on',
field=models.DateTimeField(default=datetime.datetime(2015, 9, 17, 12, 3, 22, 466422)),
preserve_default=True,
),
migrations.AlterField(
model_name='task',
name='modified_on',
field=models.DateTimeField(default=datetime.datetime(2015, 9, 17, 12, 3, 22, 467348)),
preserve_default=True,
),
]
39 changes: 39 additions & 0 deletions scrumtools/apps/scrumboard/migrations/0010_auto_20150917_1420.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
import datetime


class Migration(migrations.Migration):

dependencies = [
('scrumboard', '0009_auto_20150917_1203'),
]

operations = [
migrations.AddField(
model_name='project',
name='github_project',
field=models.URLField(null=True, blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='task',
name='github_id',
field=models.IntegerField(default=0),
preserve_default=True,
),
migrations.AlterField(
model_name='story',
name='modified_on',
field=models.DateTimeField(default=datetime.datetime(2015, 9, 17, 14, 20, 41, 820714)),
preserve_default=True,
),
migrations.AlterField(
model_name='task',
name='modified_on',
field=models.DateTimeField(default=datetime.datetime(2015, 9, 17, 14, 20, 41, 821845)),
preserve_default=True,
),
]
27 changes: 27 additions & 0 deletions scrumtools/apps/scrumboard/migrations/0011_auto_20150917_1422.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
import django.utils.timezone


class Migration(migrations.Migration):

dependencies = [
('scrumboard', '0010_auto_20150917_1420'),
]

operations = [
migrations.AlterField(
model_name='story',
name='modified_on',
field=models.DateTimeField(default=django.utils.timezone.now),
preserve_default=True,
),
migrations.AlterField(
model_name='task',
name='modified_on',
field=models.DateTimeField(default=django.utils.timezone.now),
preserve_default=True,
),
]
6 changes: 4 additions & 2 deletions scrumtools/apps/scrumboard/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@python_2_unicode_compatible
class Project(models.Model):
name = models.CharField(max_length=100)
github_project = models.URLField(blank=True, null=True)

class Meta:
verbose_name = _('Project')
Expand Down Expand Up @@ -56,7 +57,7 @@ class Story(models.Model):
description=models.TextField()
sprint = models.ForeignKey(Sprint, blank=True, null=True)
created_on=models.DateTimeField()
modified_on=models.DateTimeField(default=datetime.datetime.now())
modified_on=models.DateTimeField(default=timezone.now)

class Meta:
verbose_name = _('Story')
Expand All @@ -78,14 +79,15 @@ class Task(models.Model):
"""Smallest unit of work to be done for the sprint."""
project = models.ForeignKey(Project)
name=models.CharField(max_length=200)
github_id = models.IntegerField(default=0)
description=models.TextField()
status = models.ForeignKey(Status)
sprint = models.ForeignKey(Sprint, blank=True, null=True)
story = models.ForeignKey(Story, blank=True, null=True)
story_points=models.IntegerField(default=0)
estimated_days=models.IntegerField(default=0)
created_on=models.DateTimeField()
modified_on=models.DateTimeField(default=datetime.datetime.now())
modified_on=models.DateTimeField(default=timezone.now)
assigned = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True)
started = models.DateField(blank=True, null=True)
due = models.DateField(blank=True, null=True)
Expand Down
23 changes: 23 additions & 0 deletions scrumtools/apps/scrumboard/templates/scrumboard/import.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{% extends "base.html" %}
{% load sitetree %}

{#{% block title %} {% sitetree_page_title from "main_en" %} {% endblock %}#}

{% block navbar %}
{% include "navbar.html" %}
{% endblock %}

{% block statusbar %}
{% include "statusbar.html" %}
{% endblock %}

{% block sidebar %}
{% endblock %}

{% block content %}

{% for item in data %}
imported : {{ item.title }}<br>
{% endfor %}

{% endblock %}
2 changes: 2 additions & 0 deletions scrumtools/apps/scrumboard/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
url(r'^tasklist/delete/(?P<pk>\d+)$', views.TaskDelete.as_view(), name='task-delete'),
url(r'^select-project', views.select_project, name='select-project'),
url(r'^select-sprint', views.select_sprint, name='select-sprint'),
url(r'^import/$', views.Import.as_view(), name='import'),

)
68 changes: 47 additions & 21 deletions scrumtools/apps/scrumboard/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.views.generic import ListView
from django.views.generic import ListView, TemplateView
from django.views.generic.detail import DetailView
from django.views.generic.edit import CreateView, UpdateView, DeleteView
from django.forms.models import modelform_factory
Expand All @@ -9,11 +9,10 @@

from scrumtools.apps.scrumboard.models import Project, Status, Sprint, Story, Task
from scrumtools.apps.scrumboard.forms import ProjectForm, SprintForm
from django.utils import timezone

import json
import urllib2
data = json.load(urllib2.urlopen("https://api.github.com/repos/acidjunk/django-scrumboard/issues"))


#dashboard
@login_required
Expand Down Expand Up @@ -157,24 +156,51 @@ class TaskDelete(DeleteView):
class TaskDetail(DetailView):
model = Task

class GetIssues(TemplateView): # import
for i in data:
task = Task()
task.Project = "Project 1"
task.name = i['number']
task.description = i['title']
task.Status = "Stat1"
task.Sprint = "Meer koffie"
task.Story = ""
task.Story_points = 1
task.estimated_days = 5
task.created_on = "2015-01-01" # date(2015,1,1)
task.modified_on = "2015-05-03" # date(2015,5,3)
# task.assigned
task.started = "2015-01-01"
task.due = "2015-05-03"
task.completed = "2015-08-08"
task.save()
class Import(TemplateView): # import
template_name = 'scrumboard/import.html'

def get(self, request, *args, **kwargs):
# Todo: make this dynamic
project = Project.objects.get(pk=1)

# Todo:
status = Status.objects.get(pk=1)
print project, status
data = json.load(urllib2.urlopen("https://api.github.com/repos/acidjunk/django-scrumboard/issues"))
for item in data:
# insert to DB
task = Task()
task.project = project
task.status = status
task.name = 'Github issues: %s' % item['number']
task.github_id = item['number']
task.description = item['body']
task.created_on = timezone.now()
task.modified_on = timezone.now()
task.save()

context = {'data': data}
return self.render_to_response(context)



# for i in data:
# task = Task()
# task.Project = "Project 1"
# task.name = i['number']
# task.description = i['title']
# task.Status = "Stat1"
# task.Sprint = "Meer koffie"
# task.Story = ""
# task.Story_points = 1
# task.estimated_days = 5
# task.created_on = "2015-01-01" # date(2015,1,1)
# task.modified_on = "2015-05-03" # date(2015,5,3)
# # task.assigned
# task.started = "2015-01-01"
# task.due = "2015-05-03"
# task.completed = "2015-08-08"
# task.save()


def select_project(request):
Expand Down

0 comments on commit 9b907c1

Please sign in to comment.