Merge pull request #6 from gisce/FIX_embarrats

Ara LAT i LBT no tenen en compte els embarrats
gisce · Sep 17, 2014 · 4bb11f8 · 4bb11f8
2 parents 1cb21fe + 711f2f6
commit 4bb11f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/libcnmc/res_4603/LAT.py b/libcnmc/res_4603/LAT.py
@@ -40,6 +40,16 @@ def consumer(self):
                 )
                 for tram in linia['trams']:
                     tram = O.GiscedataAtTram.read(tram, fields_to_read)
+
+                    #Comprovar el tipus del cable
+                    cable = O.GiscedataAtCables.read(tram['cable'][0],
+                                                     ['tipus'])
+                    tipus = O.GiscedataAtTipuscable.read(cable['tipus'][0],
+                                                         ['codi'])
+                    #Si el tram tram es embarrat no l'afegim
+                    if tipus['codi'] == 'E':
+                        continue
+
                     #Si el tram es de baixa no l'afegim
                     if tram['baixa']:
                         continue

diff --git a/libcnmc/res_4603/LBT.py b/libcnmc/res_4603/LBT.py
@@ -23,7 +23,7 @@ def __init__(self, **kwargs):
         self.report_name = 'CNMC INVENTARI BT'
 
     def get_sequence(self):
-        search_params = [('baixa', '!=', True)]
+        search_params = [('baixa', '!=', True), ('cable.tipus.codi', '!=', 'E')]
         return self.connection.GiscedataBtElement.search(search_params)
 
     def consumer(self):