added water meter layer (#18)

* added water meter layer * added observation into water_meter table * updated qgis template Co-authored-by: mirankunda <60642018+mirankunda@users.noreply.github.com>
WASAC · May 4, 2021 · 2692e72 · 2692e72
1 parent ddf1ad8
commit 2692e72
Show file tree

Hide file tree

Showing 4 changed files with 70,049 additions and 56,786 deletions.
diff --git a/common/tasks.py b/common/tasks.py
@@ -16,6 +16,7 @@
 from layers.valve import Valve
 from layers.wtp import Wtp
 from layers.junction import Junction
+from layers.water_meter import WaterMeter
 
 
 class Tasks(object):
@@ -66,7 +67,7 @@ def execute(self):
                              basemap_file, "dist_id=" + str(self.district.dist_id))
             self.load_layers_pandas([WaterFacilities()], existing_file, "dist_id=" + str(self.district.dist_id))
             self.load_layers_pandas([Chamber(), Pipeline(), PumpingStation(), Reservoir(),
-                              WaterConnection(), WaterSource(), WaterSupplySystem(), Valve(), Wtp(), Junction()],
+                              WaterConnection(), WaterSource(), WaterSupplySystem(), Valve(), Wtp(), Junction(), WaterMeter()],
                              existing_file, "wss_id IN (" + self.district.wss_id_list + ")")
 
             shutil.make_archive(self.folder, 'zip', root_dir=self.folder)

diff --git a/layers/water_meter.py b/layers/water_meter.py
@@ -0,0 +1,7 @@
+from layers.layer_base import LayerBase
+
+
+class WaterMeter(LayerBase):
+    def __init__(self):
+        super().__init__("water_meter")
+        self.parse_dates = ['input_date', 'installation_date']
diff --git a/template/template_gis_database.gpkg b/template/template_gis_database.gpkg