From 8e76cf28c7b7bf19404bb84f8f17563cfe77d459 Mon Sep 17 00:00:00 2001 From: Agnibho Mondal Date: Wed, 13 Sep 2023 01:27:13 +0530 Subject: [PATCH] Added reset button to configuration and prescriber window --- data/prescriber/prescriber.json | 2 +- setting.py | 84 ++++++++++++++++++--------------- window.py | 2 +- 3 files changed, 49 insertions(+), 39 deletions(-) diff --git a/data/prescriber/prescriber.json b/data/prescriber/prescriber.json index 097dca5..feb17d9 100644 --- a/data/prescriber/prescriber.json +++ b/data/prescriber/prescriber.json @@ -5,4 +5,4 @@ "address": "", "contact": "", "extra": "" -} +} \ No newline at end of file diff --git a/setting.py b/setting.py index b6e8dba..11bbd51 100644 --- a/setting.py +++ b/setting.py @@ -44,21 +44,21 @@ class EditConfiguration(QMainWindow): raise(e) def save(self): - try: - self.config["data_directory"]=self.input_directory.text() - self.config["prescriber"]=self.input_prescriber.text() - self.config["preset_newline"]=self.input_newline.isChecked() - self.config["preset_delimiter"]=self.input_delimiter.currentText() - self.config["private_key"]=self.input_key.text() - self.config["certificate"]=self.input_certificate.text() - with open(config_file, "w") as f: - f.write(json.dumps(self.config, indent=4)) - QMessageBox.information(self,"Saved", "Configuration saved. Please restart MedScript.") - self.hide() - except Exception as e: - QMessageBox.critical(self,"Failed to save", "Failed to save the data to the file.") - raise(e) - + if(QMessageBox.StandardButton.Yes==QMessageBox.question(self,"Confirm Save", "This action will overwrite the previous configuration. Continue?")): + try: + self.config["data_directory"]=self.input_directory.text() + self.config["prescriber"]=self.input_prescriber.text() + self.config["preset_newline"]=self.input_newline.isChecked() + self.config["preset_delimiter"]=self.input_delimiter.currentText() + self.config["private_key"]=self.input_key.text() + self.config["certificate"]=self.input_certificate.text() + with open(config_file, "w") as f: + f.write(json.dumps(self.config, indent=4)) + QMessageBox.information(self,"Saved", "Configuration saved. Please restart MedScript.") + self.hide() + except Exception as e: + QMessageBox.critical(self,"Failed to save", "Failed to save the data to the file.") + raise(e) def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -104,9 +104,14 @@ class EditConfiguration(QMainWindow): layout_certificate.addWidget(self.input_certificate) layout_certificate.addWidget(btn_certificate) layout.addRow("X509 Certificate", layout_certificate) - button=QPushButton("Save") - button.clicked.connect(self.save) - layout.addWidget(button) + button_save=QPushButton("Save") + button_save.clicked.connect(self.save) + button_reset=QPushButton("Reset") + button_reset.clicked.connect(self.load) + layout_btn=QHBoxLayout() + layout_btn.addWidget(button_save) + layout_btn.addWidget(button_reset) + layout.addRow("", layout_btn) self.statusbar=QStatusBar() self.setStatusBar(self.statusbar) @@ -140,22 +145,22 @@ class EditPrescriber(QMainWindow): raise(e) def save(self): - try: - self.prescriber["name"]=self.input_name.text() - self.prescriber["qualification"]=self.input_qualification.text() - self.prescriber["registration"]=self.input_registration.text() - self.prescriber["address"]=self.input_address.toPlainText() - self.prescriber["contact"]=self.input_contact.text() - self.prescriber["extra"]=self.input_extra.toPlainText() - with open(self.file, "w") as f: - f.write(json.dumps(self.prescriber, indent=4)) - QMessageBox.information(self,"Saved", "Information saved.") - self.signal_save.emit(self.file) - self.hide() - except Exception as e: - QMessageBox.critical(self,"Failed to save", "Failed to save the data to the file.") - raise(e) - + if(QMessageBox.StandardButton.Yes==QMessageBox.question(self,"Confirm Save", "This action will overwrite the previous information. Continue?")): + try: + self.prescriber["name"]=self.input_name.text() + self.prescriber["qualification"]=self.input_qualification.text() + self.prescriber["registration"]=self.input_registration.text() + self.prescriber["address"]=self.input_address.toPlainText() + self.prescriber["contact"]=self.input_contact.text() + self.prescriber["extra"]=self.input_extra.toPlainText() + with open(self.file, "w") as f: + f.write(json.dumps(self.prescriber, indent=4)) + QMessageBox.information(self,"Saved", "Information saved.") + self.signal_save.emit(self.file) + self.hide() + except Exception as e: + QMessageBox.critical(self,"Failed to save", "Failed to save the data to the file.") + raise(e) def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -177,9 +182,14 @@ class EditPrescriber(QMainWindow): layout.addRow("Contact", self.input_contact) self.input_extra=QTextEdit(self) layout.addRow("Extra", self.input_extra) - button=QPushButton("Save") - button.clicked.connect(self.save) - layout.addWidget(button) + button_save=QPushButton("Save") + button_save.clicked.connect(self.save) + button_reset=QPushButton("Reset") + button_reset.clicked.connect(self.load) + layout_btn=QHBoxLayout() + layout_btn.addWidget(button_save) + layout_btn.addWidget(button_reset) + layout.addRow("", layout_btn) self.statusbar=QStatusBar() self.setStatusBar(self.statusbar) diff --git a/window.py b/window.py index 7a1941e..97a1727 100644 --- a/window.py +++ b/window.py @@ -428,7 +428,7 @@ class MainWindow(QMainWindow): action_verify.triggered.connect(self.cmd_verify) action_configuration=QAction("Configuration", self) action_configuration.triggered.connect(self.cmd_configuration) - action_prescriber=QAction("Settings", self) + action_prescriber=QAction("Prescriber", self) action_prescriber.triggered.connect(self.cmd_prescriber) action_switch=QAction("Switch", self) action_switch.triggered.connect(self.cmd_switch) -- 2.39.2