Medication preset: key as text

diff --git a/preset.py b/preset.py
index d3790c437fabbfaf833e0ea1ded737d547023ac4..e5e1f380db01cf7c15ad95563b33ca82f7ac7986 100644 (file)
--- a/preset.py
+++ b/preset.py
@@ -12,17 +12,22 @@ class Preset():
     file=""
     data={}
 
-    def __init__(self, file):
+    def __init__(self, file, skip_first=True, text_as_key=False):
         self.file=file;
         self.data={}
-        self.load();
+        self.load(skip_first, text_as_key);
 
-    def load(self):
+    def load(self, skip_first=True, text_as_key=False):
         try:
+            buf={}
             with open(self.file, "r") as f:
                 reader=csv.reader(f)
-                next(reader)
+                if skip_first:
+                    next(reader)
                 for row in reader:
                     self.data[row[0]]=row[1]
+                    if text_as_key:
+                        buf[row[1].strip()]=row[1]
+            self.data = buf | self.data
         except FileNotFoundError as e:
             print(e)

diff --git a/window.py b/window.py
index 0c4f53f20a5f28e0270d4cccecf735a080485381..e7fcd39bed62bec3bdb403882e1adab8d3c8e728 100644 (file)
--- a/window.py
+++ b/window.py
@@ -247,7 +247,7 @@ class MainWindow(QMainWindow):
         self.preset_note=Preset(os.path.join(config["preset_directory"], "note.csv"))
         self.preset_report=Preset(os.path.join(config["preset_directory"], "report.csv"))
         self.preset_investigation=Preset(os.path.join(config["preset_directory"], "investigation.csv"))
-        self.preset_medication=Preset(os.path.join(config["preset_directory"], "medication.csv"))
+        self.preset_medication=Preset(os.path.join(config["preset_directory"], "medication.csv"), text_as_key=True)
         self.preset_advice=Preset(os.path.join(config["preset_directory"], "advice.csv"))
 
         action_new=QAction("New", self)