From 19210b734c6ef33e38e190cc95c5e4304c3fe00e Mon Sep 17 00:00:00 2001 From: Justin Lewis Salmon Date: Sat, 1 Jun 2013 15:24:46 +0100 Subject: [PATCH] Working on calendar layout --- app.db | Bin 40960 -> 40960 bytes db_repository/versions/003_migration.py | 32 +++++ megaproject/templates/forms/create_task.html | 17 +++ megaproject/templates/index.html | 124 ++++++++++------ megaproject/templates/macros.html | 132 ++++++++++-------- megaproject/templates/views/calendar.html | 88 +++++++----- .../templates/views/task_overview.html | 9 ++ megaproject/views.py | 64 ++++++++- 8 files changed, 325 insertions(+), 141 deletions(-) create mode 100644 db_repository/versions/003_migration.py create mode 100644 megaproject/templates/forms/create_task.html create mode 100644 megaproject/templates/views/task_overview.html diff --git a/app.db b/app.db index 430782cebe5b8e152b074c540c4b20debabe97b4..869802a2a6ae95f5328c14308ecf17ca091a7c56 100644 GIT binary patch delta 1319 zcma)+L1@!p6vw|bZPTRr@|t#C89MfjZs1^nHnqF$FjO4g?9`iwl%}t= zAYLX#K|D>5JGmY_co}*WPeY_Af(l+dc<>}BGi|=M&@y8n{QrF4kM~|4@1=PdXdVW3 zPsxi2A;EnI5C32}H@AqCFAF&O4)J^mK@H;4D}01od@0%$y3t3^Ti+tWZ7a;Bl1b+7 z#rBeTAXkmDNv^FG&aJN%&Zzm7rS>gpq5Vg^)9wnt1L9o!eRMsD5L4`=#m^gRO58*6 z30}fu*oLc+16leZy_NQ*ds0QZAf+V+f5b2FL)^fZ@iG>~y^b8KiB2UYpxOC(x7rpM z`Zlq(MorCRb4n(!WX=xV%7$6jiKT0sn>(ahziC>wX4phCN~CJox}`Vls!?%$*|h4K zT{R7&70oT1*f*+;eo!*aqeMRuE^5{wu#?FRY$l&h@@U3GuDE58?C@&jR5CS;Q#MVP zP?e0TWYv))i4zI$v$7;UARIg%gd%BqSc^+|6;EVJ$NmE%Fi19$OI4hH?L_(q;t|-F z5Pga0B;ky;PMAc-2;P^7_!8WZaK_tDdrZPZcsXyR#kGhiC8v+HfE0pu=@&!WOK$8_Izr zva`%!GgBO!VBBGx7T6ia+mU4N$nDV-)dbae5AjA<9@!YZ1*#HNOjV>Br7Cdez3@Ce hh*0IIhN*_A2C1?k7MM~X%qDoZh=b-aFznOa*k9Mk4*viE delta 132 zcmZoTz|?SnX@ayM4+8@O7ZAe$$3z`tc^(GcM=HGBR~b0DZZhy^^9%7E;=Rn<$Rp2v zlj|n;w9SG7(Oi>na{XaqV3>TJ+k>kqo{e2xRFtt*adIB#rp>o`G=rHK1U3sQJmQ}? UL4plzKAgL$;Xgkk)1nCi0OBkm;Q#;t diff --git a/db_repository/versions/003_migration.py b/db_repository/versions/003_migration.py new file mode 100644 index 0000000..7b935b4 --- /dev/null +++ b/db_repository/versions/003_migration.py @@ -0,0 +1,32 @@ +from sqlalchemy import * +from migrate import * + + +from migrate.changeset import schema +pre_meta = MetaData() +post_meta = MetaData() +task = Table('task', post_meta, + Column('id', Integer, primary_key=True, nullable=False), + Column('name', String(length=256)), + Column('start_date', Date), + Column('end_date', Date), + Column('info', String(length=256)), + Column('project_id', Integer), + Column('owner_id', Integer), + Column('parent_task', Integer), +) + + +def upgrade(migrate_engine): + # Upgrade operations go here. Don't create your own engine; bind + # migrate_engine to your metadata + pre_meta.bind = migrate_engine + post_meta.bind = migrate_engine + post_meta.tables['task'].columns['info'].create() + + +def downgrade(migrate_engine): + # Operations to reverse the above upgrade go here. + pre_meta.bind = migrate_engine + post_meta.bind = migrate_engine + post_meta.tables['task'].columns['info'].drop() diff --git a/megaproject/templates/forms/create_task.html b/megaproject/templates/forms/create_task.html new file mode 100644 index 0000000..52b8d27 --- /dev/null +++ b/megaproject/templates/forms/create_task.html @@ -0,0 +1,17 @@ +{% from "macros.html" import alert, field, input, date %} + +
+
+

Create Task

+ + {{ field(form.name, hide_label=True, placeholder=True) }} + {{ field(form.info, hide_label=True, placeholder=True) }} + {{ date(form.start_date, hide_label=True, placeholder=True) }} + {{ date(form.end_date, hide_label=True, placeholder=True) }} + {{ field(form.team, input_classes='typeahead', hide_label=True, placeholder=True, autocomplete='off') }} + + {{ form.hidden_tag() }} + + Cancel +
+
diff --git a/megaproject/templates/index.html b/megaproject/templates/index.html index c64ac0f..22dd75f 100644 --- a/megaproject/templates/index.html +++ b/megaproject/templates/index.html @@ -1,5 +1,4 @@ {% extends "base/base_with_nav_responsive.html" %} -{% from "macros.html" import alert, field, input, date %} {% block css %}