X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=axes.py;h=23437c10ac01ed3d30ca5838086366ab423fd932;hb=a9e473b2fbdf6f7792fba455d444975b2886c838;hp=0dbbe80e8f689086d98da71d7f2047c08ee75de9;hpb=a654e53007424aab84fe03162ac10686e9f8e04b;p=OpenERP%2Fcmmi.git

diff --git a/axes.py b/axes.py
index 0dbbe80..23437c1 100644
--- a/axes.py
+++ b/axes.py
@@ -40,6 +40,18 @@ class Mesurable(osv.Model):
         return result
 
 
+    def _nb_jours_reel(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for m in self.browse(cr, uid, ids, context=context):
+            if not m.date_reel_deb or not m.date_reel_fin:
+                result[m.id] = 0
+                continue
+            result[m.id] = Mesurable._nb_jours_ouvre_entre_2_dates(
+                        datetime.strptime(m.date_reel_deb, "%Y-%m-%d").date(),
+                        datetime.strptime(m.date_reel_fin, "%Y-%m-%d").date())
+        return result
+
+
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
@@ -54,11 +66,14 @@ class Mesurable(osv.Model):
         "date_reel_deb": fields.date(string="Réel début"),
         "date_reel_fin": fields.date(string="Réel fin"),
         "nb_jours_init": fields.function(_nb_jours_init,
-                                            type="integer",
-                                            string="Nombre de jours initials"),
+                                         type="integer",
+                                         string="Nombre de jours initials"),
         "nb_jours_plan": fields.function(_nb_jours_plan,
-                                            type="integer",
-                                            string="Nombre de jours planifiés"),
+                                         type="integer",
+                                         string="Nombre de jours planifiés"),
+        "nb_jours_reel": fields.function(_nb_jours_reel,
+                                         type="integer",
+                                         string="Nombre de jours réels"),
     }
 
     _defaults = {
@@ -262,6 +277,21 @@ class Palier(osv.Model):
     _types_palier = [("normal", "Normal"), ("exceptionnel", "Exceptionnel"),
                      ("correctif", "Correctif"), ("autre", "Autre")]
 
+
+    def _get_charge_init(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for palier in self.browse(cr, uid, ids, context=context):
+            result[palier.id] = sum([e.charge_init for e in palier.evolutions])
+        return result
+
+
+    def _get_charge_plan(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for palier in self.browse(cr, uid, ids, context=context):
+            result[palier.id] = sum([e.charge_plan for e in palier.evolutions])
+        return result
+
+
     _columns = {
         "type_palier": fields.selection(_types_palier, string="Type"),
         "projet_id": fields.many2one("cmmi.projet",
@@ -273,6 +303,12 @@ class Palier(osv.Model):
         "phases": fields.one2many("cmmi.axes.palier.phase",
                                   "palier_id",
                                   string="Phases"),
+        "charge_init": fields.function(_get_charge_init,
+                                       type="integer",
+                                       string="Charge initiale"),
+        "charge_plan": fields.function(_get_charge_plan,
+                                       type="integer",
+                                       string="Charge plannifiée"),
     }
 
     _defaults = {
@@ -322,6 +358,20 @@ class PalierPhase(osv.Model):
                 zip(ids, self.browse(cr, uid, ids, context=context))])
 
 
+    def _get_charge_init(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for pp in self.browse(cr, uid, ids, context=context):
+            result[pp.id] = sum([p.charge_init for p in pp.phases])
+        return result
+
+
+    def _get_charge_plan(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for pp in self.browse(cr, uid, ids, context=context):
+            result[pp.id] = sum([p.charge_plan for p in pp.phases])
+        return result
+
+
     _columns = {
         "name": fields.function(_get_name,
                                 type='char',
@@ -331,10 +381,19 @@ class PalierPhase(osv.Model):
                                     string="Phase du projet"),
         "palier_id": fields.many2one("cmmi.axes.palier",
                                      string="Palier"),
+        "charge_init": fields.function(_get_charge_init,
+                                       type="integer",
+                                       string="Charge initiale"),
+        "charge_plan": fields.function(_get_charge_plan,
+                                       type="integer",
+                                       string="Charge plannifiée"),
         # backrefs
         "charges": fields.one2many("cmmi.evolution.charge",
                                    "phase_id",
                                    string="Charges"),
+        "phases": fields.one2many("cmmi.evolution.phase",
+                                  "phase_id",
+                                  string="Phases"),
 #        "evolutions": fields.one2many("cmmi.evolution", #Supprimé !
 #                                      "phase_id",
 #                                      string="Evolutions"),
@@ -359,6 +418,21 @@ class Chantier(osv.Model):
 
     _inherit = "cmmi.axes.mesurable"
 
+
+    def _get_charge_init(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for chantier in self.browse(cr, uid, ids, context=context):
+            result[chantier.id] = sum([e.charge_init for e in chantier.evolutions])
+        return result
+
+
+    def _get_charge_plan(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for chantier in self.browse(cr, uid, ids, context=context):
+            result[chantier.id] = sum([e.charge_plan for e in chantier.evolutions])
+        return result
+
+
     _columns = {
         "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet",
@@ -371,4 +445,10 @@ class Chantier(osv.Model):
         "evolutions": fields.one2many("cmmi.evolution",
                                       "chantier_id",
                                       string="Evolutions"),
+        "charge_init": fields.function(_get_charge_init,
+                                       type="integer",
+                                       string="Charge initiale"),
+        "charge_plan": fields.function(_get_charge_plan,
+                                       type="integer",
+                                       string="Charge plannifiée"),
     }