Changeset 2099

Timestamp:

07/01/10 14:51:22 (20 months ago)

Author:

dart

Message:

LoReality?:
o Update: manage database for campaign, missions, pilots...

Location:

trunk/loreality

Files:

• data/templates/derived/page/campaign.html.py (modified) (2 diffs)
• development.db (modified) (previous)
• development.ini (modified) (1 diff)
• loreality/controllers/campaign.py (modified) (1 diff)
• loreality/model/__init__.py (modified) (2 diffs)
• loreality/model/databases.py (added)
• loreality/model/meta.py (modified) (1 diff)
• loreality/templates/derived/page/campaign.html (modified) (1 diff)
• loreality/websetup.py (modified) (2 diffs)

trunk/loreality/data/templates/derived/page/campaign.html.py

@@ -4 +4 @@
 __M_locals_builtin = locals
 _magic_number = 5
-_modified_time = 1277929761.70573
-_template_filename='/home/dart/trunk/loreality/loreality/templates/derived/page/campaign.html'
+_modified_time = 1277995092.1379321
+_template_filename='/media/divers/personnel/dev/dartsite.org/lotatc/trunk/loreality/loreality/templates/derived/page/campaign.html'
 _template_uri='/derived/page/campaign.html'
 _template_cache=cache.Cache(__name__, _modified_time)
@@ -36 +36 @@
         __M_writer(u'</h2>\n<ul>\n')
         # SOURCE LINE 4
-        for mission in c.missions:
+        for campaign in c.campaigns:
             # SOURCE LINE 5
-            __M_writer(u'<li> ')
-            __M_writer(escape(mission.name))
-            __M_writer(u' </li>\n')
-        # SOURCE LINE 7
+            __M_writer(u'    <li><p>')
+            __M_writer(escape(campaign.name))
+            __M_writer(u'</p>\n    <ul>\n')
+            # SOURCE LINE 7
+            for mission in campaign.missions:
+                # SOURCE LINE 8
+                __M_writer(u'    <li> ')
+                __M_writer(escape(mission.name))
+                __M_writer(u'(\n')
+                # SOURCE LINE 9
+                for pilot in mission.pilots:
+                    # SOURCE LINE 10
+                    __M_writer(u'        ')
+                    __M_writer(escape(pilot.name))
+                    __M_writer(u' - \n')
+                # SOURCE LINE 12
+                __M_writer(u'    )</li>\n')
+            # SOURCE LINE 14
+            __M_writer(u'    </ul></li>\n')
+        # SOURCE LINE 16
         __M_writer(u'</ul>\n')
         return ''

trunk/loreality/development.ini

@@ -43 +43 @@
 authkit.setup.enable = true
 authkit.setup.method = form, cookie
-#authkit.form.authenticate.user.type = authkit.users.sqlalchemy_driver:UsersFromDatabase
-#authkit.form.authenticate.user.data = loreality.model
-authkit.form.authenticate.user.data = dart:admin
+authkit.form.authenticate.user.type = authkit.users.sqlalchemy_driver:UsersFromDatabase
+authkit.form.authenticate.user.data = loreality.model
+#authkit.form.authenticate.user.data = dart:admin
 authkit.cookie.secret = aoeuidts
 authkit.cookie.signoutpath = /signout

trunk/loreality/loreality/controllers/campaign.py

@@ -17 +17 @@
         c.heading = "Campaign"
         c.campaign_title = "My Campaign"
-        c.missions = meta.Session.query(model.Mission).all()
+        c.campaigns = meta.Session.query(model.Campaign).all()
 
         return  render('/derived/page/campaign.html')

trunk/loreality/loreality/model/__init__.py

@@ -1 +1 @@
 """The application's model objects"""
-import sqlalchemy as sa
-from sqlalchemy import orm
-
+from sqlalchemy import orm, schema, types
 from loreality.model import meta
+from loreality.model.databases import *
 
 def init_model(engine):
@@ -16 +15 @@
     meta.engine = engine
 
-
-# Non-reflected tables may be defined and mapped at module level
-users_table = sa.Table("Pilots", meta.metadata,
-    sa.Column("id", sa.types.Integer, primary_key=True),
-    sa.Column("login", sa.types.String(255), nullable=False),
-    sa.Column("squadron", sa.types.String(255), nullable=False),
-    )
-mission_table = sa.Table("Missions", meta.metadata,
-    sa.Column("id", sa.types.Integer, primary_key=True),
-    sa.Column("name", sa.types.String(255), nullable=False),
-    )
-
-class User(object):
-    pass
-
-class Mission(object):
-    pass
+    metadata = schema.MetaData()
+    Base.metadata.create_all(engine)
 
 
-orm.mapper(User, users_table)
-orm.mapper(Mission, mission_table)
-
-
-## Classes for reflected tables may be defined here, but the table and
-## mapping itself must be done in the init_model function
-#reflected_table = None
-#
-#class Reflected(object):
-#    pass

trunk/loreality/loreality/model/meta.py

@@ -3 +3 @@
 from sqlalchemy.orm import scoped_session, sessionmaker
 
-__all__ = ['Session', 'engine', 'metadata']
+__all__ = ['Session', 'engine', 'metadata', 'databases']
 
 # SQLAlchemy database engine. Updated by model.init_model()

trunk/loreality/loreality/templates/derived/page/campaign.html

@@ -2 +2 @@
 <h2>${c.campaign_title}</h2>
 <ul>
-% for mission in c.missions:
-<li> ${mission.name} </li>
+% for campaign in c.campaigns:
+    <li><p>${campaign.name}</p>
+    <ul>
+    % for mission in campaign.missions:
+    <li> ${mission.name}(
+    % for pilot in mission.pilots:
+        ${pilot.name} - 
+    % endfor
+    )</li>
+    % endfor
+    </ul></li>
 % endfor
 </ul>

trunk/loreality/loreality/websetup.py

@@ -7 +7 @@
 
 from loreality.model import meta
+from loreality.model.databases import *
 
 log = logging.getLogger(__name__)
@@ -26 +27 @@
     users.user_create("DArt", password="admin")
     users.user_add_role("DArt", role="admin" )
-    print users.user("dart")
 
     log.info("Adding mission...")
-    mis = model.Mission()
-    mis.name=u'Mission 1'
+    cam = Campaign("My Campaign")
+
+    mis = Mission("mission 1")
     meta.Session.add(mis)
+    cam.missions.append( mis )
+
+    pil = Pilot("DArt")
+    meta.Session.add( pil )
+    mis.pilots.append( pil )
+
+    pil = Pilot("Tolteque")
+    meta.Session.add( pil )
+    mis.pilots.append( pil )
+
+    mis = Mission("mission 2")
+    meta.Session.add(mis)
+    mis.pilots.append( pil )
+    cam.missions.append( mis )
+
     meta.Session.commit()
     log.info("Successfully set up.")