Changeset 2106 for trunk/loreality/loreality/controllers/mission.py

Timestamp:

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

Author:

dart

Message:

LoReality?:
o Update on squadron/mission

File:

• trunk/loreality/loreality/controllers/mission.py (modified) (6 diffs)

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)