diff --git a/.vs/HospitalServerManager/v15/.suo b/.vs/HospitalServerManager/v15/.suo index b4cd209..6ec707a 100644 Binary files a/.vs/HospitalServerManager/v15/.suo and b/.vs/HospitalServerManager/v15/.suo differ diff --git a/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide b/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide index 002e90e..aa92684 100644 Binary files a/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide and b/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide-shm b/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide-shm index 0b271bb..3679652 100644 Binary files a/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide-shm and b/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide-wal b/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide-wal index 4e12d3d..e74addb 100644 Binary files a/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide-wal and b/.vs/HospitalServerManager/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Model/Basic/Patient.cs b/Model/Basic/Patient.cs index 3ed8cfa..fe49702 100644 --- a/Model/Basic/Patient.cs +++ b/Model/Basic/Patient.cs @@ -23,7 +23,7 @@ namespace HospitalServerManager.Model.Basic } [JsonConstructor] protected Patient(string pesel, string name, string surname, DateTime birthDate, string patientState, - string patientSex) : base(pesel, "PESEL", new List()) + string patientSex, string patientEmail) : base(pesel, "PESEL", new List()) { if (pesel.Length < 11 || pesel.Length > 11) throw new FormatException("PESEL musi mieć 11 cyfr"); @@ -33,6 +33,7 @@ namespace HospitalServerManager.Model.Basic BirthDate = birthDate; PatientState = patientState.GetEnumFromDescription(); PatientSex = patientSex.GetEnumFromDescription(); + EmailAdress = new MailAddress(patientEmail); } public Patient(string pesel, string name, string surname, DateTime birthDate, PatientState patientState, Sex patientSex) : base(pesel, "PESEL", new List()) diff --git a/Model/Controllers/SmtpMailSender.cs b/Model/Controllers/SmtpMailSender.cs index e2e2d78..dc38f76 100644 --- a/Model/Controllers/SmtpMailSender.cs +++ b/Model/Controllers/SmtpMailSender.cs @@ -12,16 +12,12 @@ namespace HospitalServerManager.Model.Controllers class SmtpMailSender { private MailAddress userEmail; - SmtpClient emailClient = new SmtpClient("smtp-mail.outlook.com", 587); + SmtpClient emailClient = new SmtpClient("poczta.o2.pl", 587); public SmtpMailSender() { // TODO: Więcej interfejsów ! - emailClient.Credentials = new NetworkCredential("margrz29@st.amu.edu.pl", "M@rce!7364818M"); - userEmail = new MailAddress("margrz29@st.amu.edu.pl"); - /*emailClient.Credentials = new NetworkCredential("konstancja01@wp.pl", "mikapako12"); - userEmail = new MailAddress("konstancja01@wp.pl");*/ - /*emailClient.Credentials = new NetworkCredential("emailforapplication@o2.pl", "emailforapp"); - userEmail = new MailAddress("emailforapplication@o2.pl");*/ + emailClient.Credentials = new NetworkCredential("emailforapplication@o2.pl", "emailforapp"); + userEmail = new MailAddress("emailforapplication@o2.pl"); emailClient.UseDefaultCredentials = false; } public SmtpMailSender(string userName, string password) @@ -33,19 +29,17 @@ namespace HospitalServerManager.Model.Controllers public async Task SendEmailAsync(string sendTo, string textBody, string subject) { // TODO: Dodać walidację ! - MailMessage mailMessage = new MailMessage("margrz29@st.amu.edu.pl", "margrz29@st.amu.edu.pl"/*userEmail, new MailAddress(sendTo)*/); + MailMessage mailMessage = new MailMessage(userEmail, new MailAddress(sendTo)); mailMessage.Body = textBody; mailMessage.Subject = subject; emailClient.DeliveryMethod = SmtpDeliveryMethod.Network; - //emailClient.DeliveryMethod = SmtpDeliveryMethod.Network; - //await emailClient.SendMailAsync(mailMessage); await SendEmailAsync(mailMessage); } public async Task SendEmailAsync(MailMessage completeMailMessage) { // TODO: Dodać walidację ! emailClient.SendCompleted += EmailClient_SendCompleted; - emailClient.Send(completeMailMessage); + await emailClient.SendMailAsync(completeMailMessage); } private void EmailClient_SendCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e) diff --git a/View/AdmissionsPage.xaml b/View/AdmissionsPage.xaml index cfbea26..a3b6bcd 100644 --- a/View/AdmissionsPage.xaml +++ b/View/AdmissionsPage.xaml @@ -15,7 +15,7 @@ --> - + diff --git a/View/DiagnosesPage.xaml b/View/DiagnosesPage.xaml index 88ae747..14bafe6 100644 --- a/View/DiagnosesPage.xaml +++ b/View/DiagnosesPage.xaml @@ -12,7 +12,7 @@ - + diff --git a/View/DoctorsPage.xaml b/View/DoctorsPage.xaml index bd5d272..4e46fb7 100644 --- a/View/DoctorsPage.xaml +++ b/View/DoctorsPage.xaml @@ -15,7 +15,7 @@ --> - + diff --git a/View/PatientsPage.xaml b/View/PatientsPage.xaml index 4836875..28fc6e1 100644 --- a/View/PatientsPage.xaml +++ b/View/PatientsPage.xaml @@ -16,7 +16,7 @@ --> - + diff --git a/View/RoomsPage.xaml b/View/RoomsPage.xaml index 446cbb6..1a4dd9d 100644 --- a/View/RoomsPage.xaml +++ b/View/RoomsPage.xaml @@ -13,7 +13,7 @@ - + diff --git a/View/SurgeriesPage.xaml b/View/SurgeriesPage.xaml index 776cd71..876614f 100644 --- a/View/SurgeriesPage.xaml +++ b/View/SurgeriesPage.xaml @@ -15,7 +15,7 @@ --> - + diff --git a/ViewModel/Controllers/DatabaseReader.cs b/ViewModel/Controllers/DatabaseReader.cs index 0184ab3..1788407 100644 --- a/ViewModel/Controllers/DatabaseReader.cs +++ b/ViewModel/Controllers/DatabaseReader.cs @@ -11,6 +11,8 @@ namespace HospitalServerManager.ViewModel.Controllers { class DatabaseReader { + // KLASA ZNALAZŁA SIĘ TUTAJ TYLKO DLA POMOCY PRZY TESTOWANIU POCZĄTKOWEJ WERSJI APLIKACJI, NIE PODŁĄCZONEJ JESZCZE DO SIECI. + // Postanowiłem, że ją zostawię na przyszłość private List _ModelsList { get; set; } public IReadOnlyList LastReadedModels { get => _ModelsList; } diff --git a/ViewModel/Controllers/MailService.cs b/ViewModel/Controllers/MailService.cs deleted file mode 100644 index aeb3d12..0000000 --- a/ViewModel/Controllers/MailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HospitalServerManager.ViewModel.Controllers -{ - class MailService - { - } -} diff --git a/ViewModel/PatientViewModel.cs b/ViewModel/PatientViewModel.cs index 4ad00be..0212fde 100644 --- a/ViewModel/PatientViewModel.cs +++ b/ViewModel/PatientViewModel.cs @@ -48,7 +48,7 @@ namespace HospitalServerManager.ViewModel public MailAddress GetEmailAdress() { - return new MailAddress("paker_7@o2.pl"); + return model.EmailAdress; } } } diff --git a/ViewModel/RosterViewModel.cs b/ViewModel/RosterViewModel.cs index ae90941..9398b08 100644 --- a/ViewModel/RosterViewModel.cs +++ b/ViewModel/RosterViewModel.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Net.Mail; using System.Text; using System.Threading.Tasks; using HospitalServerManager.InterfacesAndEnums; using HospitalServerManager.Model; using HospitalServerManager.Model.Basic; using HospitalServerManager.Model.Controllers; +using Windows.UI.Popups; namespace HospitalServerManager.ViewModel { @@ -99,7 +101,14 @@ namespace HospitalServerManager.ViewModel } public async void SendEmailAsync(IHasEmailAdress sendToModel) { - await mailSender.SendEmailAsync(sendToModel.GetEmailAdress().Address, "WIADOMOSC TESTOWA", "TEMAT TEST"); + try + { + await mailSender.SendEmailAsync(sendToModel.GetEmailAdress().Address, "WIADOMOSC TESTOWA", "TEMAT TEST"); + } + catch (SmtpException e) + { + await new MessageDialog("Błąd połączenia z serwerem poczty | " + e.Message).ShowAsync(); + } } } diff --git a/bin/x86/Debug/App.xbf b/bin/x86/Debug/App.xbf index 53e1f8e..bf7806e 100644 Binary files a/bin/x86/Debug/App.xbf and b/bin/x86/Debug/App.xbf differ diff --git a/bin/x86/Debug/AppX/App.xbf b/bin/x86/Debug/AppX/App.xbf index 53e1f8e..bf7806e 100644 Binary files a/bin/x86/Debug/AppX/App.xbf and b/bin/x86/Debug/AppX/App.xbf differ diff --git a/bin/x86/Debug/AppX/View/AdmissionsPage.xbf b/bin/x86/Debug/AppX/View/AdmissionsPage.xbf index 1e5e325..4c94c28 100644 Binary files a/bin/x86/Debug/AppX/View/AdmissionsPage.xbf and b/bin/x86/Debug/AppX/View/AdmissionsPage.xbf differ diff --git a/bin/x86/Debug/AppX/View/DiagnosesPage.xbf b/bin/x86/Debug/AppX/View/DiagnosesPage.xbf index 0f41b57..711bf0c 100644 Binary files a/bin/x86/Debug/AppX/View/DiagnosesPage.xbf and b/bin/x86/Debug/AppX/View/DiagnosesPage.xbf differ diff --git a/bin/x86/Debug/AppX/View/DoctorsPage.xbf b/bin/x86/Debug/AppX/View/DoctorsPage.xbf index 4e55040..0b76960 100644 Binary files a/bin/x86/Debug/AppX/View/DoctorsPage.xbf and b/bin/x86/Debug/AppX/View/DoctorsPage.xbf differ diff --git a/bin/x86/Debug/AppX/View/EditRecordDialog.xbf b/bin/x86/Debug/AppX/View/EditRecordDialog.xbf index f15c8b9..e9dfd76 100644 Binary files a/bin/x86/Debug/AppX/View/EditRecordDialog.xbf and b/bin/x86/Debug/AppX/View/EditRecordDialog.xbf differ diff --git a/bin/x86/Debug/AppX/View/MainFrameView.xbf b/bin/x86/Debug/AppX/View/MainFrameView.xbf index 1690cdc..437ddb7 100644 Binary files a/bin/x86/Debug/AppX/View/MainFrameView.xbf and b/bin/x86/Debug/AppX/View/MainFrameView.xbf differ diff --git a/bin/x86/Debug/AppX/View/NewAdmissionPage.xbf b/bin/x86/Debug/AppX/View/NewAdmissionPage.xbf index dcf1b36..9cce31c 100644 Binary files a/bin/x86/Debug/AppX/View/NewAdmissionPage.xbf and b/bin/x86/Debug/AppX/View/NewAdmissionPage.xbf differ diff --git a/bin/x86/Debug/AppX/View/NewRecordDialog.xbf b/bin/x86/Debug/AppX/View/NewRecordDialog.xbf index 420cb4e..25e2c46 100644 Binary files a/bin/x86/Debug/AppX/View/NewRecordDialog.xbf and b/bin/x86/Debug/AppX/View/NewRecordDialog.xbf differ diff --git a/bin/x86/Debug/AppX/View/PatientsPage.xbf b/bin/x86/Debug/AppX/View/PatientsPage.xbf index e8f219f..354e07b 100644 Binary files a/bin/x86/Debug/AppX/View/PatientsPage.xbf and b/bin/x86/Debug/AppX/View/PatientsPage.xbf differ diff --git a/bin/x86/Debug/AppX/View/RoomsPage.xbf b/bin/x86/Debug/AppX/View/RoomsPage.xbf index 9bf2146..a35d4f8 100644 Binary files a/bin/x86/Debug/AppX/View/RoomsPage.xbf and b/bin/x86/Debug/AppX/View/RoomsPage.xbf differ diff --git a/bin/x86/Debug/AppX/View/SurgeriesPage.xbf b/bin/x86/Debug/AppX/View/SurgeriesPage.xbf index fa566a7..541940c 100644 Binary files a/bin/x86/Debug/AppX/View/SurgeriesPage.xbf and b/bin/x86/Debug/AppX/View/SurgeriesPage.xbf differ diff --git a/bin/x86/Debug/AppX/entrypoint/HospitalServerManager.exe b/bin/x86/Debug/AppX/entrypoint/HospitalServerManager.exe index dc6098a..aad889f 100644 Binary files a/bin/x86/Debug/AppX/entrypoint/HospitalServerManager.exe and b/bin/x86/Debug/AppX/entrypoint/HospitalServerManager.exe differ diff --git a/bin/x86/Debug/AppX/vs.appxrecipe b/bin/x86/Debug/AppX/vs.appxrecipe index f6f83e8..09f13af 100644 --- a/bin/x86/Debug/AppX/vs.appxrecipe +++ b/bin/x86/Debug/AppX/vs.appxrecipe @@ -30,13 +30,13 @@ AppxManifest.xml true - 2019-01-11T21:26:47.854 + 2019-01-12T10:19:48.459 entrypoint\HospitalServerManager.exe - 2019-01-11T21:26:47.533 + 2019-01-12T10:19:48.092 Newtonsoft.Json.dll @@ -742,47 +742,47 @@ App.xbf - 2019-01-11T21:26:47.293 + 2019-01-12T10:19:47.843 View\AdmissionsPage.xbf - 2019-01-11T21:26:47.293 + 2019-01-12T10:19:47.843 View\DiagnosesPage.xbf - 2019-01-11T21:26:47.293 + 2019-01-12T10:19:47.843 View\DoctorsPage.xbf - 2019-01-11T21:26:47.293 + 2019-01-12T10:19:47.843 View\EditRecordDialog.xbf - 2019-01-11T21:26:47.293 + 2019-01-12T10:19:47.844 View\MainFrameView.xbf - 2019-01-11T21:26:47.294 + 2019-01-12T10:19:47.844 View\NewAdmissionPage.xbf - 2019-01-11T21:26:47.294 + 2019-01-12T10:19:47.844 View\NewRecordDialog.xbf - 2019-01-11T21:26:47.294 + 2019-01-12T10:19:47.844 View\PatientsPage.xbf - 2019-01-11T21:26:47.294 + 2019-01-12T10:19:47.844 View\RoomsPage.xbf - 2019-01-11T21:26:47.294 + 2019-01-12T10:19:47.845 View\SurgeriesPage.xbf - 2019-01-11T21:26:47.295 + 2019-01-12T10:19:47.845 WinMetadata\Windows.winmd @@ -794,7 +794,7 @@ HospitalServerManager.exe - 2019-01-11T21:26:47.850 + 2019-01-12T10:19:48.453 diff --git a/bin/x86/Debug/HospitalServerManager.exe b/bin/x86/Debug/HospitalServerManager.exe index dc6098a..aad889f 100644 Binary files a/bin/x86/Debug/HospitalServerManager.exe and b/bin/x86/Debug/HospitalServerManager.exe differ diff --git a/bin/x86/Debug/HospitalServerManager.pdb b/bin/x86/Debug/HospitalServerManager.pdb index 5e6e601..b3dae11 100644 Binary files a/bin/x86/Debug/HospitalServerManager.pdb and b/bin/x86/Debug/HospitalServerManager.pdb differ diff --git a/bin/x86/Debug/View/AdmissionsPage.xbf b/bin/x86/Debug/View/AdmissionsPage.xbf index 1e5e325..4c94c28 100644 Binary files a/bin/x86/Debug/View/AdmissionsPage.xbf and b/bin/x86/Debug/View/AdmissionsPage.xbf differ diff --git a/bin/x86/Debug/View/DiagnosesPage.xbf b/bin/x86/Debug/View/DiagnosesPage.xbf index 0f41b57..711bf0c 100644 Binary files a/bin/x86/Debug/View/DiagnosesPage.xbf and b/bin/x86/Debug/View/DiagnosesPage.xbf differ diff --git a/bin/x86/Debug/View/DoctorsPage.xbf b/bin/x86/Debug/View/DoctorsPage.xbf index 4e55040..0b76960 100644 Binary files a/bin/x86/Debug/View/DoctorsPage.xbf and b/bin/x86/Debug/View/DoctorsPage.xbf differ diff --git a/bin/x86/Debug/View/EditRecordDialog.xbf b/bin/x86/Debug/View/EditRecordDialog.xbf index f15c8b9..e9dfd76 100644 Binary files a/bin/x86/Debug/View/EditRecordDialog.xbf and b/bin/x86/Debug/View/EditRecordDialog.xbf differ diff --git a/bin/x86/Debug/View/MainFrameView.xbf b/bin/x86/Debug/View/MainFrameView.xbf index 1690cdc..437ddb7 100644 Binary files a/bin/x86/Debug/View/MainFrameView.xbf and b/bin/x86/Debug/View/MainFrameView.xbf differ diff --git a/bin/x86/Debug/View/NewAdmissionPage.xbf b/bin/x86/Debug/View/NewAdmissionPage.xbf index dcf1b36..9cce31c 100644 Binary files a/bin/x86/Debug/View/NewAdmissionPage.xbf and b/bin/x86/Debug/View/NewAdmissionPage.xbf differ diff --git a/bin/x86/Debug/View/NewRecordDialog.xbf b/bin/x86/Debug/View/NewRecordDialog.xbf index 420cb4e..25e2c46 100644 Binary files a/bin/x86/Debug/View/NewRecordDialog.xbf and b/bin/x86/Debug/View/NewRecordDialog.xbf differ diff --git a/bin/x86/Debug/View/PatientsPage.xbf b/bin/x86/Debug/View/PatientsPage.xbf index e8f219f..354e07b 100644 Binary files a/bin/x86/Debug/View/PatientsPage.xbf and b/bin/x86/Debug/View/PatientsPage.xbf differ diff --git a/bin/x86/Debug/View/RoomsPage.xbf b/bin/x86/Debug/View/RoomsPage.xbf index 9bf2146..a35d4f8 100644 Binary files a/bin/x86/Debug/View/RoomsPage.xbf and b/bin/x86/Debug/View/RoomsPage.xbf differ diff --git a/bin/x86/Debug/View/SurgeriesPage.xbf b/bin/x86/Debug/View/SurgeriesPage.xbf index fa566a7..541940c 100644 Binary files a/bin/x86/Debug/View/SurgeriesPage.xbf and b/bin/x86/Debug/View/SurgeriesPage.xbf differ diff --git a/obj/x86/Debug/App.xbf b/obj/x86/Debug/App.xbf index 53e1f8e..bf7806e 100644 Binary files a/obj/x86/Debug/App.xbf and b/obj/x86/Debug/App.xbf differ diff --git a/obj/x86/Debug/HospitalServerManager.csproj.CoreCompileInputs.cache b/obj/x86/Debug/HospitalServerManager.csproj.CoreCompileInputs.cache index 3a58c56..696fcb4 100644 --- a/obj/x86/Debug/HospitalServerManager.csproj.CoreCompileInputs.cache +++ b/obj/x86/Debug/HospitalServerManager.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -047462d3464f4c463d63a2cd80aec82b38733e4c +cc2ca0724f1eed9264fe3e20329d567b0623f618 diff --git a/obj/x86/Debug/HospitalServerManager.exe b/obj/x86/Debug/HospitalServerManager.exe index dc6098a..aad889f 100644 Binary files a/obj/x86/Debug/HospitalServerManager.exe and b/obj/x86/Debug/HospitalServerManager.exe differ diff --git a/obj/x86/Debug/HospitalServerManager.pdb b/obj/x86/Debug/HospitalServerManager.pdb index 5e6e601..b3dae11 100644 Binary files a/obj/x86/Debug/HospitalServerManager.pdb and b/obj/x86/Debug/HospitalServerManager.pdb differ diff --git a/obj/x86/Debug/View/AdmissionsPage.g.cs b/obj/x86/Debug/View/AdmissionsPage.g.cs index 5089b91..f5ee2f3 100644 --- a/obj/x86/Debug/View/AdmissionsPage.g.cs +++ b/obj/x86/Debug/View/AdmissionsPage.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\AdmissionsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4D2B04A0ACD4E8803760518066DE8FB2" +#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\AdmissionsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7EFC6391EB41EE5E3BFDBC7647881297" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/obj/x86/Debug/View/AdmissionsPage.g.i.cs b/obj/x86/Debug/View/AdmissionsPage.g.i.cs index 28b82a8..c23faec 100644 --- a/obj/x86/Debug/View/AdmissionsPage.g.i.cs +++ b/obj/x86/Debug/View/AdmissionsPage.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\AdmissionsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4D2B04A0ACD4E8803760518066DE8FB2" +#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\AdmissionsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7EFC6391EB41EE5E3BFDBC7647881297" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/obj/x86/Debug/View/AdmissionsPage.xaml b/obj/x86/Debug/View/AdmissionsPage.xaml deleted file mode 100644 index 2fda01b..0000000 --- a/obj/x86/Debug/View/AdmissionsPage.xaml +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -