diff --git a/src/ui/dialogs/mail.py b/src/ui/dialogs/mail.py index 0dec446..6ebcc21 100644 --- a/src/ui/dialogs/mail.py +++ b/src/ui/dialogs/mail.py @@ -64,14 +64,7 @@ class Mail_Dialog(QtWidgets.QDialog, MailPreviewDialog): self.gender_male.clicked.connect(self.set_mail) self.gender_non.clicked.connect(self.set_mail) self.btn_okay.clicked.connect(self.createAndSendMail) - # self.send_button.clicked.connect(self.save_mail) - # def set_data(self, data: dict): - # print(data) - # self.prof_name.setText(data["prof_name"]) - # self.mail_name.setText(data["mail_name"]) - # # assign data["general"] to self.data - # self.data = data["general"] def open_new_template(self): logger.log_info("Opening new template dialog") # TODO: implement new mail template dialog @@ -97,13 +90,13 @@ Tel.: 0761/682-778""" self.comboBox.addItem(template) def get_greeting(self): - prof = self.profname + prof = self.profname.split(" ")[0] if self.gender_male.isChecked(): self.btn_okay.setEnabled(True) - return f"Sehr geehrter Herr {prof.split(' ')[-1]}," + return f"Sehr geehrter Herr {prof}," elif self.gender_female.isChecked(): self.btn_okay.setEnabled(True) - return f"Sehr geehrte Frau {prof.split(' ')[-1]}," + return f"Sehr geehrte Frau {prof}," elif self.gender_non.isChecked(): self.btn_okay.setEnabled(True) return f"Guten Tag {prof}," @@ -126,7 +119,7 @@ Tel.: 0761/682-778""" mail_html = "" + mail_html Appname = self.appname mail_html = mail_html.format( - Profname=self.prof_name.text().split(" ")[-1], + Profname=self.profname.split(" ")[0], Appname=Appname, AppNr=self.appid, AppSubject=self.subject,