Changeset 2106

Timestamp:

07/06/10 12:38:59 (19 months ago)

Author:

dart

Message:

LoReality?:
o Update on squadron/mission

Location:

trunk/loreality

Files:

• development.db (modified) (previous)
• loreality/controllers/main.py (modified) (1 diff)
• loreality/controllers/mission.py (modified) (6 diffs)
• loreality/controllers/squadron.py (modified) (5 diffs)
• loreality/model/databases.py (modified) (1 diff)
• loreality/model/form.py (modified) (1 diff)
• loreality/templates/derived/page/mission.html (modified) (1 diff)
• loreality/templates/derived/page/mission_edit.html (modified) (1 diff)
• loreality/templates/derived/page/squadron_edit.html (added)

trunk/loreality/loreality/controllers/main.py

@@ -21 +21 @@
         c.heading = "LoReality"
         c.content = _("""
-<h1>Welcome</h1>
-<p>Welcome to LoReality server. This tool will help you to make a new step in the Lockon Reality by managing a real dynamic campaign.
+Welcome to LoReality server. This tool will help you to make a new step in the Lockon Reality by managing a real dynamic campaign.
         """)
         return  render('/derived/page/main.html')

trunk/loreality/loreality/controllers/mission.py

@@ -21 +21 @@
 import uuid
 from pylons.i18n.translation import _, ungettext
+class MisField:
+    name = ""
+    formtype = ""
+    def __init__( self, **kwargs):
+        self.__dict__.update( kwargs )
+
 
 class MissionController(BaseController):
+    misfields = [
+            MisField(name="name"          ,t_name=_("name")          ,formtype="text"),
+            MisField(name="description"   ,t_name=_("description")   ,formtype="text"),
+            MisField(name="date"          ,t_name=_("date")          ,formtype="text"),
+            MisField(name="situation"     ,t_name=_("situation")     ,formtype="textarea"),
+            MisField(name="objectives"    ,t_name=_("objectives")    ,formtype="textarea"),
+            MisField(name="flightplan"    ,t_name=_("flight plan")   ,formtype="textarea"),
+            MisField(name="threat"        ,t_name=_("threat")        ,formtype="textarea"),
+            MisField(name="others"        ,t_name=_("others")        ,formtype="textarea")
+            ]
     #--------------------------------------------------------------
     def _get_pilots(self, already_pilots):
@@ -29 +45 @@
         for p in pilots:
             if p not in already_pilots:
-                names.append( p.name )
+                names.append( [p.id, p.name] )
         return names
 
@@ -44 +60 @@
         c.heading = mission.name
         c.mission = mission
+        c.misfields = self.misfields
         c.available_pilots = self._get_pilots(mission.pilots)
 
@@ -75 +92 @@
                     abort(404)
 
-                mission.name = result["name"]
-                mission.description = result["description"]
-                mission.date = result["date"]
+                for f in self.misfields:
+                    setattr(mission, f.name, result[f.name] )
+
                 meta.Session.commit()
                 return self.view(id=id) 
@@ -95 +112 @@
         c.heading = "Edit %s"%mission.name
         c.mission = mission
+        c.misfields = self.misfields
         c.available_pilots = self._get_pilots(mission.pilots)
 
         if not values: values = {}
-        values["name"] = mission.name
-        values["description"] = mission.description
-        values["date"] = mission.date
+
+        for f in self.misfields:
+            values[f.name] = getattr(mission, f.name )
 
         html = render('/derived/page/mission_edit.html')
@@ -119 +137 @@
             abort(404)
         pilot_q = meta.Session.query(model.Pilot)
-        pilot = pilot_q.filter_by(name=pilotid).first()
+        pilot = pilot_q.filter_by(id=uuid.UUID(pilotid)).first()
         if pilot is None:
             abort(404)

trunk/loreality/loreality/controllers/squadron.py

@@ -12 +12 @@
 
 import loreality.lib.helpers as h
-from loreality.model.form import CampaignForm, MissionForm
+from loreality.model.form import *
 
 from authkit.authorize.pylons_adaptors import authorize
@@ -22 +22 @@
 import uuid
 
+class SquField:
+    name = ""
+    formtype = ""
+    def __init__( self, **kwargs):
+        self.__dict__.update( kwargs )
+
+
 class SquadronController(BaseController):
+    squfields = [
+            SquField(name="name"          ,t_name=_("name")          ,formtype="text"),
+            SquField(name="plane"         ,t_name=_("plane")   ,formtype="text"),
+            ]
     #--------------------------------------------------------------
     def _get_pilots(self, already_pilots=[]):
@@ -38 +49 @@
         c.heading = _("Squadrons")
         c.squadrons = squadrons
+        c.squfields = self.squfields
         c.available_pilots = self._get_pilots()
 
@@ -54 +66 @@
         c.heading = squadron.name
         c.squadron = squadron
+        c.squfields = self.squfields
         c.available_pilots = self._get_pilots(squadron.pilots)
 
         html = render('/derived/page/squadron.html')
         return  htmlfill.render(html, defaults=values, errors=errors)
+    #--------------------------------------------------------------
+    def process(self, id=None):
+        action = request.params.getone('action')
+        values = dict(request.params)
+        # Don't use the values field for repopulation
+        del values['action']
+        if action=='Modify':
+            # Assume we are trying to save the form
+            schema = SquadronForm()
+            try:
+                result = schema.to_python(dict(request.params), c)
+            except Invalid, e:
+                return self.edit(
+                        id=id,
+                    values=values,
+                    errors=variabledecode.variable_encode(
+                        e.unpack_errors() or {},
+                        add_repetitions=False
+                    )
+                )
+            else:
+                squadron_q = meta.Session.query(model.Squadron)
+                squadron = squadron_q.filter_by(id=uuid.UUID(id)).first()
+                if squadron is None:
+                    abort(404)
+
+                for f in self.squfields:
+                    setattr(squadron, f.name, result[f.name] )
+
+                meta.Session.commit()
+                return self.view(id=id) 
+        else:
+            raise Exception('Invalid action %s'%action)
 
     #--------------------------------------------------------------
@@ -72 +118 @@
         c.heading = "Edit %s"%squadron.name
         c.squadron = squadron
+        c.squfields = self.squfields
         c.available_pilots = self._get_pilots(squadron.pilots)
+
+        if not values: values = {}
+
+        for f in self.squfields:
+            values[f.name] = getattr(squadron, f.name )
 
         html = render('/derived/page/squadron_edit.html')

trunk/loreality/loreality/model/databases.py

@@ -68 +68 @@
     date = sa.Column(sa.types.Date )
 
+    #- Briefing part
+    situation = sa.Column(sa.types.String)
+    objectives = sa.Column(sa.types.String)
+    flightplan = sa.Column(sa.types.String)
+    threat = sa.Column(sa.types.String)
+    others = sa.Column(sa.types.String)
 
     def __init__( self, name ):

trunk/loreality/loreality/model/form.py

@@ -42 +42 @@
     date =  DateConverter()
 
+    situation = String()
+    objectives = String()
+    flightplan = String()
+    threat = String()
+    others = String()
     
+class SquadronForm(Schema):
+    allow_extra_fields = True
+    filter_extra_fields = True
 
+    pre_validators = [variabledecode.NestedVariables()]
+    name =  String(not_empty=True)
+    pilots = ForEach( Pilot())
+    plane =  String()
+

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

@@ -8 +8 @@
 %endif
 </h2>
-<h3>Date</h3>
-<p>${c.mission.date}</p>
-<h3>Description</h3>
-<p>${c.mission.description}</p>
+% for f in c.misfields:
+<h3>${f.t_name.capitalize()}</h3>
+    <p>${getattr(c.mission, f.name)}</p>
+%endfor
 <h3>Pilots</h3>
 <ul>

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

@@ -7 +7 @@
 % if h.auth.authorized(h.auth.is_creator):
     ${h.form(h.url_for(controller='mission', action='process', id=c.mission.id))}
-    <label for="name">Name</label>
-    ${h.text(name='name')}<br />
-    <label for="description">Description</label>
-    ${h.text(name='description')}<br />
-    <label for="date">Date</label>
-    ${h.text(name='date')}<br />
+
+    % for f in c.misfields:
+    <label for="${f.name}">${f.t_name.capitalize()}</label><br />
+    ${eval("h."+ f.formtype +"(name='" + f.name+ "')")}<br />
+    %endfor
+
     ${h.submit(name="action", value="Modify")}
     </fieldset>