From c26e6279760b09f7cf7451d87e0a80f0c8da502b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Cuevas?= <reset.reboot@gmail.com>
Date: Mon, 3 Jun 2013 09:08:24 +0200
Subject: [PATCH] Now working with web.py and changes to the database layout
 and new functions added.

---
 app.py               | 109 ++++++++++++++++++++++++++++++++++++++++---
 database_template.db | Bin 6144 -> 6144 bytes
 views/layout.html    |   4 +-
 views/summary.html   |   2 +-
 4 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/app.py b/app.py
index 538636a..82106bf 100644
--- a/app.py
+++ b/app.py
@@ -2,30 +2,127 @@
 # -*- coding: UTF-8 -*-
 
 import web
+from web import form
+
+# Framework initialization
 
 render = web.template.render('views/')
 db = web.database(dbn = 'sqlite', db = 'game.db')
 
 urls = (
+    '/app', 'summary',
     '/app/', 'summary',
+    '/app/config', 'config',
+    '/app/config/', 'config',
+    '/app/config/add', 'stat_add',
+    '/app/config/remove/(.+)', 'remove_stat',
+    '/app/config/edit/(.+)', 'edit_stat',
+)
+
+# Forms used by the app
+add_stat = form.Form(
+    form.Textbox('stat_name',
+                 description = 'Stat name:'),
+    form.Textbox('default_value',
+                 description = 'Default value:',
+                 value = 0),
+    form.Button('Add Stat')
 )
 
 app = web.application(urls, globals())
 
-def render_html(game_name, main_block):
+# Auxiliary functions
+
+def render_web(game_name, main_block):
+    """
+    Cobbles together all the pieces we've broken our
+    templates, so we can have a kind of modular design
+    """
     sidebar = render.sidebar()
     return render.layout(main_block, sidebar, game_name)
 
+# Server calls
 
 class summary(object):
     def GET(self):
+        # TODO: Get from main configuration file
         game_name = "My Game"
-        player_num = 3
-        stats_num = 10
-        players = ['Reset', 'Logan', 'Estela']
 
-        summary = render.summary(game_name, player_num, stats_num, players)
-        return render_html(game_name, summary)
+        # Variable initialization
+        player_num = 0
+        stats_num = 0
+        players = []
+        for player in db.select("players"):
+            player_num +=1
+            players.append(player['name'])
+
+        # I know, this is pretty clumsy...
+        for stat in db.select("stats"):
+            stats_num += 1
+
+        # We render our main block and feed it to our 
+        # Web renderer
+        summary = render.summary(game_name, 
+                                 player_num, 
+                                 stats_num, 
+                                 players)
+        return render_web(game_name, summary)
+
+
+class config(object):
+    def GET(self):
+        game_name = "My Game"
+        stats = []
+        for stat in db.select("stats"):
+            stats.append(stat)
+
+        add_stat_form = add_stat.render()
+
+        config = render.config(game_name,
+                               stats,
+                               add_stat_form)
+
+        return render_web(game_name, config)
+
+
+class stat_add(object):
+    def POST(self):
+        form = add_stat()
+        if form.validates():
+            db.insert('stats', name = form.d.stat_name, default_value = form.d.default_value)
+
+        raise web.seeother('/app/config')
+
+
+class remove_stat(object):
+    def GET(self, index_to_remove):
+        try:
+            index = int(index_to_remove)
+
+        except Exception as e:
+            return "Ooops! Wrong index!"
+
+        db.delete('stats', where = 'id = $index', vars = locals())
+        raise web.seeother('/app/config')
+
+class edit_stat(object):
+    def GET(self, index_to_remove):
+        game_name = "My Game"
+        try:
+            index = int(index_to_remove)
+
+        except Exception as e:
+            return "Ooops! Wrong index!"
+
+        for s in db.select('stats', where = 'id = $index', vars = locals()):
+            stat_info = s
+
+        edit_stat_form = add_stat.render()
+        edit_stat = render.edit_stat(stat_info, edit_stat_form)
+
+        return render_web(game_name, edit_stat)
+
+
 
 if __name__ == "__main__":
     app.run()
diff --git a/database_template.db b/database_template.db
index 0cae946e53a7764d5654c4040e57b6218c64476a..7ede5c313ac94fb4458b827f664d0b818a26f236 100644
GIT binary patch
delta 146
zcmZoLXfT){Ey&Hlz`zE?Fu*-g$5@=3LHCg=FS7&#D`PGL(=q01=Ch0s8FME#e&;OW
zWEU3~XKZwytjHWJt)q~VnwD6aQxad6m{Xdn;OQ6Q>h2n(*_gz!`3a*5BMb8%hUAHj
qk$lX5fGm~(Ha2l-X~xRQb<7St$@wX%3L&l$A)31Eo6j>FiU0sZ`6P+}

delta 117
zcmZoLXfT){Ey&Ekz`zE?Fu*)f$5@=1LHCg=FY_M;R>p@6%%#j{nI)KxF+SWZ$db*-
z+?d3=`3a*5BWE--ySTVGW25NgGR9yo%`irGacODBM&`-Q%npJI#TluoB?_K?A+GMO
OL7KWuo6j>FiU0sHFd0w)

diff --git a/views/layout.html b/views/layout.html
index 21d2406..ad4f08c 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -2,12 +2,12 @@ $def with (main_block, sidebar_block, game_name)
 <!DOCTYPE html>
 <html>
     <head>
-        <title>TyeDye for $game_name</title>
+        <title>TyeDye control panel for $game_name</title>
         <link rel='stylesheet' type='text/css' href='/static/main.css'>
     </head>
     <body>
         <header>
-            <h1>TyeDye $game_name</h1>
+            <h1>TyeDye: $game_name control panel</h1>
         </header>
         <div class='container'>
             <div class='main-content'>
diff --git a/views/summary.html b/views/summary.html
index a5da0ab..ddbc2dc 100644
--- a/views/summary.html
+++ b/views/summary.html
@@ -5,5 +5,5 @@ $def with (game_name, player_num, stats_num, player_list)
 <p>Player list:<br />
 <ul>
 $for player in player_list:
-    <li>$player</li>
+    <li><a href="/app/player/$player">$player</a></li>
 </ul>