Revert "fix structure condition field"

This reverts commit 7436e4d.
QGEP · Sep 6, 2019 · af591a8 · af591a8
1 parent 1fa1776
commit af591a8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/wincan2qgep/gui/databrowserdialog.py b/wincan2qgep/gui/databrowserdialog.py
@@ -266,7 +266,7 @@ def on_importButton_clicked(self):
                                 features[rf['ws_obj_id']] = {
                                     'maintenance': QgsFeature(mf),
                                     'damages': [], 'pictures': [],
-                                    'ws_structure_condition': 4
+                                    'structure_condition': 4
                                 }
 
                         else:
@@ -340,7 +340,7 @@ def on_importButton_clicked(self):
                                 features[ws_obj_id]['damages'].append(df)
                                 features[ws_obj_id]['pictures'].append(pics)
                                 structure_condition = min(structure_condition, observation['Rate'])
-                                features[ws_obj_id]['ws_structure_condition'] = structure_condition
+                                features[ws_obj_id]['structure_condition'] = structure_condition
                 self.progressBar.setValue(i)
                 i += 1
 
@@ -363,7 +363,7 @@ def on_importButton_clicked(self):
                 maintenance = elements['maintenance']
                 damages = elements['damages']
                 pictures = elements['pictures']
-                structure_condition = elements['ws_structure_condition']
+                structure_condition = elements['structure_condition']
 
                 if len(damages) == 0:
                     continue
@@ -429,9 +429,9 @@ def on_importButton_clicked(self):
                     rf = next(wsl.getFeatures(request))
                 if rf.isValid():
                     # update structure condition if worse
-                    old_level = structure_condition_2_damage_level(rf['ws_structure_condition'])
+                    old_level = structure_condition_2_damage_level(rf['structure_condition'])
                     if old_level is None or old_level > 'Z{}'.format(structure_condition):
-                        rf['ws_structure_condition'] = damage_level_2_structure_condition(structure_condition)
+                        rf['structure_condition'] = damage_level_2_structure_condition(structure_condition)
                         wsl.updateFeature(rf)
 
                 i += 1