diff --git a/.vs/HospitalServerManager/v15/.suo b/.vs/HospitalServerManager/v15/.suo
index 760c65e..b4cd209 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 a687ca1..002e90e 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 399190d..0b271bb 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 1e69014..4e12d3d 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/App.xaml b/App.xaml
index 878dbd3..b7fedb8 100644
--- a/App.xaml
+++ b/App.xaml
@@ -2,6 +2,7 @@
x:Class="HospitalServerManager.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:HospitalServerManager">
+ xmlns:local="using:HospitalServerManager"
+ RequestedTheme="Light">
diff --git a/HospitalServerManager.csproj b/HospitalServerManager.csproj
index 226ce53..5f6feda 100644
--- a/HospitalServerManager.csproj
+++ b/HospitalServerManager.csproj
@@ -100,6 +100,7 @@
+
@@ -112,6 +113,7 @@
+
@@ -137,6 +139,9 @@
MainFrameView.xaml
+
+ NewAdmissionPage.xaml
+
NewRecordDialog.xaml
@@ -146,8 +151,8 @@
RoomsPage.xaml
-
- ColumnListView.xaml
+
+ SurgeriesPage.xaml
@@ -191,6 +196,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -203,7 +212,7 @@
Designer
MSBuild:Compile
-
+
Designer
MSBuild:Compile
diff --git a/InterfacesAndEnums/Interfaces.cs b/InterfacesAndEnums/Interfaces.cs
index a8c7e02..da3f749 100644
--- a/InterfacesAndEnums/Interfaces.cs
+++ b/InterfacesAndEnums/Interfaces.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Net.Mail;
using System.Text;
using System.Threading.Tasks;
using Windows.UI.Xaml.Controls;
@@ -50,4 +51,9 @@ namespace HospitalServerManager.InterfacesAndEnums
IEnumerable GetColumnNames(string tableName);
IDictionary GetColumnTypesNames(string tableName);
}
+ public interface IHasEmailAdress
+ {
+ bool IsEmailAdressInitialized();
+ MailAddress GetEmailAdress();
+ }
}
diff --git a/Model/Basic/Patient.cs b/Model/Basic/Patient.cs
index c27d4ff..3ed8cfa 100644
--- a/Model/Basic/Patient.cs
+++ b/Model/Basic/Patient.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Net.Mail;
using System.Text;
using System.Threading.Tasks;
using HospitalServerManager.InterfacesAndEnums;
@@ -15,6 +16,7 @@ namespace HospitalServerManager.Model.Basic
public DateTime BirthDate { get; protected set; }
public PatientState PatientState { get; protected set; }
public Sex PatientSex { get; protected set; }
+ public MailAddress EmailAdress { get; protected set; }
protected Patient() : base()
{
diff --git a/Model/Basic/Surgery.cs b/Model/Basic/Surgery.cs
index 77e68db..2f2737a 100644
--- a/Model/Basic/Surgery.cs
+++ b/Model/Basic/Surgery.cs
@@ -1,4 +1,5 @@
using HospitalServerManager.InterfacesAndEnums;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -25,5 +26,15 @@ namespace HospitalServerManager.Model.Basic
Cost = decimal.Parse(listOfValues[4]);
Refoundation = int.Parse(listOfValues[5]) > 100 ? 100 : int.Parse(listOfValues[5]);
}
+ [JsonConstructor]
+ protected Surgery(string operationID, string name, string averageTime, string operationType, decimal cost, int refoundation)
+ :base(operationID, "Id_operacji", new List())
+ {
+ SurgeryName = name;
+ AverageTime = TimeSpan.Parse(averageTime);
+ KindOfSurgery = operationType.GetEnumFromDescription();
+ Cost = cost;
+ Refoundation = refoundation;
+ }
}
}
diff --git a/Model/Controllers/SmtpMailSender.cs b/Model/Controllers/SmtpMailSender.cs
new file mode 100644
index 0000000..e2e2d78
--- /dev/null
+++ b/Model/Controllers/SmtpMailSender.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI.Popups;
+
+namespace HospitalServerManager.Model.Controllers
+{
+ class SmtpMailSender
+ {
+ private MailAddress userEmail;
+ SmtpClient emailClient = new SmtpClient("smtp-mail.outlook.com", 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.UseDefaultCredentials = false;
+ }
+ public SmtpMailSender(string userName, string password)
+ {
+ userEmail = new MailAddress(userName);
+ emailClient.EnableSsl = true;
+ emailClient.Credentials = new NetworkCredential(userName, password);
+ }
+ 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.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);
+ }
+
+ private void EmailClient_SendCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
+ {
+ // TODO: Dodać Cancell
+ var token = e.UserState;
+ if (e.Error != null)
+ {
+ new MessageDialog("ERRORS : " + e.Error.ToString());
+ }
+ else
+ {
+ new MessageDialog("EMAIL SEND : " + token.ToString());
+ }
+ }
+ }
+}
diff --git a/Model/Controllers/WebService.cs b/Model/Controllers/WebService.cs
index 4448c18..07c1b62 100644
--- a/Model/Controllers/WebService.cs
+++ b/Model/Controllers/WebService.cs
@@ -108,6 +108,9 @@ namespace HospitalServerManager.Model.Controllers
using (var response = await httpClient.SendAsync(message))
{
response.EnsureSuccessStatusCode();
+ var str = await response.Content.ReadAsStringAsync();
+ if (str == "ERROR")
+ return false;
return true;
}
}
@@ -118,6 +121,9 @@ namespace HospitalServerManager.Model.Controllers
using (var response = await httpClient.SendAsync(message))
{
response.EnsureSuccessStatusCode();
+ var str = await response.Content.ReadAsStringAsync();
+ if(str == "ERROR")
+ return false;
return true;
}
}
@@ -128,6 +134,9 @@ namespace HospitalServerManager.Model.Controllers
using (var response = await httpClient.SendAsync(message))
{
response.EnsureSuccessStatusCode();
+ var str = await response.Content.ReadAsStringAsync();
+ if (str == "ERROR")
+ return false;
return true;
}
}
diff --git a/Model/ModelRoster.cs b/Model/ModelRoster.cs
index 5823d0d..448df51 100644
--- a/Model/ModelRoster.cs
+++ b/Model/ModelRoster.cs
@@ -20,7 +20,7 @@ namespace HospitalServerManager.Model
public IDictionary ColumnTypes { get; private set; }
public Dictionary EnumTypes { get; protected set; }
public IEnumerable ModelsEnumerable { get => _modelsList; }
- //private Controllers.DatabaseReader DatabaseReader = new Controllers.DatabaseReader();
+
public ModelRoster()
{
ActualTableName = string.Empty;
@@ -37,8 +37,30 @@ namespace HospitalServerManager.Model
/*ColumnNames = await GetColumnNames();
ColumnTypes = await GetColumnTypes();*/
IEnumerable response = new List();
- if(tableName == "Pacjenci") response = await webService.GetRecordAsync(tableName);
- else if(tableName == "Lekarze") response = await webService.GetRecordAsync(tableName);
+ switch (tableName)
+ {
+ case "Przyjecia":
+ response = await webService.GetRecordAsync(tableName);
+ break;
+ case "Pacjenci":
+ response = await webService.GetRecordAsync(tableName);
+ break;
+ case "Lekarze":
+ response = await webService.GetRecordAsync(tableName);
+ break;
+ case "Diagnozy":
+ response = await webService.GetRecordAsync(tableName);
+ break;
+ case "Operacje":
+ response = await webService.GetRecordAsync(tableName);
+ break;
+ case "Sale":
+ response = await webService.GetRecordAsync(tableName);
+ break;
+ default:
+ response = null;
+ break;
+ }
_modelsList.AddRange(response);
}
public async Task> GetColumnNames(string tableName)
@@ -58,15 +80,17 @@ namespace HospitalServerManager.Model
ColumnTypes = await webService.GetColumnTypesAsync(ActualTableName);
return ColumnTypes;
}
- public async void CreateRecord(string tableName, IEnumerable valueList)
+ public async Task CreateRecordAsync(string tableName, IEnumerable valueList)
{
- await webService.CreateNewRecordAsync(tableName, valueList);
+ if (!await webService.CreateNewRecordAsync(tableName, valueList))
+ await new MessageDialog("Wystąpił błąd, sprawdź poprawność danych").ShowAsync();
}
- public async void UpdateRecord(string tableName, string primaryKey, string primaryKeyName, string fieldToUpdate, string valueToUpdate)
+ public async Task UpdateRecordAsync(string tableName, string primaryKey, string primaryKeyName, string fieldToUpdate, string valueToUpdate)
{
- await webService.UpdateRecordAsync(tableName, primaryKey, primaryKeyName, fieldToUpdate, valueToUpdate);
+ if(!await webService.UpdateRecordAsync(tableName, primaryKey, primaryKeyName, fieldToUpdate, valueToUpdate))
+ await new MessageDialog("Wystąpił błąd, sprawdź poprawność danych").ShowAsync();
}
- public async void DeleteRecord(string tableName, SqlTable modelToDelete)
+ public async Task DeleteRecordAsync(string tableName, SqlTable modelToDelete)
{
if(!(modelToDelete is Admission))
{
@@ -81,15 +105,17 @@ namespace HospitalServerManager.Model
response = await mDialog.ShowAsync();
if (response == mDialog.Commands.First())
{
- DeleteRecord("Przyjecia", modelToDelete.PrimaryKey, GetForeignKeyNameFromAdmissionsTable(tableName));
- DeleteRecord(tableName, modelToDelete.PrimaryKey, modelToDelete.PrimaryKeyName);
+ await DeleteRecord("Przyjecia", modelToDelete.PrimaryKey, GetForeignKeyNameFromAdmissionsTable(tableName));
+ await DeleteRecord(tableName, modelToDelete.PrimaryKey, modelToDelete.PrimaryKeyName);
}
}
+ else
+ await DeleteRecord(tableName, modelToDelete.PrimaryKey, modelToDelete.PrimaryKeyName);
}
else
- DeleteRecord(tableName, modelToDelete.PrimaryKey, modelToDelete.PrimaryKeyName);
+ await DeleteRecord(tableName, modelToDelete.PrimaryKey, modelToDelete.PrimaryKeyName);
}
- private async void DeleteRecord(string tableName, string primaryKey, string primaryKeyName)
+ private async Task DeleteRecord(string tableName, string primaryKey, string primaryKeyName)
{
await webService.DeleteRecordAsync(tableName, primaryKey, primaryKeyName);
}
@@ -199,6 +225,7 @@ namespace HospitalServerManager.Model
}
_modelsList.AddRange(response);
}
+
public async Task Search(string tableName, string orderBy, string criterium, string searchIn, string searchValue)
{
_modelsList.Clear();
diff --git a/View/AdmissionsPage.xaml b/View/AdmissionsPage.xaml
index 2b77429..cfbea26 100644
--- a/View/AdmissionsPage.xaml
+++ b/View/AdmissionsPage.xaml
@@ -7,7 +7,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
- Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Loaded="Page_Loaded">
+ Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -31,7 +31,7 @@
-
+
@@ -88,8 +88,6 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -154,25 +152,25 @@
-
-
-
-
-
-
-
-
-
diff --git a/View/AdmissionsPage.xaml.cs b/View/AdmissionsPage.xaml.cs
index ffee190..06c366a 100644
--- a/View/AdmissionsPage.xaml.cs
+++ b/View/AdmissionsPage.xaml.cs
@@ -2,17 +2,9 @@
using HospitalServerManager.ViewModel;
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
//Szablon elementu Pusta strona jest udokumentowany na stronie https://go.microsoft.com/fwlink/?LinkId=234238
@@ -37,7 +29,7 @@ namespace HospitalServerManager.View
if (dialogResult == ContentDialogResult.Primary && createDialog.ValuesOfNewObject.Any())
{
List valuesList = createDialog.ValuesOfNewObject;
- RosterViewModel.CreateRecord("Przyjecia", valuesList);
+ await RosterViewModel.CreateRecordAsync("Przyjecia", valuesList);
}
}
private async void EditRecord()
@@ -51,7 +43,7 @@ namespace HospitalServerManager.View
{
string result = dialog.Result;
string fieldToEdit = dialog.FieldToUpdate;
- RosterViewModel.UpdateRecord("Przyjecia", admission, fieldToEdit, result);
+ await RosterViewModel.UpdateRecordAsync("Przyjecia", admission, fieldToEdit, result);
}
}
public void Sort(string orderBy, string criterium)
@@ -101,15 +93,15 @@ namespace HospitalServerManager.View
private async void ResetButton_Click(object sender, RoutedEventArgs e)
{
- await RosterViewModel.Read(typeof(AdmissionViewModel), "Przyjecia");
+ await RosterViewModel.ReadAsync(typeof(AdmissionViewModel), "Przyjecia");
}
- private void DeleteButton_Click(object sender, RoutedEventArgs e)
+ private async void DeleteButton_Click(object sender, RoutedEventArgs e)
{
if (databaseView.SelectedItem != null)
{
var admission = databaseView.SelectedItem as IPrimaryKeyGetable;
- RosterViewModel.DeleteRecord("Przyjecia", admission);
+ await RosterViewModel.DeleteRecordAsync("Przyjecia", admission);
}
}
@@ -119,29 +111,20 @@ namespace HospitalServerManager.View
EditRecord();
}
- private void NewRecordButton_Click(object sender, RoutedEventArgs e)
- {
- NewRecord();
- }
#endregion
protected async override void OnNavigatedTo(NavigationEventArgs e)
{
- //await RosterViewModel.Read(typeof(AdmissionViewModel), "Przyjecia");
- await RosterViewModel.InitializeViewModels("Przyjecia");
+ await RosterViewModel.InitializeViewModelsAsync("Przyjecia");
databaseView.ItemsSource = RosterViewModel.ModelsCollection;
lookInComboBox.ItemsSource = sortComboBox.ItemsSource = RosterViewModel.ColumnNames;
lookInComboBox.SelectedIndex = sortComboBox.SelectedIndex = 0;
- }
-
- private async void Page_Loaded(object sender, RoutedEventArgs e)
- {
- ;
+ btnNewRecord.Click += (sender, x) => (e.Parameter as Action).Invoke();
}
public void UnloadPage()
{
- //throw new NotImplementedException();
+ ;
}
}
}
diff --git a/View/DiagnosesPage.xaml b/View/DiagnosesPage.xaml
index 3d11e1c..88ae747 100644
--- a/View/DiagnosesPage.xaml
+++ b/View/DiagnosesPage.xaml
@@ -25,7 +25,7 @@
-
@@ -85,8 +85,6 @@
-
-
+
-
-
-
-
+
+
+
+
@@ -131,20 +129,20 @@
-
+
-
-
-
diff --git a/View/DiagnosesPage.xaml.cs b/View/DiagnosesPage.xaml.cs
index d8ce2c0..633c0e4 100644
--- a/View/DiagnosesPage.xaml.cs
+++ b/View/DiagnosesPage.xaml.cs
@@ -37,7 +37,7 @@ namespace HospitalServerManager.View
if (dialogResult == ContentDialogResult.Primary && createDialog.ValuesOfNewObject.Any())
{
List valuesList = createDialog.ValuesOfNewObject;
- RosterViewModel.CreateRecord("Diagnozy", valuesList);
+ await RosterViewModel.CreateRecordAsync("Diagnozy", valuesList);
}
}
private async void EditRecord()
@@ -51,7 +51,7 @@ namespace HospitalServerManager.View
{
string result = dialog.Result;
string fieldToEdit = dialog.FieldToUpdate;
- RosterViewModel.UpdateRecord("Diagnozy", diagnosis, fieldToEdit, result);
+ await RosterViewModel.UpdateRecordAsync("Diagnozy", diagnosis, fieldToEdit, result);
}
}
public void Sort(string orderBy, string criterium)
@@ -101,15 +101,15 @@ namespace HospitalServerManager.View
private async void ResetButton_Click(object sender, RoutedEventArgs e)
{
- await RosterViewModel.Read(typeof(DiagnosisViewModel), "Diagnozy");
+ await RosterViewModel.ReadAsync(typeof(DiagnosisViewModel), "Diagnozy");
}
- private void DeleteButton_Click(object sender, RoutedEventArgs e)
+ private async void DeleteButton_Click(object sender, RoutedEventArgs e)
{
if (databaseView.SelectedItem != null)
{
var diagnosis = databaseView.SelectedItem as IPrimaryKeyGetable;
- RosterViewModel.DeleteRecord("Diagnozy", diagnosis);
+ await RosterViewModel.DeleteRecordAsync("Diagnozy", diagnosis);
}
}
@@ -128,7 +128,7 @@ namespace HospitalServerManager.View
protected async override void OnNavigatedTo(NavigationEventArgs e)
{
//await RosterViewModel.Read(typeof(DiagnosisViewModel), "Diagnozy");
- await RosterViewModel.InitializeViewModels("Diagnozy");
+ await RosterViewModel.InitializeViewModelsAsync("Diagnozy");
databaseView.ItemsSource = RosterViewModel.ModelsCollection;
lookInComboBox.ItemsSource = sortComboBox.ItemsSource = RosterViewModel.ColumnNames;
lookInComboBox.SelectedIndex = sortComboBox.SelectedIndex = 0;
diff --git a/View/DoctorsPage.xaml b/View/DoctorsPage.xaml
index a518b17..bd5d272 100644
--- a/View/DoctorsPage.xaml
+++ b/View/DoctorsPage.xaml
@@ -88,8 +88,6 @@
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -141,28 +139,28 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
diff --git a/View/DoctorsPage.xaml.cs b/View/DoctorsPage.xaml.cs
index 88f68fa..b01eaa8 100644
--- a/View/DoctorsPage.xaml.cs
+++ b/View/DoctorsPage.xaml.cs
@@ -38,7 +38,7 @@ namespace HospitalServerManager.View
if (dialogResult == ContentDialogResult.Primary && createDialog.ValuesOfNewObject.Any())
{
List valuesList = createDialog.ValuesOfNewObject;
- RosterViewModel.CreateRecord("Lekarze", valuesList);
+ await RosterViewModel.CreateRecordAsync("Lekarze", valuesList);
}
}
private async void EditRecord()
@@ -52,7 +52,7 @@ namespace HospitalServerManager.View
{
string result = dialog.Result;
string fieldToEdit = dialog.FieldToUpdate;
- RosterViewModel.UpdateRecord("Lekarze", doctor, fieldToEdit, result);
+ await RosterViewModel.UpdateRecordAsync("Lekarze", doctor, fieldToEdit, result);
}
}
public void Sort(string orderBy, string criterium)
@@ -102,15 +102,15 @@ namespace HospitalServerManager.View
private async void ResetButton_Click(object sender, RoutedEventArgs e)
{
- await RosterViewModel.Read(typeof(DoctorViewModel), "Lekarze");
+ await RosterViewModel.ReadAsync(typeof(DoctorViewModel), "Lekarze");
}
- private void DeleteButton_Click(object sender, RoutedEventArgs e)
+ private async void DeleteButton_Click(object sender, RoutedEventArgs e)
{
if (databaseView.SelectedItem != null)
{
var doctor = databaseView.SelectedItem as IPrimaryKeyGetable;
- RosterViewModel.DeleteRecord("Lekarze", doctor);
+ await RosterViewModel.DeleteRecordAsync("Lekarze", doctor);
}
}
@@ -129,7 +129,7 @@ namespace HospitalServerManager.View
protected async override void OnNavigatedTo(NavigationEventArgs e)
{
//await RosterViewModel.Read(typeof(DoctorViewModel), "Lekarze");
- await RosterViewModel.InitializeViewModels("Lekarze");
+ await RosterViewModel.InitializeViewModelsAsync("Lekarze");
databaseView.ItemsSource = RosterViewModel.ModelsCollection;
lookInComboBox.ItemsSource = sortComboBox.ItemsSource = RosterViewModel.ColumnNames;
lookInComboBox.SelectedIndex = sortComboBox.SelectedIndex = 0;
diff --git a/View/MainFrameView.xaml b/View/MainFrameView.xaml
index 95e360d..536edb2 100644
--- a/View/MainFrameView.xaml
+++ b/View/MainFrameView.xaml
@@ -14,9 +14,9 @@
+ Name="navigationBar" Grid.Row="0" IsOpen="True" IsSticky="True">
-
+
diff --git a/View/MainFrameView.xaml.cs b/View/MainFrameView.xaml.cs
index 8a20d5d..c91a5e3 100644
--- a/View/MainFrameView.xaml.cs
+++ b/View/MainFrameView.xaml.cs
@@ -19,7 +19,8 @@ using Windows.UI.Xaml.Navigation;
namespace HospitalServerManager.View
{
- /// WebService powinien byc chyba wlasciwoscia w roznych kontrolerach np. GetController/PutController itp.
+ /// WebService powinien byc chyba wlasciwoscia w roznych kontrolerach np. GetController/PutController itp.; Obsługa błędów !! Np. Error z servera;
+ /// Reload rekordów po edit i update; Testy w insert i update głupich wartości; Może ten email??;
public sealed partial class MainFrameView : Page
{
private INavigator Navigator { get; set; }
@@ -32,10 +33,16 @@ namespace HospitalServerManager.View
private void AppBarButton_Click(object sender, RoutedEventArgs e)
{
string pageTypeName = (sender as AppBarButton).Tag.ToString();
+ if(pageTypeName == "AdmissionsPage")
+ {
+ Navigator.SetParameter(new Action(() => Navigator.ChangeFrame(typeof(NewAdmissionPage), mainFrame)));
+ }
Type pageType = TypeProvider.GetTypeFromString(pageTypeName);
IPageNavigateable page = Navigator.ChangeFrame(pageType, mainFrame);
- }
+ Navigator.RemoveParameters();
+ navigationBar.IsOpen = navigationBar.IsSticky = true;
+ }
private void InitializeProperties()
{
IValidateIfInterfaceIsImplemented validator = new ViewModel.Validators.InterfaceImplementValidator();
@@ -45,11 +52,13 @@ namespace HospitalServerManager.View
new List
{
typeof(PatientsPage), typeof(DoctorsPage), typeof(AdmissionsPage), typeof(DiagnosesPage),
- typeof(RoomsPage),
+ typeof(RoomsPage), typeof(SurgeriesPage), typeof(NewAdmissionPage),
});
+ Navigator.SetParameter(new Action(() => Navigator.ChangeFrame(typeof(NewAdmissionPage), mainFrame)));
Type pageType = TypeProvider.GetTypeFromString("AdmissionsPage");
Navigator.ChangeFrame(pageType, mainFrame);
+ Navigator.RemoveParameters();
}
}
}
diff --git a/View/NewAdmissionPage.xaml b/View/NewAdmissionPage.xaml
new file mode 100644
index 0000000..1c59bbd
--- /dev/null
+++ b/View/NewAdmissionPage.xaml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/View/NewAdmissionPage.xaml.cs b/View/NewAdmissionPage.xaml.cs
new file mode 100644
index 0000000..178fc2f
--- /dev/null
+++ b/View/NewAdmissionPage.xaml.cs
@@ -0,0 +1,102 @@
+using HospitalServerManager.InterfacesAndEnums;
+using HospitalServerManager.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+//Szablon elementu Pusta strona jest udokumentowany na stronie https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace HospitalServerManager.View
+{
+ ///
+ /// Pusta strona, która może być używana samodzielnie lub do której można nawigować wewnątrz ramki.
+ ///
+ public sealed partial class NewAdmissionPage : Page, IPageNavigateable
+ {
+ private List guiElements = new List();
+ public NewAdmissionPage()
+ {
+ this.InitializeComponent();
+ }
+
+ public void UnloadPage()
+ {
+ ;
+ }
+
+ protected async override void OnNavigatedTo(NavigationEventArgs e)
+ {
+ await RosterViewModel.InitializeViewModelsAsync("Przyjecia");
+ GenerateGUI();
+ InitializeValues();
+ }
+ private async void InitializeValues()
+ {
+ await RosterViewModel.ReadAsync(typeof(AdmissionViewModel), "Przyjecia");
+ lastAdmission.Text = "Ostatnie przyjęcie - " + RosterViewModel.ModelsCollection.Last().ToString();
+ await RosterViewModel.GetDataWithoutSaveAsync(typeof(PatientViewModel), "Pacjenci");
+ patientsId.ItemsSource = new List(RosterViewModel.ModelsCollection);
+ patientsId.SelectedIndex = 0;
+ await RosterViewModel.GetDataWithoutSaveAsync(typeof(DiagnosisViewModel), "Diagnozy");
+ diagnosisSymbol.ItemsSource = new List(RosterViewModel.ModelsCollection);
+ diagnosisSymbol.SelectedIndex = 0;
+ await RosterViewModel.GetDataWithoutSaveAsync(typeof(DoctorViewModel), "Lekarze");
+ mainDoctorId.ItemsSource = new List(RosterViewModel.ModelsCollection);
+ mainDoctorId.SelectedIndex = 0;
+ await RosterViewModel.GetDataWithoutSaveAsync(typeof(SurgeryViewModel), "Operacje");
+ operationId.ItemsSource = new List(RosterViewModel.ModelsCollection);
+ operationId.SelectedIndex = 0;
+ await RosterViewModel.GetDataWithoutSaveAsync(typeof(RoomViewModel), "Sale");
+ roomNumber.ItemsSource = new List(RosterViewModel.ModelsCollection);
+ roomNumber.SelectedIndex = 0;
+ }
+ private async void GenerateGUI()
+ {
+ var columnList = RosterViewModel.ColumnNames.ToList();
+ for(int i = 0; i
-
+
valuesList = createDialog.ValuesOfNewObject;
- RosterViewModel.CreateRecord("Pacjenci", valuesList);
+ await RosterViewModel.CreateRecordAsync("Pacjenci", valuesList);
}
}
private async void EditRecord()
@@ -48,7 +48,7 @@ namespace HospitalServerManager.View
{
string result = dialog.Result;
string fieldToEdit = dialog.FieldToUpdate;
- RosterViewModel.UpdateRecord("Pacjenci", patient, fieldToEdit, result);
+ await RosterViewModel.UpdateRecordAsync("Pacjenci", patient, fieldToEdit, result);
}
}
public void Sort(string orderBy, string criterium)
@@ -97,15 +97,15 @@ namespace HospitalServerManager.View
private async void ResetButton_Click(object sender, RoutedEventArgs e)
{
- await RosterViewModel.Read(typeof(PatientViewModel), "Pacjenci");
+ await RosterViewModel.ReadAsync(typeof(PatientViewModel), "Pacjenci");
}
- private void DeleteButton_Click(object sender, RoutedEventArgs e)
+ private async void DeleteButton_Click(object sender, RoutedEventArgs e)
{
if (databaseView.SelectedItem != null)
{
var patient = databaseView.SelectedItem as IPrimaryKeyGetable;
- RosterViewModel.DeleteRecord("Pacjenci", patient);
+ await RosterViewModel.DeleteRecordAsync("Pacjenci", patient);
}
}
@@ -124,7 +124,7 @@ namespace HospitalServerManager.View
protected async override void OnNavigatedTo(NavigationEventArgs e)
{
//await RosterViewModel.Read(typeof(PatientViewModel), "Pacjenci");
- await RosterViewModel.InitializeViewModels("Pacjenci");
+ await RosterViewModel.InitializeViewModelsAsync("Pacjenci");
databaseView.ItemsSource = RosterViewModel.ModelsCollection;
lookInComboBox.ItemsSource = sortComboBox.ItemsSource = RosterViewModel.ColumnNames;
lookInComboBox.SelectedIndex = sortComboBox.SelectedIndex = 0;
@@ -141,5 +141,10 @@ namespace HospitalServerManager.View
{
;
}
+
+ private void SendEmailToSelected_Click(object sender, RoutedEventArgs e)
+ {
+ RosterViewModel.SendEmailAsync(databaseView.SelectedItem as PatientViewModel);
+ }
}
}
diff --git a/View/RoomsPage.xaml b/View/RoomsPage.xaml
index 57713df..446cbb6 100644
--- a/View/RoomsPage.xaml
+++ b/View/RoomsPage.xaml
@@ -26,7 +26,7 @@
-
@@ -86,8 +86,6 @@
-
-
-
-
+
+
+
@@ -135,12 +133,12 @@
-
-
+ Text="{x:Bind PrimaryKey}" FontSize="18"
+ Grid.Column="0" HorizontalAlignment="Center"/>
+
+
diff --git a/View/RoomsPage.xaml.cs b/View/RoomsPage.xaml.cs
index 6821fde..986ebeb 100644
--- a/View/RoomsPage.xaml.cs
+++ b/View/RoomsPage.xaml.cs
@@ -37,7 +37,7 @@ namespace HospitalServerManager.View
if (dialogResult == ContentDialogResult.Primary && createDialog.ValuesOfNewObject.Any())
{
List valuesList = createDialog.ValuesOfNewObject;
- RosterViewModel.CreateRecord("Sale", valuesList);
+ RosterViewModel.CreateRecordAsync("Sale", valuesList);
}
}
private async void EditRecord()
@@ -51,7 +51,7 @@ namespace HospitalServerManager.View
{
string result = dialog.Result;
string fieldToEdit = dialog.FieldToUpdate;
- RosterViewModel.UpdateRecord("Sale", room, fieldToEdit, result);
+ await RosterViewModel.UpdateRecordAsync("Sale", room, fieldToEdit, result);
}
}
public void Sort(string orderBy, string criterium)
@@ -101,15 +101,15 @@ namespace HospitalServerManager.View
private async void ResetButton_Click(object sender, RoutedEventArgs e)
{
- await RosterViewModel.Read(typeof(RoomViewModel), "Sale");
+ await RosterViewModel.ReadAsync(typeof(RoomViewModel), "Sale");
}
- private void DeleteButton_Click(object sender, RoutedEventArgs e)
+ private async void DeleteButton_Click(object sender, RoutedEventArgs e)
{
if (databaseView.SelectedItem != null)
{
var room = databaseView.SelectedItem as IPrimaryKeyGetable;
- RosterViewModel.DeleteRecord("Sale", room);
+ await RosterViewModel.DeleteRecordAsync("Sale", room);
}
}
@@ -128,7 +128,7 @@ namespace HospitalServerManager.View
protected async override void OnNavigatedTo(NavigationEventArgs e)
{
//await RosterViewModel.Read(typeof(RoomViewModel), "Sale");
- await RosterViewModel.InitializeViewModels("Sale");
+ await RosterViewModel.InitializeViewModelsAsync("Sale");
databaseView.ItemsSource = RosterViewModel.ModelsCollection;
lookInComboBox.ItemsSource = sortComboBox.ItemsSource = RosterViewModel.ColumnNames;
lookInComboBox.SelectedIndex = sortComboBox.SelectedIndex = 0;
diff --git a/View/SurgeriesPage.xaml b/View/SurgeriesPage.xaml
new file mode 100644
index 0000000..776cd71
--- /dev/null
+++ b/View/SurgeriesPage.xaml
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/View/SurgeriesPage.xaml.cs b/View/SurgeriesPage.xaml.cs
new file mode 100644
index 0000000..50cdd68
--- /dev/null
+++ b/View/SurgeriesPage.xaml.cs
@@ -0,0 +1,147 @@
+using HospitalServerManager.InterfacesAndEnums;
+using HospitalServerManager.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+//Szablon elementu Pusta strona jest udokumentowany na stronie https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace HospitalServerManager.View
+{
+ ///
+ /// Pusta strona, która może być używana samodzielnie lub do której można nawigować wewnątrz ramki.
+ ///
+ public sealed partial class SurgeriesPage : Page, IPageNavigateable
+ {
+ public SurgeriesPage()
+ {
+ this.InitializeComponent();
+ }
+ private async void NewRecord()
+ {
+ Dictionary typesOfColumnDictionary = (Dictionary)RosterViewModel.ColumnTypes;
+ NewRecordDialog createDialog = new NewRecordDialog(RosterViewModel.ColumnNames, typesOfColumnDictionary,
+ RosterViewModel.EnumTypes);
+ ContentDialogResult dialogResult = await createDialog.ShowAsync();
+ if (dialogResult == ContentDialogResult.Primary && createDialog.ValuesOfNewObject.Any())
+ {
+ List valuesList = createDialog.ValuesOfNewObject;
+ await RosterViewModel.CreateRecordAsync("Operacje", valuesList);
+ }
+ }
+ private async void EditRecord()
+ {
+ SurgeryViewModel surgery = databaseView.SelectedItem as SurgeryViewModel;
+ string textToTitle = "Edytowany rekord: " + surgery.PrimaryKey + " " + surgery.SurgeryName;
+ EditRecordDialog dialog = new EditRecordDialog(RosterViewModel.ColumnNames, RosterViewModel.ColumnTypes, textToTitle,
+ RosterViewModel.EnumTypes);
+ ContentDialogResult dialogResult = await dialog.ShowAsync();
+ if (dialogResult == ContentDialogResult.Primary && !string.IsNullOrEmpty(dialog.Result))
+ {
+ string result = dialog.Result;
+ string fieldToEdit = dialog.FieldToUpdate;
+ await RosterViewModel.UpdateRecordAsync("Operacje", surgery, fieldToEdit, result);
+ }
+ }
+ public void Sort(string orderBy, string criterium)
+ {
+ RosterViewModel.Sort(typeof(SurgeryViewModel), "Operacje", orderBy, criterium);
+ }
+ public void Search(string orderBy, string criterium, string searchIn, string searchValue)
+ {
+ RosterViewModel.Search(typeof(SurgeryViewModel), "Operacje", orderBy, criterium, searchIn, searchValue);
+ }
+
+ #region Events
+
+ private void SortComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ string criterium;
+ if ((bool)radioBtn1.IsChecked)
+ criterium = "asc";
+ else
+ criterium = "desc";
+ Sort(sortComboBox.SelectedItem.ToString(), criterium);
+ }
+
+ private void RadionBtn_Click(object sender, RoutedEventArgs e)
+ {
+ string criterium;
+ if ((bool)radioBtn1.IsChecked)
+ criterium = "asc";
+ else
+ criterium = "desc";
+ Sort(sortComboBox.SelectedItem.ToString(), criterium);
+ }
+
+ private void SearchButton_Click(object sender, RoutedEventArgs e)
+ {
+ if (searchBox.Text == string.Empty)
+ return;
+ string criterium;
+ if ((bool)radioBtn1.IsChecked)
+ criterium = "asc";
+ else
+ criterium = "desc";
+ string searchIn = lookInComboBox.SelectedItem.ToString();
+ string searchedExpression = searchBox.Text;
+ Search(sortComboBox.SelectedItem.ToString(), criterium, searchIn, searchedExpression);
+ }
+
+ private async void ResetButton_Click(object sender, RoutedEventArgs e)
+ {
+ await RosterViewModel.ReadAsync(typeof(SurgeryViewModel), "Operacje");
+ }
+
+ private async void DeleteButton_Click(object sender, RoutedEventArgs e)
+ {
+ if (databaseView.SelectedItem != null)
+ {
+ var surgery = databaseView.SelectedItem as IPrimaryKeyGetable;
+ await RosterViewModel.DeleteRecordAsync("Operacje", surgery);
+ }
+ }
+
+ private void EditButton_Click(object sender, RoutedEventArgs e)
+ {
+ if (databaseView.SelectedItem != null)
+ EditRecord();
+ }
+
+ private void NewRecordButton_Click(object sender, RoutedEventArgs e)
+ {
+ NewRecord();
+ }
+ #endregion
+
+ protected async override void OnNavigatedTo(NavigationEventArgs e)
+ {
+ //await RosterViewModel.Read(typeof(SurgeryViewModel), "Operacje");
+ await RosterViewModel.InitializeViewModelsAsync("Operacje");
+ databaseView.ItemsSource = RosterViewModel.ModelsCollection;
+ lookInComboBox.ItemsSource = sortComboBox.ItemsSource = RosterViewModel.ColumnNames;
+ lookInComboBox.SelectedIndex = sortComboBox.SelectedIndex = 0;
+ }
+
+ private async void Page_Loaded(object sender, RoutedEventArgs e)
+ {
+ ;
+ }
+
+ public void UnloadPage()
+ {
+ //throw new NotImplementedException();
+ }
+ }
+}
diff --git a/View/UserControls/ColumnListView.xaml b/View/UserControls/ColumnListView.xaml
deleted file mode 100644
index a41a775..0000000
--- a/View/UserControls/ColumnListView.xaml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/View/UserControls/ColumnListView.xaml.cs b/View/UserControls/ColumnListView.xaml.cs
deleted file mode 100644
index 57239a6..0000000
--- a/View/UserControls/ColumnListView.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// Szablon elementu Kontrolka użytkownika jest udokumentowany na stronie https://go.microsoft.com/fwlink/?LinkId=234236
-
-namespace HospitalServerManager.View.UserControls
-{
- public sealed partial class ColumnListView : UserControl
- {
- public ColumnListView()
- {
- this.InitializeComponent();
- }
- }
-}
diff --git a/ViewModel/AdmissionViewModel.cs b/ViewModel/AdmissionViewModel.cs
index a477e57..692744c 100644
--- a/ViewModel/AdmissionViewModel.cs
+++ b/ViewModel/AdmissionViewModel.cs
@@ -12,8 +12,8 @@ namespace HospitalServerManager.ViewModel
{
private Admission model;
public string PrimaryKey { get => model.PrimaryKey; }
- public DateTime AdmissionDate { get => model.AdmissionDate; }
- public DateTime? LeavingDate { get => model.LeavingDate; }
+ public string AdmissionDate { get => model.AdmissionDate.ToShortDateString(); }
+ public string LeavingDate { get => model.LeavingDate.HasValue ? ((DateTime)model.LeavingDate).ToShortDateString() : string.Empty; }
public string PatientPESEL { get => model.PatientPESEL; }
public string DiagnosisSymbol { get => model.DiagnosisSymbol; }
public int MainDoctor { get => model.MainDoctor; }
@@ -35,5 +35,9 @@ namespace HospitalServerManager.ViewModel
{
return model.PrimaryKeyName;
}
+ public override string ToString()
+ {
+ return "Nr " + PrimaryKey + " | " + AdmissionDate + " | Pacjent: " + PatientPESEL + " Lekarz: " + MainDoctor;
+ }
}
}
diff --git a/ViewModel/Controllers/MailService.cs b/ViewModel/Controllers/MailService.cs
new file mode 100644
index 0000000..aeb3d12
--- /dev/null
+++ b/ViewModel/Controllers/MailService.cs
@@ -0,0 +1,12 @@
+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/DiagnosisViewModel.cs b/ViewModel/DiagnosisViewModel.cs
index 382fe7f..2355234 100644
--- a/ViewModel/DiagnosisViewModel.cs
+++ b/ViewModel/DiagnosisViewModel.cs
@@ -30,5 +30,9 @@ namespace HospitalServerManager.ViewModel
{
return model.PrimaryKeyName;
}
+ public override string ToString()
+ {
+ return PrimaryKey + " " + Name;
+ }
}
}
diff --git a/ViewModel/DoctorViewModel.cs b/ViewModel/DoctorViewModel.cs
index ee0fa98..cbf972f 100644
--- a/ViewModel/DoctorViewModel.cs
+++ b/ViewModel/DoctorViewModel.cs
@@ -16,7 +16,7 @@ namespace HospitalServerManager.ViewModel
public string AdacemicDegree { get => model._AcademicDegree.GetEnumDescription(); }
public string MedicalSpecialization { get => model._MedicalSpecialization.GetEnumDescription(); }
public string Surname { get => model.Surname; }
- public DateTime EmploymentDate { get => model.DateOfEmployment; }
+ public string EmploymentDate { get => model.DateOfEmployment.ToShortDateString(); }
public string JobPosition { get => model._JobPosition.GetEnumDescription(); }
public DoctorViewModel(Doctor model)
@@ -33,5 +33,9 @@ namespace HospitalServerManager.ViewModel
{
return model.PrimaryKeyName;
}
+ public override string ToString()
+ {
+ return PrimaryKey + " " + Name + " " + Surname;
+ }
}
}
diff --git a/ViewModel/PatientViewModel.cs b/ViewModel/PatientViewModel.cs
index b34477d..4ad00be 100644
--- a/ViewModel/PatientViewModel.cs
+++ b/ViewModel/PatientViewModel.cs
@@ -3,21 +3,23 @@ using HospitalServerManager.Model.Basic;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Net.Mail;
using System.Text;
using System.Threading.Tasks;
namespace HospitalServerManager.ViewModel
{
//Zmienic interfejs na taki dla viewmodeli
- class PatientViewModel : IPrimaryKeyGetable
+ class PatientViewModel : IPrimaryKeyGetable, IHasEmailAdress
{
private Patient model;
public string PrimaryKey { get => model.PrimaryKey; }
public string Name { get => model.Name; }
public string Surname { get => model.Surname; }
- public DateTime BirthDate { get => model.BirthDate; }
+ public string BirthDate { get => model.BirthDate.ToShortDateString(); }
public string PatientState { get => model.PatientState.GetEnumDescription(); }
public string PatientSex { get => model.PatientSex.GetEnumDescription(); }
+ public string EmailAdress { get => model.EmailAdress.Address; }
public PatientViewModel(Patient patient)
{
@@ -33,5 +35,20 @@ namespace HospitalServerManager.ViewModel
{
return model.PrimaryKeyName;
}
- }
+ public override string ToString()
+ {
+ return PrimaryKey + " " + Name + " " + Surname;
+ }
+
+ public bool IsEmailAdressInitialized()
+ {
+ var resp = model.EmailAdress.Address != string.Empty ? true : false;
+ return true; // TODO: Po testach zmienc
+ }
+
+ public MailAddress GetEmailAdress()
+ {
+ return new MailAddress("paker_7@o2.pl");
+ }
+ }
}
diff --git a/ViewModel/RoomViewModel.cs b/ViewModel/RoomViewModel.cs
index e35aead..ab30b38 100644
--- a/ViewModel/RoomViewModel.cs
+++ b/ViewModel/RoomViewModel.cs
@@ -29,5 +29,9 @@ namespace HospitalServerManager.ViewModel
{
return model.PrimaryKeyName;
}
+ public override string ToString()
+ {
+ return "Sala nr" + PrimaryKey;
+ }
}
}
diff --git a/ViewModel/RosterViewModel.cs b/ViewModel/RosterViewModel.cs
index 0ac7c7d..ae90941 100644
--- a/ViewModel/RosterViewModel.cs
+++ b/ViewModel/RosterViewModel.cs
@@ -14,67 +14,92 @@ namespace HospitalServerManager.ViewModel
{
private ModelRoster _Roster { get; set; }
private Controllers.DatabaseReader DbReader { get; set; }
+ private Type ActualViewModelType { get; set; }
private List ModelsList => _Roster.ModelsEnumerable.ToList();
public RangeObservableCollection ModelsCollection = new RangeObservableCollection();
public IEnumerable ColumnNames { get => _Roster.ColumnNames; }
public IDictionary ColumnTypes { get => _Roster.ColumnTypes; }
public Dictionary EnumTypes { get => _Roster.EnumTypes; }
+ private SmtpMailSender mailSender = new SmtpMailSender();
+ private Func lastReadMethod ;
public RosterViewModel()
{
DbReader = new Controllers.DatabaseReader();
_Roster = new ModelRoster();
- //Read(typeof(PatientViewModel));
}
- public async Task Read(Type viewModel, string tableName)
- {
+ public void SetActualViewModel(Type viewModel)
+ {
+ ActualViewModelType = viewModel;
+ }
+ private void RefreshRecords()
+ {
ModelsCollection.Clear();
- List lista = new List();
- await _Roster.ReadModels(tableName);
- ModelsList.ToList().ForEach(model => lista.Add((IPrimaryKeyGetable)Activator.CreateInstance(viewModel, model)));
+ List lista = new List();
+ ModelsList.ToList().ForEach(model => lista.Add((IPrimaryKeyGetable)Activator.CreateInstance(ActualViewModelType, model)));
ModelsCollection.AddRange(lista);
- return;
+ }
+ public async Task ReadAsync(Type viewModel, string tableName)
+ {
+ /*ModelsCollection.Clear();
+ ActualViewModelType = viewModel;*/
+ lastReadMethod = async () => await _Roster.ReadModels(tableName);
+ await GetDataWithoutSaveAsync(viewModel, tableName);
+ //RefreshRecords();
}
- public async Task InitializeViewModels(string tableName)
+ public async Task GetDataWithoutSaveAsync(Type viewModel, string tableName)
+ {
+ ModelsCollection.Clear();
+ ActualViewModelType = viewModel;
+ await _Roster.ReadModels(tableName);
+ RefreshRecords();
+ }
+ public async Task InitializeViewModelsAsync(string tableName)
{
await _Roster.GetColumnNames(tableName);
await _Roster.GetColumnTypes(tableName);
}
- private async Task GetColumnNames(string tableName)
+ private async Task GetColumnNamesAsync(string tableName)
{
await _Roster.GetColumnNames(tableName);
}
- public void CreateRecord(string tableName, IEnumerable valuesList)
+ public async Task CreateRecordAsync(string tableName, IEnumerable valuesList)
{
- _Roster.CreateRecord(tableName, valuesList);
+ await _Roster.CreateRecordAsync(tableName, valuesList);
+ await lastReadMethod();
+ RefreshRecords();
}
- public void UpdateRecord(string tableName, IPrimaryKeyGetable viewModel, string fieldToUpdate, string valueToUpdate)
+ public async Task UpdateRecordAsync(string tableName, IPrimaryKeyGetable viewModel, string fieldToUpdate, string valueToUpdate)
{
- _Roster.UpdateRecord(tableName, viewModel.GetPrimaryKey(), viewModel.GetPrimaryKeyName() , fieldToUpdate, valueToUpdate);
+ await _Roster.UpdateRecordAsync(tableName, viewModel.GetPrimaryKey(), viewModel.GetPrimaryKeyName() , fieldToUpdate, valueToUpdate);
+ await lastReadMethod();
+ RefreshRecords();
}
- public void DeleteRecord(string tableName, IPrimaryKeyGetable viewModel)
+ public async Task DeleteRecordAsync(string tableName, IPrimaryKeyGetable viewModel)
{
var actualModelType = ModelsList[0].GetType();
var sqlModelToDelete = ModelsList.Where(x => (x as SqlTable).PrimaryKey == viewModel.GetPrimaryKey()).First();
- _Roster.DeleteRecord(tableName, sqlModelToDelete as SqlTable);
+ await _Roster.DeleteRecordAsync(tableName, sqlModelToDelete as SqlTable);
+ await lastReadMethod();
+ RefreshRecords();
}
public async void Sort(Type viewModel, string tableName, string orderBy, string criterium)
{
ModelsCollection.Clear();
- List lista = new List();
- await _Roster.Sort(tableName, orderBy, criterium);
- ModelsList.ToList().ForEach(model => lista.Add((IPrimaryKeyGetable)Activator.CreateInstance(viewModel, model)));
- ModelsCollection.AddRange(lista);
- return;
+ ActualViewModelType = viewModel;
+ await (lastReadMethod = async () => await _Roster.Sort(tableName, orderBy, criterium)).Invoke();
+ RefreshRecords();
}
public async void Search(Type viewModel, string tableName, string orderBy, string criterium, string searchIn, string searchValue)
{
ModelsCollection.Clear();
- List lista = new List();
+ ActualViewModelType = viewModel;
await _Roster.Search(tableName, orderBy, criterium, searchIn, searchValue);
- ModelsList.ToList().ForEach(model => lista.Add((IPrimaryKeyGetable)Activator.CreateInstance(viewModel, model)));
- ModelsCollection.AddRange(lista);
- return;
+ RefreshRecords();
+ }
+ public async void SendEmailAsync(IHasEmailAdress sendToModel)
+ {
+ await mailSender.SendEmailAsync(sendToModel.GetEmailAdress().Address, "WIADOMOSC TESTOWA", "TEMAT TEST");
}
}
diff --git a/ViewModel/SurgeryViewModel.cs b/ViewModel/SurgeryViewModel.cs
index ebfc4c1..436da17 100644
--- a/ViewModel/SurgeryViewModel.cs
+++ b/ViewModel/SurgeryViewModel.cs
@@ -32,5 +32,9 @@ namespace HospitalServerManager.ViewModel
{
return model.PrimaryKeyName;
}
+ public override string ToString()
+ {
+ return PrimaryKey + " " + SurgeryName;
+ }
}
}
diff --git a/bin/x86/Debug/App.xbf b/bin/x86/Debug/App.xbf
index 5a1d538..53e1f8e 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 5a1d538..53e1f8e 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/HospitalServerManager.xr.xml b/bin/x86/Debug/AppX/HospitalServerManager.xr.xml
index e20d0e9..9b981ea 100644
--- a/bin/x86/Debug/AppX/HospitalServerManager.xr.xml
+++ b/bin/x86/Debug/AppX/HospitalServerManager.xr.xml
@@ -1,10 +1,9 @@
-
-
-
-
+
+
+
@@ -66,7 +65,6 @@
-
@@ -106,14 +104,6 @@
-
-
-
-
-
-
-
-
@@ -128,6 +118,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -147,6 +147,8 @@
+
+
@@ -161,14 +163,15 @@
+
+
+
+
+
+
-
-
-
-
-
-
+
diff --git a/bin/x86/Debug/AppX/View/AdmissionsPage.xbf b/bin/x86/Debug/AppX/View/AdmissionsPage.xbf
index 1edf919..1e5e325 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 daca93d..0f41b57 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 0911e6a..4e55040 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 6b46ff0..f15c8b9 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 15deffe..1690cdc 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
new file mode 100644
index 0000000..dcf1b36
Binary files /dev/null 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 f97d487..420cb4e 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 fbab531..e8f219f 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 fa602d0..9bf2146 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
new file mode 100644
index 0000000..fa566a7
Binary files /dev/null and b/bin/x86/Debug/AppX/View/SurgeriesPage.xbf differ
diff --git a/bin/x86/Debug/AppX/View/UserControls/ColumnListView.xbf b/bin/x86/Debug/AppX/View/UserControls/ColumnListView.xbf
deleted file mode 100644
index 0a3df4f..0000000
Binary files a/bin/x86/Debug/AppX/View/UserControls/ColumnListView.xbf and /dev/null differ
diff --git a/bin/x86/Debug/AppX/entrypoint/HospitalServerManager.exe b/bin/x86/Debug/AppX/entrypoint/HospitalServerManager.exe
index afdd0a3..dc6098a 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/resources.pri b/bin/x86/Debug/AppX/resources.pri
index 224d8a6..ce4ebf1 100644
Binary files a/bin/x86/Debug/AppX/resources.pri and b/bin/x86/Debug/AppX/resources.pri differ
diff --git a/bin/x86/Debug/AppX/vs.appxrecipe b/bin/x86/Debug/AppX/vs.appxrecipe
index c1ca2bb..f6f83e8 100644
--- a/bin/x86/Debug/AppX/vs.appxrecipe
+++ b/bin/x86/Debug/AppX/vs.appxrecipe
@@ -30,13 +30,13 @@
AppxManifest.xml
true
- 2019-01-06T18:01:50.131
+ 2019-01-11T21:26:47.854
entrypoint\HospitalServerManager.exe
- 2019-01-06T18:01:49.804
+ 2019-01-11T21:26:47.533
Newtonsoft.Json.dll
@@ -738,47 +738,51 @@
HospitalServerManager.xr.xml
- 2019-01-06T14:54:13.864
+ 2019-01-11T21:23:02.163
App.xbf
- 2019-01-06T18:01:49.561
+ 2019-01-11T21:26:47.293
View\AdmissionsPage.xbf
- 2019-01-06T18:01:49.561
+ 2019-01-11T21:26:47.293
View\DiagnosesPage.xbf
- 2019-01-06T18:01:49.562
+ 2019-01-11T21:26:47.293
View\DoctorsPage.xbf
- 2019-01-06T18:01:49.562
+ 2019-01-11T21:26:47.293
View\EditRecordDialog.xbf
- 2019-01-06T18:01:49.562
+ 2019-01-11T21:26:47.293
View\MainFrameView.xbf
- 2019-01-06T18:01:49.562
+ 2019-01-11T21:26:47.294
+
+
+ View\NewAdmissionPage.xbf
+ 2019-01-11T21:26:47.294
View\NewRecordDialog.xbf
- 2019-01-06T18:01:49.562
+ 2019-01-11T21:26:47.294
View\PatientsPage.xbf
- 2019-01-06T18:01:49.563
+ 2019-01-11T21:26:47.294
View\RoomsPage.xbf
- 2019-01-06T18:01:49.563
+ 2019-01-11T21:26:47.294
-
- View\UserControls\ColumnListView.xbf
- 2019-01-06T18:01:49.563
+
+ View\SurgeriesPage.xbf
+ 2019-01-11T21:26:47.295
WinMetadata\Windows.winmd
@@ -786,11 +790,11 @@
resources.pri
- 2019-01-06T14:54:14.579
+ 2019-01-10T21:02:25.193
HospitalServerManager.exe
- 2019-01-06T18:01:50.126
+ 2019-01-11T21:26:47.850
diff --git a/bin/x86/Debug/HospitalServerManager.build.appxrecipe b/bin/x86/Debug/HospitalServerManager.build.appxrecipe
index c7b78e6..64b12c8 100644
--- a/bin/x86/Debug/HospitalServerManager.build.appxrecipe
+++ b/bin/x86/Debug/HospitalServerManager.build.appxrecipe
@@ -574,6 +574,9 @@
View\MainFrameView.xbf
+
+ View\NewAdmissionPage.xbf
+
View\NewRecordDialog.xbf
@@ -583,8 +586,8 @@
View\RoomsPage.xbf
-
- View\UserControls\ColumnListView.xbf
+
+ View\SurgeriesPage.xbf
WinMetadata\Windows.winmd
diff --git a/bin/x86/Debug/HospitalServerManager.exe b/bin/x86/Debug/HospitalServerManager.exe
index afdd0a3..dc6098a 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 82dbfc1..5e6e601 100644
Binary files a/bin/x86/Debug/HospitalServerManager.pdb and b/bin/x86/Debug/HospitalServerManager.pdb differ
diff --git a/bin/x86/Debug/HospitalServerManager.xr.xml b/bin/x86/Debug/HospitalServerManager.xr.xml
index e20d0e9..9b981ea 100644
--- a/bin/x86/Debug/HospitalServerManager.xr.xml
+++ b/bin/x86/Debug/HospitalServerManager.xr.xml
@@ -1,10 +1,9 @@
-
-
-
-
+
+
+
@@ -66,7 +65,6 @@
-
@@ -106,14 +104,6 @@
-
-
-
-
-
-
-
-
@@ -128,6 +118,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -147,6 +147,8 @@
+
+
@@ -161,14 +163,15 @@
+
+
+
+
+
+
-
-
-
-
-
-
+
diff --git a/bin/x86/Debug/View/AdmissionsPage.xbf b/bin/x86/Debug/View/AdmissionsPage.xbf
index 1edf919..1e5e325 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 daca93d..0f41b57 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 0911e6a..4e55040 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 6b46ff0..f15c8b9 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 15deffe..1690cdc 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
new file mode 100644
index 0000000..dcf1b36
Binary files /dev/null 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 f97d487..420cb4e 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 fbab531..e8f219f 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 fa602d0..9bf2146 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
new file mode 100644
index 0000000..fa566a7
Binary files /dev/null and b/bin/x86/Debug/View/SurgeriesPage.xbf differ
diff --git a/bin/x86/Debug/View/UserControls/ColumnListView.xbf b/bin/x86/Debug/View/UserControls/ColumnListView.xbf
deleted file mode 100644
index 0a3df4f..0000000
Binary files a/bin/x86/Debug/View/UserControls/ColumnListView.xbf and /dev/null differ
diff --git a/bin/x86/Debug/resources.pri b/bin/x86/Debug/resources.pri
index 224d8a6..ce4ebf1 100644
Binary files a/bin/x86/Debug/resources.pri and b/bin/x86/Debug/resources.pri differ
diff --git a/obj/x86/Debug/App.g.cs b/obj/x86/Debug/App.g.cs
index 9bbc4ec..dac6171 100644
--- a/obj/x86/Debug/App.g.cs
+++ b/obj/x86/Debug/App.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6E38FB29F9D5CA8F36FB6C3E6488659E"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "93B905F6219D7391BE00214FC4FA75D9"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
diff --git a/obj/x86/Debug/App.g.i.cs b/obj/x86/Debug/App.g.i.cs
index c2e109e..c3c1d68 100644
--- a/obj/x86/Debug/App.g.i.cs
+++ b/obj/x86/Debug/App.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "6E38FB29F9D5CA8F36FB6C3E6488659E"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "93B905F6219D7391BE00214FC4FA75D9"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
diff --git a/obj/x86/Debug/App.xaml b/obj/x86/Debug/App.xaml
index cc5c0b9..1290a64 100644
--- a/obj/x86/Debug/App.xaml
+++ b/obj/x86/Debug/App.xaml
@@ -2,7 +2,8 @@
x:Class="HospitalServerManager.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:HospitalServerManager">
+ xmlns:local="using:HospitalServerManager"
+ RequestedTheme="Light">
diff --git a/obj/x86/Debug/App.xbf b/obj/x86/Debug/App.xbf
index 5a1d538..53e1f8e 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 0f27b75..3a58c56 100644
--- a/obj/x86/Debug/HospitalServerManager.csproj.CoreCompileInputs.cache
+++ b/obj/x86/Debug/HospitalServerManager.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f03c17be22ceb22b1ce3324e21e3371a79db21a6
+047462d3464f4c463d63a2cd80aec82b38733e4c
diff --git a/obj/x86/Debug/HospitalServerManager.csproj.FileListAbsolute.txt b/obj/x86/Debug/HospitalServerManager.csproj.FileListAbsolute.txt
index db69db9..d40e8f4 100644
--- a/obj/x86/Debug/HospitalServerManager.csproj.FileListAbsolute.txt
+++ b/obj/x86/Debug/HospitalServerManager.csproj.FileListAbsolute.txt
@@ -612,22 +612,17 @@ C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\MainFrameView.g.cs
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\PatientsPage.g.i.cs
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\PatientsPage.g.cs
-C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\UserControls\ColumnListView.g.i.cs
-C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\UserControls\ColumnListView.g.cs
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\App.xaml
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\MainFrameView.xaml
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\PatientsPage.xaml
-C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\UserControls\ColumnListView.xaml
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\App.xbf
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\MainFrameView.xbf
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\PatientsPage.xbf
-C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\UserControls\ColumnListView.xbf
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\HospitalServerManager.exe
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\HospitalServerManager.pdb
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\App.xbf
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\View\MainFrameView.xbf
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\View\PatientsPage.xbf
-C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\View\UserControls\ColumnListView.xbf
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\HospitalServerManager.xr.xml
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\HospitalServerManager.exe
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\HospitalServerManager.pdb
@@ -942,3 +937,13 @@ C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\DiagnosesPage.g.cs
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\DiagnosesPage.xaml
C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\DiagnosesPage.xbf
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\SurgeriesPage.g.i.cs
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\SurgeriesPage.g.cs
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\SurgeriesPage.xaml
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\SurgeriesPage.xbf
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\View\SurgeriesPage.xbf
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\NewAdmissionPage.g.i.cs
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\NewAdmissionPage.g.cs
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\NewAdmissionPage.xaml
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\obj\x86\Debug\View\NewAdmissionPage.xbf
+C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\bin\x86\Debug\View\NewAdmissionPage.xbf
diff --git a/obj/x86/Debug/HospitalServerManager.exe b/obj/x86/Debug/HospitalServerManager.exe
index afdd0a3..dc6098a 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 82dbfc1..5e6e601 100644
Binary files a/obj/x86/Debug/HospitalServerManager.pdb and b/obj/x86/Debug/HospitalServerManager.pdb differ
diff --git a/obj/x86/Debug/HospitalServerManager.xr.xml b/obj/x86/Debug/HospitalServerManager.xr.xml
index e20d0e9..9b981ea 100644
--- a/obj/x86/Debug/HospitalServerManager.xr.xml
+++ b/obj/x86/Debug/HospitalServerManager.xr.xml
@@ -1,10 +1,9 @@
-
-
-
-
+
+
+
@@ -66,7 +65,6 @@
-
@@ -106,14 +104,6 @@
-
-
-
-
-
-
-
-
@@ -128,6 +118,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -147,6 +147,8 @@
+
+
@@ -161,14 +163,15 @@
+
+
+
+
+
+
-
-
-
-
-
-
+
diff --git a/obj/x86/Debug/View/AdmissionsPage.g.cs b/obj/x86/Debug/View/AdmissionsPage.g.cs
index fe009cc..5089b91 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}" "E7F790C1DC46B1BD7555B0808C61D134"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\AdmissionsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4D2B04A0ACD4E8803760518066DE8FB2"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -65,34 +65,34 @@ namespace HospitalServerManager.View
{
switch(connectionId)
{
- case 5: // View\AdmissionsPage.xaml line 145
+ case 5: // View\AdmissionsPage.xaml line 143
this.obj5 = new global::System.WeakReference((global::Windows.UI.Xaml.Controls.Grid)target);
break;
- case 6: // View\AdmissionsPage.xaml line 157
+ case 6: // View\AdmissionsPage.xaml line 155
this.obj6 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 7: // View\AdmissionsPage.xaml line 160
+ case 7: // View\AdmissionsPage.xaml line 158
this.obj7 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 8: // View\AdmissionsPage.xaml line 163
+ case 8: // View\AdmissionsPage.xaml line 161
this.obj8 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 9: // View\AdmissionsPage.xaml line 165
+ case 9: // View\AdmissionsPage.xaml line 163
this.obj9 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 10: // View\AdmissionsPage.xaml line 167
+ case 10: // View\AdmissionsPage.xaml line 165
this.obj10 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 11: // View\AdmissionsPage.xaml line 169
+ case 11: // View\AdmissionsPage.xaml line 167
this.obj11 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 12: // View\AdmissionsPage.xaml line 171
+ case 12: // View\AdmissionsPage.xaml line 169
this.obj12 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 13: // View\AdmissionsPage.xaml line 173
+ case 13: // View\AdmissionsPage.xaml line 171
this.obj13 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 14: // View\AdmissionsPage.xaml line 175
+ case 14: // View\AdmissionsPage.xaml line 173
this.obj14 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
default:
@@ -210,31 +210,31 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 157
+ // View\AdmissionsPage.xaml line 155
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj6, obj, null);
}
}
- private void Update_AdmissionDate(global::System.DateTime obj, int phase)
+ private void Update_AdmissionDate(global::System.String obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 160
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj7, obj.ToString(), null);
+ // View\AdmissionsPage.xaml line 158
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj7, obj, null);
}
}
- private void Update_LeavingDate(global::System.Nullable obj, int phase)
+ private void Update_LeavingDate(global::System.String obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 163
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj8, obj.ToString(), null);
+ // View\AdmissionsPage.xaml line 161
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj8, obj, null);
}
}
private void Update_PatientPESEL(global::System.String obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 165
+ // View\AdmissionsPage.xaml line 163
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj9, obj, null);
}
}
@@ -242,7 +242,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 167
+ // View\AdmissionsPage.xaml line 165
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj10, obj, null);
}
}
@@ -250,7 +250,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 169
+ // View\AdmissionsPage.xaml line 167
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj11, obj.ToString(), null);
}
}
@@ -258,7 +258,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 171
+ // View\AdmissionsPage.xaml line 169
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj12, obj.ToString(), null);
}
}
@@ -266,7 +266,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 173
+ // View\AdmissionsPage.xaml line 171
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj13, obj.ToString(), null);
}
}
@@ -274,7 +274,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\AdmissionsPage.xaml line 175
+ // View\AdmissionsPage.xaml line 173
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj14, obj.ToString(), null);
}
}
@@ -288,12 +288,6 @@ namespace HospitalServerManager.View
{
switch(connectionId)
{
- case 1: // View\AdmissionsPage.xaml line 1
- {
- global::Windows.UI.Xaml.Controls.Page element1 = (global::Windows.UI.Xaml.Controls.Page)(target);
- ((global::Windows.UI.Xaml.Controls.Page)element1).Loaded += this.Page_Loaded;
- }
- break;
case 2: // View\AdmissionsPage.xaml line 12
{
this.RosterViewModel = (global::HospitalServerManager.ViewModel.RosterViewModel)(target);
@@ -304,7 +298,7 @@ namespace HospitalServerManager.View
this.pageTitle = (global::Windows.UI.Xaml.Controls.TextBlock)(target);
}
break;
- case 4: // View\AdmissionsPage.xaml line 132
+ case 4: // View\AdmissionsPage.xaml line 130
{
this.databaseView = (global::Windows.UI.Xaml.Controls.ListView)(target);
}
@@ -351,8 +345,7 @@ namespace HospitalServerManager.View
break;
case 23: // View\AdmissionsPage.xaml line 34
{
- global::Windows.UI.Xaml.Controls.Button element23 = (global::Windows.UI.Xaml.Controls.Button)(target);
- ((global::Windows.UI.Xaml.Controls.Button)element23).Click += this.NewRecordButton_Click;
+ this.btnNewRecord = (global::Windows.UI.Xaml.Controls.Button)(target);
}
break;
case 24: // View\AdmissionsPage.xaml line 35
@@ -383,7 +376,7 @@ namespace HospitalServerManager.View
global::Windows.UI.Xaml.Markup.IComponentConnector returnValue = null;
switch(connectionId)
{
- case 5: // View\AdmissionsPage.xaml line 145
+ case 5: // View\AdmissionsPage.xaml line 143
{
global::Windows.UI.Xaml.Controls.Grid element5 = (global::Windows.UI.Xaml.Controls.Grid)target;
AdmissionsPage_obj5_Bindings bindings = new AdmissionsPage_obj5_Bindings();
diff --git a/obj/x86/Debug/View/AdmissionsPage.g.i.cs b/obj/x86/Debug/View/AdmissionsPage.g.i.cs
index fdb1389..28b82a8 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}" "E7F790C1DC46B1BD7555B0808C61D134"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\AdmissionsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "4D2B04A0ACD4E8803760518066DE8FB2"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -31,6 +31,8 @@ namespace HospitalServerManager.View
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
private global::Windows.UI.Xaml.Controls.ComboBox lookInComboBox;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.Button btnNewRecord;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
private bool _contentLoaded;
///
diff --git a/obj/x86/Debug/View/AdmissionsPage.xaml b/obj/x86/Debug/View/AdmissionsPage.xaml
index 69f02ee..2fda01b 100644
--- a/obj/x86/Debug/View/AdmissionsPage.xaml
+++ b/obj/x86/Debug/View/AdmissionsPage.xaml
@@ -1,4 +1,4 @@
-
+ Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -31,7 +31,7 @@
-
+
@@ -88,8 +88,6 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -154,25 +152,25 @@
-
-
-
-
-
-
-
-
-
diff --git a/obj/x86/Debug/View/AdmissionsPage.xbf b/obj/x86/Debug/View/AdmissionsPage.xbf
index 1edf919..1e5e325 100644
Binary files a/obj/x86/Debug/View/AdmissionsPage.xbf and b/obj/x86/Debug/View/AdmissionsPage.xbf differ
diff --git a/obj/x86/Debug/View/DiagnosesPage.g.cs b/obj/x86/Debug/View/DiagnosesPage.g.cs
index 80d7b95..2871feb 100644
--- a/obj/x86/Debug/View/DiagnosesPage.g.cs
+++ b/obj/x86/Debug/View/DiagnosesPage.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\DiagnosesPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "507D0D235F37666962632326D8D60175"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\DiagnosesPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AABEDB5A200FD3FC5A7E33D09296B24C"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -60,19 +60,19 @@ namespace HospitalServerManager.View
{
switch(connectionId)
{
- case 5: // View\DiagnosesPage.xaml line 132
+ case 5: // View\DiagnosesPage.xaml line 130
this.obj5 = new global::System.WeakReference((global::Windows.UI.Xaml.Controls.Grid)target);
break;
- case 6: // View\DiagnosesPage.xaml line 139
+ case 6: // View\DiagnosesPage.xaml line 137
this.obj6 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 7: // View\DiagnosesPage.xaml line 142
+ case 7: // View\DiagnosesPage.xaml line 140
this.obj7 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 8: // View\DiagnosesPage.xaml line 145
+ case 8: // View\DiagnosesPage.xaml line 143
this.obj8 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 9: // View\DiagnosesPage.xaml line 147
+ case 9: // View\DiagnosesPage.xaml line 145
this.obj9 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
default:
@@ -185,7 +185,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DiagnosesPage.xaml line 139
+ // View\DiagnosesPage.xaml line 137
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj6, obj, null);
}
}
@@ -193,7 +193,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DiagnosesPage.xaml line 142
+ // View\DiagnosesPage.xaml line 140
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj7, obj, null);
}
}
@@ -201,7 +201,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DiagnosesPage.xaml line 145
+ // View\DiagnosesPage.xaml line 143
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj8, obj, null);
}
}
@@ -209,7 +209,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DiagnosesPage.xaml line 147
+ // View\DiagnosesPage.xaml line 145
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj9, obj, null);
}
}
@@ -239,7 +239,7 @@ namespace HospitalServerManager.View
this.pageTitle = (global::Windows.UI.Xaml.Controls.TextBlock)(target);
}
break;
- case 4: // View\DiagnosesPage.xaml line 119
+ case 4: // View\DiagnosesPage.xaml line 117
{
this.databaseView = (global::Windows.UI.Xaml.Controls.ListView)(target);
}
@@ -318,7 +318,7 @@ namespace HospitalServerManager.View
global::Windows.UI.Xaml.Markup.IComponentConnector returnValue = null;
switch(connectionId)
{
- case 5: // View\DiagnosesPage.xaml line 132
+ case 5: // View\DiagnosesPage.xaml line 130
{
global::Windows.UI.Xaml.Controls.Grid element5 = (global::Windows.UI.Xaml.Controls.Grid)target;
DiagnosesPage_obj5_Bindings bindings = new DiagnosesPage_obj5_Bindings();
diff --git a/obj/x86/Debug/View/DiagnosesPage.g.i.cs b/obj/x86/Debug/View/DiagnosesPage.g.i.cs
index c9f584d..c2b491c 100644
--- a/obj/x86/Debug/View/DiagnosesPage.g.i.cs
+++ b/obj/x86/Debug/View/DiagnosesPage.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\DiagnosesPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "507D0D235F37666962632326D8D60175"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\DiagnosesPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AABEDB5A200FD3FC5A7E33D09296B24C"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
diff --git a/obj/x86/Debug/View/DiagnosesPage.xaml b/obj/x86/Debug/View/DiagnosesPage.xaml
index a315c2b..c5da67e 100644
--- a/obj/x86/Debug/View/DiagnosesPage.xaml
+++ b/obj/x86/Debug/View/DiagnosesPage.xaml
@@ -25,7 +25,7 @@
-
@@ -85,8 +85,6 @@
-
-
+
-
-
-
-
+
+
+
+
@@ -131,20 +129,20 @@
-
+
-
-
-
diff --git a/obj/x86/Debug/View/DiagnosesPage.xbf b/obj/x86/Debug/View/DiagnosesPage.xbf
index daca93d..0f41b57 100644
Binary files a/obj/x86/Debug/View/DiagnosesPage.xbf and b/obj/x86/Debug/View/DiagnosesPage.xbf differ
diff --git a/obj/x86/Debug/View/DoctorsPage.g.cs b/obj/x86/Debug/View/DoctorsPage.g.cs
index bd5f428..2917ea0 100644
--- a/obj/x86/Debug/View/DoctorsPage.g.cs
+++ b/obj/x86/Debug/View/DoctorsPage.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\DoctorsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "154D15F17780F3E6DC4A4BD69A9548A8"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\DoctorsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "971DADAA13475823239220CC8C40CAE3"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -63,28 +63,28 @@ namespace HospitalServerManager.View
{
switch(connectionId)
{
- case 5: // View\DoctorsPage.xaml line 141
+ case 5: // View\DoctorsPage.xaml line 139
this.obj5 = new global::System.WeakReference((global::Windows.UI.Xaml.Controls.Grid)target);
break;
- case 6: // View\DoctorsPage.xaml line 151
+ case 6: // View\DoctorsPage.xaml line 149
this.obj6 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 7: // View\DoctorsPage.xaml line 154
+ case 7: // View\DoctorsPage.xaml line 152
this.obj7 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 8: // View\DoctorsPage.xaml line 157
+ case 8: // View\DoctorsPage.xaml line 155
this.obj8 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 9: // View\DoctorsPage.xaml line 159
+ case 9: // View\DoctorsPage.xaml line 157
this.obj9 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 10: // View\DoctorsPage.xaml line 161
+ case 10: // View\DoctorsPage.xaml line 159
this.obj10 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 11: // View\DoctorsPage.xaml line 163
+ case 11: // View\DoctorsPage.xaml line 161
this.obj11 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 12: // View\DoctorsPage.xaml line 165
+ case 12: // View\DoctorsPage.xaml line 163
this.obj12 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
default:
@@ -200,7 +200,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DoctorsPage.xaml line 151
+ // View\DoctorsPage.xaml line 149
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj6, obj, null);
}
}
@@ -208,7 +208,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DoctorsPage.xaml line 154
+ // View\DoctorsPage.xaml line 152
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj7, obj, null);
}
}
@@ -216,7 +216,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DoctorsPage.xaml line 157
+ // View\DoctorsPage.xaml line 155
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj8, obj, null);
}
}
@@ -224,7 +224,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DoctorsPage.xaml line 159
+ // View\DoctorsPage.xaml line 157
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj9, obj, null);
}
}
@@ -232,23 +232,23 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DoctorsPage.xaml line 161
+ // View\DoctorsPage.xaml line 159
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj10, obj, null);
}
}
- private void Update_EmploymentDate(global::System.DateTime obj, int phase)
+ private void Update_EmploymentDate(global::System.String obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DoctorsPage.xaml line 163
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj11, obj.ToString(), null);
+ // View\DoctorsPage.xaml line 161
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj11, obj, null);
}
}
private void Update_JobPosition(global::System.String obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\DoctorsPage.xaml line 165
+ // View\DoctorsPage.xaml line 163
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj12, obj, null);
}
}
@@ -278,7 +278,7 @@ namespace HospitalServerManager.View
this.pageTitle = (global::Windows.UI.Xaml.Controls.TextBlock)(target);
}
break;
- case 4: // View\DoctorsPage.xaml line 128
+ case 4: // View\DoctorsPage.xaml line 126
{
this.databaseView = (global::Windows.UI.Xaml.Controls.ListView)(target);
}
@@ -357,7 +357,7 @@ namespace HospitalServerManager.View
global::Windows.UI.Xaml.Markup.IComponentConnector returnValue = null;
switch(connectionId)
{
- case 5: // View\DoctorsPage.xaml line 141
+ case 5: // View\DoctorsPage.xaml line 139
{
global::Windows.UI.Xaml.Controls.Grid element5 = (global::Windows.UI.Xaml.Controls.Grid)target;
DoctorsPage_obj5_Bindings bindings = new DoctorsPage_obj5_Bindings();
diff --git a/obj/x86/Debug/View/DoctorsPage.g.i.cs b/obj/x86/Debug/View/DoctorsPage.g.i.cs
index a8a1a73..90269df 100644
--- a/obj/x86/Debug/View/DoctorsPage.g.i.cs
+++ b/obj/x86/Debug/View/DoctorsPage.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\DoctorsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "154D15F17780F3E6DC4A4BD69A9548A8"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\DoctorsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "971DADAA13475823239220CC8C40CAE3"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
diff --git a/obj/x86/Debug/View/DoctorsPage.xaml b/obj/x86/Debug/View/DoctorsPage.xaml
index ff3631a..a4117b5 100644
--- a/obj/x86/Debug/View/DoctorsPage.xaml
+++ b/obj/x86/Debug/View/DoctorsPage.xaml
@@ -88,8 +88,6 @@
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -141,28 +139,28 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
diff --git a/obj/x86/Debug/View/DoctorsPage.xbf b/obj/x86/Debug/View/DoctorsPage.xbf
index 0911e6a..4e55040 100644
Binary files a/obj/x86/Debug/View/DoctorsPage.xbf and b/obj/x86/Debug/View/DoctorsPage.xbf differ
diff --git a/obj/x86/Debug/View/EditRecordDialog.xbf b/obj/x86/Debug/View/EditRecordDialog.xbf
index 6b46ff0..f15c8b9 100644
Binary files a/obj/x86/Debug/View/EditRecordDialog.xbf and b/obj/x86/Debug/View/EditRecordDialog.xbf differ
diff --git a/obj/x86/Debug/View/MainFrameView.g.cs b/obj/x86/Debug/View/MainFrameView.g.cs
index 84859d4..fa8176f 100644
--- a/obj/x86/Debug/View/MainFrameView.g.cs
+++ b/obj/x86/Debug/View/MainFrameView.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\MainFrameView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7F242CBA31C865C289BC4CEE93B799A9"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\MainFrameView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "788DC4EDA86A5130B8D8C5518DE569B8"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
diff --git a/obj/x86/Debug/View/MainFrameView.g.i.cs b/obj/x86/Debug/View/MainFrameView.g.i.cs
index 0f40a94..eeefb1c 100644
--- a/obj/x86/Debug/View/MainFrameView.g.i.cs
+++ b/obj/x86/Debug/View/MainFrameView.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\MainFrameView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "7F242CBA31C865C289BC4CEE93B799A9"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\MainFrameView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "788DC4EDA86A5130B8D8C5518DE569B8"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
diff --git a/obj/x86/Debug/View/MainFrameView.xaml b/obj/x86/Debug/View/MainFrameView.xaml
index 06515c9..feed2ec 100644
--- a/obj/x86/Debug/View/MainFrameView.xaml
+++ b/obj/x86/Debug/View/MainFrameView.xaml
@@ -14,9 +14,9 @@
+ Name="navigationBar" Grid.Row="0" IsOpen="True" IsSticky="True">
-
+
diff --git a/obj/x86/Debug/View/MainFrameView.xbf b/obj/x86/Debug/View/MainFrameView.xbf
index 15deffe..1690cdc 100644
Binary files a/obj/x86/Debug/View/MainFrameView.xbf and b/obj/x86/Debug/View/MainFrameView.xbf differ
diff --git a/obj/x86/Debug/View/NewAdmissionPage.g.cs b/obj/x86/Debug/View/NewAdmissionPage.g.cs
new file mode 100644
index 0000000..3c16fa0
--- /dev/null
+++ b/obj/x86/Debug/View/NewAdmissionPage.g.cs
@@ -0,0 +1,116 @@
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\NewAdmissionPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "38AFE574CD0B5678EA5AC6CD4279A0EC"
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace HospitalServerManager.View
+{
+ partial class NewAdmissionPage :
+ global::Windows.UI.Xaml.Controls.Page,
+ global::Windows.UI.Xaml.Markup.IComponentConnector,
+ global::Windows.UI.Xaml.Markup.IComponentConnector2
+ {
+ ///
+ /// Connect()
+ ///
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public void Connect(int connectionId, object target)
+ {
+ switch(connectionId)
+ {
+ case 2: // View\NewAdmissionPage.xaml line 12
+ {
+ this.RosterViewModel = (global::HospitalServerManager.ViewModel.RosterViewModel)(target);
+ }
+ break;
+ case 3: // View\NewAdmissionPage.xaml line 14
+ {
+ this.grid = (global::Windows.UI.Xaml.Controls.Grid)(target);
+ }
+ break;
+ case 4: // View\NewAdmissionPage.xaml line 32
+ {
+ this.lastAdmission = (global::Windows.UI.Xaml.Controls.TextBlock)(target);
+ }
+ break;
+ case 5: // View\NewAdmissionPage.xaml line 34
+ {
+ this.tbID = (global::Windows.UI.Xaml.Controls.TextBox)(target);
+ }
+ break;
+ case 6: // View\NewAdmissionPage.xaml line 35
+ {
+ this.admissionDate = (global::Windows.UI.Xaml.Controls.DatePicker)(target);
+ }
+ break;
+ case 7: // View\NewAdmissionPage.xaml line 36
+ {
+ this.leavingDate = (global::Windows.UI.Xaml.Controls.DatePicker)(target);
+ }
+ break;
+ case 8: // View\NewAdmissionPage.xaml line 37
+ {
+ this.patientsId = (global::Windows.UI.Xaml.Controls.ComboBox)(target);
+ }
+ break;
+ case 9: // View\NewAdmissionPage.xaml line 38
+ {
+ this.diagnosisSymbol = (global::Windows.UI.Xaml.Controls.ComboBox)(target);
+ }
+ break;
+ case 10: // View\NewAdmissionPage.xaml line 39
+ {
+ this.mainDoctorId = (global::Windows.UI.Xaml.Controls.ComboBox)(target);
+ }
+ break;
+ case 11: // View\NewAdmissionPage.xaml line 40
+ {
+ this.operationId = (global::Windows.UI.Xaml.Controls.ComboBox)(target);
+ }
+ break;
+ case 12: // View\NewAdmissionPage.xaml line 41
+ {
+ this.roomNumber = (global::Windows.UI.Xaml.Controls.ComboBox)(target);
+ }
+ break;
+ case 13: // View\NewAdmissionPage.xaml line 46
+ {
+ global::Windows.UI.Xaml.Controls.Button element13 = (global::Windows.UI.Xaml.Controls.Button)(target);
+ ((global::Windows.UI.Xaml.Controls.Button)element13).Click += this.Button_Click;
+ }
+ break;
+ case 14: // View\NewAdmissionPage.xaml line 43
+ {
+ this.trueCheckBox = (global::Windows.UI.Xaml.Controls.RadioButton)(target);
+ }
+ break;
+ case 15: // View\NewAdmissionPage.xaml line 44
+ {
+ this.falseCheckBox = (global::Windows.UI.Xaml.Controls.RadioButton)(target);
+ }
+ break;
+ default:
+ break;
+ }
+ this._contentLoaded = true;
+ }
+
+ ///
+ /// GetBindingConnector(int connectionId, object target)
+ ///
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public global::Windows.UI.Xaml.Markup.IComponentConnector GetBindingConnector(int connectionId, object target)
+ {
+ global::Windows.UI.Xaml.Markup.IComponentConnector returnValue = null;
+ return returnValue;
+ }
+ }
+}
+
diff --git a/obj/x86/Debug/View/NewAdmissionPage.g.i.cs b/obj/x86/Debug/View/NewAdmissionPage.g.i.cs
new file mode 100644
index 0000000..9b8ece4
--- /dev/null
+++ b/obj/x86/Debug/View/NewAdmissionPage.g.i.cs
@@ -0,0 +1,67 @@
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\NewAdmissionPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "38AFE574CD0B5678EA5AC6CD4279A0EC"
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace HospitalServerManager.View
+{
+ partial class NewAdmissionPage : global::Windows.UI.Xaml.Controls.Page
+ {
+
+
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::HospitalServerManager.ViewModel.RosterViewModel RosterViewModel;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.Grid grid;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.TextBlock lastAdmission;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.TextBox tbID;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.DatePicker admissionDate;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.DatePicker leavingDate;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.ComboBox patientsId;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.ComboBox diagnosisSymbol;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.ComboBox mainDoctorId;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.ComboBox operationId;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.ComboBox roomNumber;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.RadioButton trueCheckBox;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.RadioButton falseCheckBox;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private bool _contentLoaded;
+
+ ///
+ /// InitializeComponent()
+ ///
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public void InitializeComponent()
+ {
+ if (_contentLoaded)
+ return;
+
+ _contentLoaded = true;
+
+ global::System.Uri resourceLocator = new global::System.Uri("ms-appx:///View/NewAdmissionPage.xaml");
+ global::Windows.UI.Xaml.Application.LoadComponent(this, resourceLocator, global::Windows.UI.Xaml.Controls.Primitives.ComponentResourceLocation.Application);
+ }
+
+ partial void UnloadObject(global::Windows.UI.Xaml.DependencyObject unloadableObject);
+
+ }
+}
+
+
diff --git a/obj/x86/Debug/View/NewAdmissionPage.xaml b/obj/x86/Debug/View/NewAdmissionPage.xaml
new file mode 100644
index 0000000..e7bdb7a
--- /dev/null
+++ b/obj/x86/Debug/View/NewAdmissionPage.xaml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/obj/x86/Debug/View/NewAdmissionPage.xbf b/obj/x86/Debug/View/NewAdmissionPage.xbf
new file mode 100644
index 0000000..dcf1b36
Binary files /dev/null and b/obj/x86/Debug/View/NewAdmissionPage.xbf differ
diff --git a/obj/x86/Debug/View/NewRecordDialog.xbf b/obj/x86/Debug/View/NewRecordDialog.xbf
index f97d487..420cb4e 100644
Binary files a/obj/x86/Debug/View/NewRecordDialog.xbf and b/obj/x86/Debug/View/NewRecordDialog.xbf differ
diff --git a/obj/x86/Debug/View/PatientsPage.g.cs b/obj/x86/Debug/View/PatientsPage.g.cs
index 29b674f..02319fe 100644
--- a/obj/x86/Debug/View/PatientsPage.g.cs
+++ b/obj/x86/Debug/View/PatientsPage.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\PatientsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1150D0D916A92D2CFD6174BAB61BA935"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\PatientsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "ABF717A0E9935312ED0EDE0BD23FA3DD"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -62,25 +62,25 @@ namespace HospitalServerManager.View
{
switch(connectionId)
{
- case 5: // View\PatientsPage.xaml line 140
+ case 5: // View\PatientsPage.xaml line 139
this.obj5 = new global::System.WeakReference((global::Windows.UI.Xaml.Controls.Grid)target);
break;
- case 6: // View\PatientsPage.xaml line 149
+ case 6: // View\PatientsPage.xaml line 148
this.obj6 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 7: // View\PatientsPage.xaml line 152
+ case 7: // View\PatientsPage.xaml line 151
this.obj7 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 8: // View\PatientsPage.xaml line 155
+ case 8: // View\PatientsPage.xaml line 154
this.obj8 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 9: // View\PatientsPage.xaml line 157
+ case 9: // View\PatientsPage.xaml line 156
this.obj9 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 10: // View\PatientsPage.xaml line 159
+ case 10: // View\PatientsPage.xaml line 158
this.obj10 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 11: // View\PatientsPage.xaml line 161
+ case 11: // View\PatientsPage.xaml line 160
this.obj11 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
default:
@@ -195,7 +195,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\PatientsPage.xaml line 149
+ // View\PatientsPage.xaml line 148
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj6, obj, null);
}
}
@@ -203,7 +203,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\PatientsPage.xaml line 152
+ // View\PatientsPage.xaml line 151
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj7, obj, null);
}
}
@@ -211,23 +211,23 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\PatientsPage.xaml line 155
+ // View\PatientsPage.xaml line 154
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj8, obj, null);
}
}
- private void Update_BirthDate(global::System.DateTime obj, int phase)
+ private void Update_BirthDate(global::System.String obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\PatientsPage.xaml line 157
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj9, obj.ToString(), null);
+ // View\PatientsPage.xaml line 156
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj9, obj, null);
}
}
private void Update_PatientState(global::System.String obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\PatientsPage.xaml line 159
+ // View\PatientsPage.xaml line 158
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj10, obj, null);
}
}
@@ -235,7 +235,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\PatientsPage.xaml line 161
+ // View\PatientsPage.xaml line 160
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj11, obj, null);
}
}
@@ -265,7 +265,7 @@ namespace HospitalServerManager.View
this.pageTitle = (global::Windows.UI.Xaml.Controls.TextBlock)(target);
}
break;
- case 4: // View\PatientsPage.xaml line 127
+ case 4: // View\PatientsPage.xaml line 126
{
this.databaseView = (global::Windows.UI.Xaml.Controls.ListView)(target);
}
@@ -276,56 +276,62 @@ namespace HospitalServerManager.View
((global::Windows.UI.Xaml.Controls.ComboBox)this.sortComboBox).SelectionChanged += this.SortComboBox_SelectionChanged;
}
break;
- case 14: // View\PatientsPage.xaml line 89
+ case 14: // View\PatientsPage.xaml line 92
+ {
+ this.sendEmailToSelected = (global::Windows.UI.Xaml.Controls.Button)(target);
+ ((global::Windows.UI.Xaml.Controls.Button)this.sendEmailToSelected).Click += this.SendEmailToSelected_Click;
+ }
+ break;
+ case 15: // View\PatientsPage.xaml line 89
{
this.radioBtn1 = (global::Windows.UI.Xaml.Controls.RadioButton)(target);
((global::Windows.UI.Xaml.Controls.RadioButton)this.radioBtn1).Click += this.RadionBtn_Click;
}
break;
- case 15: // View\PatientsPage.xaml line 90
+ case 16: // View\PatientsPage.xaml line 90
{
this.radionBtn2 = (global::Windows.UI.Xaml.Controls.RadioButton)(target);
((global::Windows.UI.Xaml.Controls.RadioButton)this.radionBtn2).Click += this.RadionBtn_Click;
}
break;
- case 16: // View\PatientsPage.xaml line 59
+ case 17: // View\PatientsPage.xaml line 59
{
this.searchBox = (global::Windows.UI.Xaml.Controls.TextBox)(target);
}
break;
- case 17: // View\PatientsPage.xaml line 61
+ case 18: // View\PatientsPage.xaml line 61
{
this.lookInComboBox = (global::Windows.UI.Xaml.Controls.ComboBox)(target);
}
break;
- case 18: // View\PatientsPage.xaml line 64
- {
- global::Windows.UI.Xaml.Controls.Button element18 = (global::Windows.UI.Xaml.Controls.Button)(target);
- ((global::Windows.UI.Xaml.Controls.Button)element18).Click += this.SearchButton_Click;
- }
- break;
- case 19: // View\PatientsPage.xaml line 65
+ case 19: // View\PatientsPage.xaml line 64
{
global::Windows.UI.Xaml.Controls.Button element19 = (global::Windows.UI.Xaml.Controls.Button)(target);
- ((global::Windows.UI.Xaml.Controls.Button)element19).Click += this.ResetButton_Click;
+ ((global::Windows.UI.Xaml.Controls.Button)element19).Click += this.SearchButton_Click;
}
break;
- case 20: // View\PatientsPage.xaml line 35
+ case 20: // View\PatientsPage.xaml line 65
{
global::Windows.UI.Xaml.Controls.Button element20 = (global::Windows.UI.Xaml.Controls.Button)(target);
- ((global::Windows.UI.Xaml.Controls.Button)element20).Click += this.NewRecordButton_Click;
+ ((global::Windows.UI.Xaml.Controls.Button)element20).Click += this.ResetButton_Click;
}
break;
- case 21: // View\PatientsPage.xaml line 36
+ case 21: // View\PatientsPage.xaml line 35
{
global::Windows.UI.Xaml.Controls.Button element21 = (global::Windows.UI.Xaml.Controls.Button)(target);
- ((global::Windows.UI.Xaml.Controls.Button)element21).Click += this.DeleteButton_Click;
+ ((global::Windows.UI.Xaml.Controls.Button)element21).Click += this.NewRecordButton_Click;
}
break;
- case 22: // View\PatientsPage.xaml line 37
+ case 22: // View\PatientsPage.xaml line 36
{
global::Windows.UI.Xaml.Controls.Button element22 = (global::Windows.UI.Xaml.Controls.Button)(target);
- ((global::Windows.UI.Xaml.Controls.Button)element22).Click += this.EditButton_Click;
+ ((global::Windows.UI.Xaml.Controls.Button)element22).Click += this.DeleteButton_Click;
+ }
+ break;
+ case 23: // View\PatientsPage.xaml line 37
+ {
+ global::Windows.UI.Xaml.Controls.Button element23 = (global::Windows.UI.Xaml.Controls.Button)(target);
+ ((global::Windows.UI.Xaml.Controls.Button)element23).Click += this.EditButton_Click;
}
break;
default:
@@ -344,7 +350,7 @@ namespace HospitalServerManager.View
global::Windows.UI.Xaml.Markup.IComponentConnector returnValue = null;
switch(connectionId)
{
- case 5: // View\PatientsPage.xaml line 140
+ case 5: // View\PatientsPage.xaml line 139
{
global::Windows.UI.Xaml.Controls.Grid element5 = (global::Windows.UI.Xaml.Controls.Grid)target;
PatientsPage_obj5_Bindings bindings = new PatientsPage_obj5_Bindings();
diff --git a/obj/x86/Debug/View/PatientsPage.g.i.cs b/obj/x86/Debug/View/PatientsPage.g.i.cs
index 5081009..7c42709 100644
--- a/obj/x86/Debug/View/PatientsPage.g.i.cs
+++ b/obj/x86/Debug/View/PatientsPage.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\PatientsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "1150D0D916A92D2CFD6174BAB61BA935"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\PatientsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "ABF717A0E9935312ED0EDE0BD23FA3DD"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -23,6 +23,8 @@ namespace HospitalServerManager.View
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
private global::Windows.UI.Xaml.Controls.ComboBox sortComboBox;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.Button sendEmailToSelected;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
private global::Windows.UI.Xaml.Controls.RadioButton radioBtn1;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
private global::Windows.UI.Xaml.Controls.RadioButton radionBtn2;
diff --git a/obj/x86/Debug/View/PatientsPage.xaml b/obj/x86/Debug/View/PatientsPage.xaml
index 8a70f6b..80ab5f3 100644
--- a/obj/x86/Debug/View/PatientsPage.xaml
+++ b/obj/x86/Debug/View/PatientsPage.xaml
@@ -32,9 +32,9 @@
-
-
-
+
+
+
@@ -56,13 +56,13 @@
VerticalAlignment="Center" Margin="10"/>
-
-
-
-
+
+
@@ -86,11 +86,10 @@
-
-
+
+
-
+
// This code was generated by a tool.
@@ -59,16 +59,16 @@ namespace HospitalServerManager.View
{
switch(connectionId)
{
- case 5: // View\RoomsPage.xaml line 131
+ case 5: // View\RoomsPage.xaml line 129
this.obj5 = new global::System.WeakReference((global::Windows.UI.Xaml.Controls.Grid)target);
break;
- case 6: // View\RoomsPage.xaml line 137
+ case 6: // View\RoomsPage.xaml line 135
this.obj6 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 7: // View\RoomsPage.xaml line 140
+ case 7: // View\RoomsPage.xaml line 138
this.obj7 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 8: // View\RoomsPage.xaml line 142
+ case 8: // View\RoomsPage.xaml line 140
this.obj8 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
default:
@@ -180,7 +180,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\RoomsPage.xaml line 137
+ // View\RoomsPage.xaml line 135
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj6, obj, null);
}
}
@@ -188,7 +188,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\RoomsPage.xaml line 140
+ // View\RoomsPage.xaml line 138
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj7, obj.ToString(), null);
}
}
@@ -196,7 +196,7 @@ namespace HospitalServerManager.View
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\RoomsPage.xaml line 142
+ // View\RoomsPage.xaml line 140
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj8, obj.ToString(), null);
}
}
@@ -226,7 +226,7 @@ namespace HospitalServerManager.View
this.pageTitle = (global::Windows.UI.Xaml.Controls.TextBlock)(target);
}
break;
- case 4: // View\RoomsPage.xaml line 118
+ case 4: // View\RoomsPage.xaml line 116
{
this.databaseView = (global::Windows.UI.Xaml.Controls.ListView)(target);
}
@@ -305,7 +305,7 @@ namespace HospitalServerManager.View
global::Windows.UI.Xaml.Markup.IComponentConnector returnValue = null;
switch(connectionId)
{
- case 5: // View\RoomsPage.xaml line 131
+ case 5: // View\RoomsPage.xaml line 129
{
global::Windows.UI.Xaml.Controls.Grid element5 = (global::Windows.UI.Xaml.Controls.Grid)target;
RoomsPage_obj5_Bindings bindings = new RoomsPage_obj5_Bindings();
diff --git a/obj/x86/Debug/View/RoomsPage.g.i.cs b/obj/x86/Debug/View/RoomsPage.g.i.cs
index 0011a26..2e63a4d 100644
--- a/obj/x86/Debug/View/RoomsPage.g.i.cs
+++ b/obj/x86/Debug/View/RoomsPage.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\RoomsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AE94A58F50A7512C3B442BBC09BE499A"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\RoomsPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D3EDC4667A3DEF37F922C3F41AC55142"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
diff --git a/obj/x86/Debug/View/RoomsPage.xaml b/obj/x86/Debug/View/RoomsPage.xaml
index 2a3fccd..a61a36a 100644
--- a/obj/x86/Debug/View/RoomsPage.xaml
+++ b/obj/x86/Debug/View/RoomsPage.xaml
@@ -26,7 +26,7 @@
-
@@ -86,8 +86,6 @@
-
-
-
-
+
+
+
@@ -135,12 +133,12 @@
-
-
+ FontSize="18"
+ Grid.Column="0" HorizontalAlignment="Center"/>
+
+
diff --git a/obj/x86/Debug/View/RoomsPage.xbf b/obj/x86/Debug/View/RoomsPage.xbf
index fa602d0..9bf2146 100644
Binary files a/obj/x86/Debug/View/RoomsPage.xbf and b/obj/x86/Debug/View/RoomsPage.xbf differ
diff --git a/obj/x86/Debug/View/UserControls/ColumnListView.g.cs b/obj/x86/Debug/View/SurgeriesPage.g.cs
similarity index 54%
rename from obj/x86/Debug/View/UserControls/ColumnListView.g.cs
rename to obj/x86/Debug/View/SurgeriesPage.g.cs
index 6f97cb6..c09c0c0 100644
--- a/obj/x86/Debug/View/UserControls/ColumnListView.g.cs
+++ b/obj/x86/Debug/View/SurgeriesPage.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\UserControls\ColumnListView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E8816074F83E5912D57314984E95026D"
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\SurgeriesPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B8D5630C92B67284A402D7B2E3A5A82C"
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -8,10 +8,10 @@
//
//------------------------------------------------------------------------------
-namespace HospitalServerManager.View.UserControls
+namespace HospitalServerManager.View
{
- partial class ColumnListView :
- global::Windows.UI.Xaml.Controls.UserControl,
+ partial class SurgeriesPage :
+ global::Windows.UI.Xaml.Controls.Page,
global::Windows.UI.Xaml.Markup.IComponentConnector,
global::Windows.UI.Xaml.Markup.IComponentConnector2
{
@@ -31,28 +31,28 @@ namespace HospitalServerManager.View.UserControls
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- private class ColumnListView_obj2_Bindings :
+ private class SurgeriesPage_obj5_Bindings :
global::Windows.UI.Xaml.IDataTemplateExtension,
global::Windows.UI.Xaml.Markup.IDataTemplateComponent,
global::Windows.UI.Xaml.Markup.IComponentConnector,
- IColumnListView_Bindings
+ ISurgeriesPage_Bindings
{
- private global::HospitalServerManager.ViewModel.PatientViewModel dataRoot;
+ private global::HospitalServerManager.ViewModel.SurgeryViewModel dataRoot;
private bool initialized = false;
private const int NOT_PHASED = (1 << 31);
private const int DATA_CHANGED = (1 << 30);
private bool removedDataContextHandler = false;
// Fields for each control that has bindings.
- private global::System.WeakReference obj2;
- private global::Windows.UI.Xaml.Controls.TextBlock obj3;
- private global::Windows.UI.Xaml.Controls.TextBlock obj4;
- private global::Windows.UI.Xaml.Controls.TextBlock obj5;
+ private global::System.WeakReference obj5;
private global::Windows.UI.Xaml.Controls.TextBlock obj6;
private global::Windows.UI.Xaml.Controls.TextBlock obj7;
private global::Windows.UI.Xaml.Controls.TextBlock obj8;
+ private global::Windows.UI.Xaml.Controls.TextBlock obj9;
+ private global::Windows.UI.Xaml.Controls.TextBlock obj10;
+ private global::Windows.UI.Xaml.Controls.TextBlock obj11;
- public ColumnListView_obj2_Bindings()
+ public SurgeriesPage_obj5_Bindings()
{
}
@@ -62,27 +62,27 @@ namespace HospitalServerManager.View.UserControls
{
switch(connectionId)
{
- case 2: // View\UserControls\ColumnListView.xaml line 35
- this.obj2 = new global::System.WeakReference((global::Windows.UI.Xaml.Controls.Grid)target);
+ case 5: // View\SurgeriesPage.xaml line 137
+ this.obj5 = new global::System.WeakReference((global::Windows.UI.Xaml.Controls.Grid)target);
break;
- case 3: // View\UserControls\ColumnListView.xaml line 44
- this.obj3 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
- break;
- case 4: // View\UserControls\ColumnListView.xaml line 47
- this.obj4 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
- break;
- case 5: // View\UserControls\ColumnListView.xaml line 50
- this.obj5 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
- break;
- case 6: // View\UserControls\ColumnListView.xaml line 52
+ case 6: // View\SurgeriesPage.xaml line 146
this.obj6 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 7: // View\UserControls\ColumnListView.xaml line 54
+ case 7: // View\SurgeriesPage.xaml line 149
this.obj7 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
- case 8: // View\UserControls\ColumnListView.xaml line 56
+ case 8: // View\SurgeriesPage.xaml line 152
this.obj8 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
break;
+ case 9: // View\SurgeriesPage.xaml line 154
+ this.obj9 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
+ break;
+ case 10: // View\SurgeriesPage.xaml line 156
+ this.obj10 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
+ break;
+ case 11: // View\SurgeriesPage.xaml line 158
+ this.obj11 = (global::Windows.UI.Xaml.Controls.TextBlock)target;
+ break;
default:
break;
}
@@ -128,19 +128,19 @@ namespace HospitalServerManager.View.UserControls
if (!removedDataContextHandler)
{
removedDataContextHandler = true;
- (this.obj2.Target as global::Windows.UI.Xaml.Controls.Grid).DataContextChanged -= this.DataContextChangedHandler;
+ (this.obj5.Target as global::Windows.UI.Xaml.Controls.Grid).DataContextChanged -= this.DataContextChangedHandler;
}
this.initialized = true;
break;
}
- this.Update_((global::HospitalServerManager.ViewModel.PatientViewModel) item, 1 << phase);
+ this.Update_((global::HospitalServerManager.ViewModel.SurgeryViewModel) item, 1 << phase);
}
public void Recycle()
{
}
- // IColumnListView_Bindings
+ // ISurgeriesPage_Bindings
public void Initialize()
{
@@ -169,25 +169,25 @@ namespace HospitalServerManager.View.UserControls
{
if (newDataRoot != null)
{
- this.dataRoot = (global::HospitalServerManager.ViewModel.PatientViewModel)newDataRoot;
+ this.dataRoot = (global::HospitalServerManager.ViewModel.SurgeryViewModel)newDataRoot;
return true;
}
return false;
}
// Update methods for each path node used in binding steps.
- private void Update_(global::HospitalServerManager.ViewModel.PatientViewModel obj, int phase)
+ private void Update_(global::HospitalServerManager.ViewModel.SurgeryViewModel obj, int phase)
{
if (obj != null)
{
if ((phase & (NOT_PHASED | (1 << 0))) != 0)
{
this.Update_PrimaryKey(obj.PrimaryKey, phase);
- this.Update_Surname(obj.Surname, phase);
- this.Update_Name(obj.Name, phase);
- this.Update_BirthDate(obj.BirthDate, phase);
- this.Update_PatientState(obj.PatientState, phase);
- this.Update_PatientSex(obj.PatientSex, phase);
+ this.Update_SurgeryName(obj.SurgeryName, phase);
+ this.Update_AverageTime(obj.AverageTime, phase);
+ this.Update_KindOfSurgery(obj.KindOfSurgery, phase);
+ this.Update_Cost(obj.Cost, phase);
+ this.Update_Refoundation(obj.Refoundation, phase);
}
}
}
@@ -195,48 +195,48 @@ namespace HospitalServerManager.View.UserControls
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\UserControls\ColumnListView.xaml line 44
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj3, obj, null);
+ // View\SurgeriesPage.xaml line 146
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj6, obj, null);
}
}
- private void Update_Surname(global::System.String obj, int phase)
+ private void Update_SurgeryName(global::System.String obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\UserControls\ColumnListView.xaml line 47
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj4, obj, null);
- }
- }
- private void Update_Name(global::System.String obj, int phase)
- {
- if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
- {
- // View\UserControls\ColumnListView.xaml line 50
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj5, obj, null);
- }
- }
- private void Update_BirthDate(global::System.DateTime obj, int phase)
- {
- if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
- {
- // View\UserControls\ColumnListView.xaml line 52
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj6, obj.ToString(), null);
- }
- }
- private void Update_PatientState(global::System.String obj, int phase)
- {
- if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
- {
- // View\UserControls\ColumnListView.xaml line 54
+ // View\SurgeriesPage.xaml line 149
XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj7, obj, null);
}
}
- private void Update_PatientSex(global::System.String obj, int phase)
+ private void Update_AverageTime(global::System.TimeSpan obj, int phase)
{
if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
{
- // View\UserControls\ColumnListView.xaml line 56
- XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj8, obj, null);
+ // View\SurgeriesPage.xaml line 152
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj8, obj.ToString(), null);
+ }
+ }
+ private void Update_KindOfSurgery(global::System.String obj, int phase)
+ {
+ if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
+ {
+ // View\SurgeriesPage.xaml line 154
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj9, obj, null);
+ }
+ }
+ private void Update_Cost(global::System.Decimal obj, int phase)
+ {
+ if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
+ {
+ // View\SurgeriesPage.xaml line 156
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj10, obj.ToString(), null);
+ }
+ }
+ private void Update_Refoundation(global::System.Int32 obj, int phase)
+ {
+ if ((phase & ((1 << 0) | NOT_PHASED )) != 0)
+ {
+ // View\SurgeriesPage.xaml line 158
+ XamlBindingSetters.Set_Windows_UI_Xaml_Controls_TextBlock_Text(this.obj11, obj.ToString(), null);
}
}
}
@@ -247,6 +247,90 @@ namespace HospitalServerManager.View.UserControls
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public void Connect(int connectionId, object target)
{
+ switch(connectionId)
+ {
+ case 1: // View\SurgeriesPage.xaml line 1
+ {
+ global::Windows.UI.Xaml.Controls.Page element1 = (global::Windows.UI.Xaml.Controls.Page)(target);
+ ((global::Windows.UI.Xaml.Controls.Page)element1).Loaded += this.Page_Loaded;
+ }
+ break;
+ case 2: // View\SurgeriesPage.xaml line 12
+ {
+ this.RosterViewModel = (global::HospitalServerManager.ViewModel.RosterViewModel)(target);
+ }
+ break;
+ case 3: // View\SurgeriesPage.xaml line 31
+ {
+ this.pageTitle = (global::Windows.UI.Xaml.Controls.TextBlock)(target);
+ }
+ break;
+ case 4: // View\SurgeriesPage.xaml line 124
+ {
+ this.databaseView = (global::Windows.UI.Xaml.Controls.ListView)(target);
+ }
+ break;
+ case 13: // View\SurgeriesPage.xaml line 85
+ {
+ this.sortComboBox = (global::Windows.UI.Xaml.Controls.ComboBox)(target);
+ ((global::Windows.UI.Xaml.Controls.ComboBox)this.sortComboBox).SelectionChanged += this.SortComboBox_SelectionChanged;
+ }
+ break;
+ case 14: // View\SurgeriesPage.xaml line 88
+ {
+ this.radioBtn1 = (global::Windows.UI.Xaml.Controls.RadioButton)(target);
+ ((global::Windows.UI.Xaml.Controls.RadioButton)this.radioBtn1).Click += this.RadionBtn_Click;
+ }
+ break;
+ case 15: // View\SurgeriesPage.xaml line 89
+ {
+ this.radionBtn2 = (global::Windows.UI.Xaml.Controls.RadioButton)(target);
+ ((global::Windows.UI.Xaml.Controls.RadioButton)this.radionBtn2).Click += this.RadionBtn_Click;
+ }
+ break;
+ case 16: // View\SurgeriesPage.xaml line 58
+ {
+ this.searchBox = (global::Windows.UI.Xaml.Controls.TextBox)(target);
+ }
+ break;
+ case 17: // View\SurgeriesPage.xaml line 60
+ {
+ this.lookInComboBox = (global::Windows.UI.Xaml.Controls.ComboBox)(target);
+ }
+ break;
+ case 18: // View\SurgeriesPage.xaml line 63
+ {
+ global::Windows.UI.Xaml.Controls.Button element18 = (global::Windows.UI.Xaml.Controls.Button)(target);
+ ((global::Windows.UI.Xaml.Controls.Button)element18).Click += this.SearchButton_Click;
+ }
+ break;
+ case 19: // View\SurgeriesPage.xaml line 64
+ {
+ global::Windows.UI.Xaml.Controls.Button element19 = (global::Windows.UI.Xaml.Controls.Button)(target);
+ ((global::Windows.UI.Xaml.Controls.Button)element19).Click += this.ResetButton_Click;
+ }
+ break;
+ case 20: // View\SurgeriesPage.xaml line 34
+ {
+ global::Windows.UI.Xaml.Controls.Button element20 = (global::Windows.UI.Xaml.Controls.Button)(target);
+ ((global::Windows.UI.Xaml.Controls.Button)element20).Click += this.NewRecordButton_Click;
+ }
+ break;
+ case 21: // View\SurgeriesPage.xaml line 35
+ {
+ global::Windows.UI.Xaml.Controls.Button element21 = (global::Windows.UI.Xaml.Controls.Button)(target);
+ ((global::Windows.UI.Xaml.Controls.Button)element21).Click += this.DeleteButton_Click;
+ }
+ break;
+ case 22: // View\SurgeriesPage.xaml line 36
+ {
+ global::Windows.UI.Xaml.Controls.Button element22 = (global::Windows.UI.Xaml.Controls.Button)(target);
+ ((global::Windows.UI.Xaml.Controls.Button)element22).Click += this.EditButton_Click;
+ }
+ break;
+ default:
+ break;
+ }
this._contentLoaded = true;
}
@@ -260,15 +344,15 @@ namespace HospitalServerManager.View.UserControls
global::Windows.UI.Xaml.Markup.IComponentConnector returnValue = null;
switch(connectionId)
{
- case 2: // View\UserControls\ColumnListView.xaml line 35
+ case 5: // View\SurgeriesPage.xaml line 137
{
- global::Windows.UI.Xaml.Controls.Grid element2 = (global::Windows.UI.Xaml.Controls.Grid)target;
- ColumnListView_obj2_Bindings bindings = new ColumnListView_obj2_Bindings();
+ global::Windows.UI.Xaml.Controls.Grid element5 = (global::Windows.UI.Xaml.Controls.Grid)target;
+ SurgeriesPage_obj5_Bindings bindings = new SurgeriesPage_obj5_Bindings();
returnValue = bindings;
- bindings.SetDataRoot(element2.DataContext);
- element2.DataContextChanged += bindings.DataContextChangedHandler;
- global::Windows.UI.Xaml.DataTemplate.SetExtensionInstance(element2, bindings);
- global::Windows.UI.Xaml.Markup.XamlBindingHelper.SetDataTemplateComponent(element2, bindings);
+ bindings.SetDataRoot(element5.DataContext);
+ element5.DataContextChanged += bindings.DataContextChangedHandler;
+ global::Windows.UI.Xaml.DataTemplate.SetExtensionInstance(element5, bindings);
+ global::Windows.UI.Xaml.Markup.XamlBindingHelper.SetDataTemplateComponent(element5, bindings);
}
break;
}
diff --git a/obj/x86/Debug/View/SurgeriesPage.g.i.cs b/obj/x86/Debug/View/SurgeriesPage.g.i.cs
new file mode 100644
index 0000000..c59e413
--- /dev/null
+++ b/obj/x86/Debug/View/SurgeriesPage.g.i.cs
@@ -0,0 +1,67 @@
+#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\SurgeriesPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "B8D5630C92B67284A402D7B2E3A5A82C"
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace HospitalServerManager.View
+{
+ partial class SurgeriesPage : global::Windows.UI.Xaml.Controls.Page
+ {
+
+
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::HospitalServerManager.ViewModel.RosterViewModel RosterViewModel;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.TextBlock pageTitle;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.ListView databaseView;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.ComboBox sortComboBox;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.RadioButton radioBtn1;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.RadioButton radionBtn2;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.TextBox searchBox;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private global::Windows.UI.Xaml.Controls.ComboBox lookInComboBox;
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ private bool _contentLoaded;
+
+ ///
+ /// InitializeComponent()
+ ///
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public void InitializeComponent()
+ {
+ if (_contentLoaded)
+ return;
+
+ _contentLoaded = true;
+
+ global::System.Uri resourceLocator = new global::System.Uri("ms-appx:///View/SurgeriesPage.xaml");
+ global::Windows.UI.Xaml.Application.LoadComponent(this, resourceLocator, global::Windows.UI.Xaml.Controls.Primitives.ComponentResourceLocation.Application);
+ }
+
+ partial void UnloadObject(global::Windows.UI.Xaml.DependencyObject unloadableObject);
+
+ private interface ISurgeriesPage_Bindings
+ {
+ void Initialize();
+ void Update();
+ void StopTracking();
+ void DisconnectUnloadedObject(int connectionId);
+ }
+#pragma warning disable 0169 // Proactively suppress unused field warning in case Bindings is not used.
+ private ISurgeriesPage_Bindings Bindings;
+#pragma warning restore 0169
+ }
+}
+
+
diff --git a/obj/x86/Debug/View/SurgeriesPage.xaml b/obj/x86/Debug/View/SurgeriesPage.xaml
new file mode 100644
index 0000000..fcca53e
--- /dev/null
+++ b/obj/x86/Debug/View/SurgeriesPage.xaml
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/obj/x86/Debug/View/SurgeriesPage.xbf b/obj/x86/Debug/View/SurgeriesPage.xbf
new file mode 100644
index 0000000..fa566a7
Binary files /dev/null and b/obj/x86/Debug/View/SurgeriesPage.xbf differ
diff --git a/obj/x86/Debug/View/UserControls/ColumnListView.g.i.cs b/obj/x86/Debug/View/UserControls/ColumnListView.g.i.cs
deleted file mode 100644
index 1cebfa9..0000000
--- a/obj/x86/Debug/View/UserControls/ColumnListView.g.i.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma checksum "C:\Users\Marcel\Documents\GitHub\HospitalServerManagerApp\HospitalServerManager\View\UserControls\ColumnListView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E8816074F83E5912D57314984E95026D"
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace HospitalServerManager.View.UserControls
-{
- partial class ColumnListView : global::Windows.UI.Xaml.Controls.UserControl
- {
-
-
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
- private bool _contentLoaded;
-
- ///
- /// InitializeComponent()
- ///
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Windows.UI.Xaml.Build.Tasks"," 10.0.17.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- public void InitializeComponent()
- {
- if (_contentLoaded)
- return;
-
- _contentLoaded = true;
-
- global::System.Uri resourceLocator = new global::System.Uri("ms-appx:///View/UserControls/ColumnListView.xaml");
- global::Windows.UI.Xaml.Application.LoadComponent(this, resourceLocator, global::Windows.UI.Xaml.Controls.Primitives.ComponentResourceLocation.Application);
- }
-
- partial void UnloadObject(global::Windows.UI.Xaml.DependencyObject unloadableObject);
-
- private interface IColumnListView_Bindings
- {
- void Initialize();
- void Update();
- void StopTracking();
- void DisconnectUnloadedObject(int connectionId);
- }
-#pragma warning disable 0169 // Proactively suppress unused field warning in case Bindings is not used.
- private IColumnListView_Bindings Bindings;
-#pragma warning restore 0169
- }
-}
-
-
diff --git a/obj/x86/Debug/View/UserControls/ColumnListView.xaml b/obj/x86/Debug/View/UserControls/ColumnListView.xaml
deleted file mode 100644
index 953a95d..0000000
--- a/obj/x86/Debug/View/UserControls/ColumnListView.xaml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/obj/x86/Debug/View/UserControls/ColumnListView.xbf b/obj/x86/Debug/View/UserControls/ColumnListView.xbf
deleted file mode 100644
index 0a3df4f..0000000
Binary files a/obj/x86/Debug/View/UserControls/ColumnListView.xbf and /dev/null differ
diff --git a/obj/x86/Debug/XamlSaveStateFile.xml b/obj/x86/Debug/XamlSaveStateFile.xml
index ac8940f..e6eaf2f 100644
--- a/obj/x86/Debug/XamlSaveStateFile.xml
+++ b/obj/x86/Debug/XamlSaveStateFile.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/obj/x86/Debug/XamlTypeInfo.g.cs b/obj/x86/Debug/XamlTypeInfo.g.cs
index 607516e..6f35d24 100644
--- a/obj/x86/Debug/XamlTypeInfo.g.cs
+++ b/obj/x86/Debug/XamlTypeInfo.g.cs
@@ -189,7 +189,7 @@ namespace HospitalServerManager.HospitalServerManager_XamlTypeInfo
private void InitTypeTables()
{
- _typeNameTable = new string[40];
+ _typeNameTable = new string[41];
_typeNameTable[0] = "HospitalServerManager.ViewModel.RosterViewModel";
_typeNameTable[1] = "Object";
_typeNameTable[2] = "System.Collections.Generic.IEnumerable`1";
@@ -225,13 +225,14 @@ namespace HospitalServerManager.HospitalServerManager_XamlTypeInfo
_typeNameTable[32] = "Windows.UI.Xaml.Controls.ContentDialog";
_typeNameTable[33] = "Windows.UI.Xaml.Controls.ContentControl";
_typeNameTable[34] = "HospitalServerManager.View.MainFrameView";
- _typeNameTable[35] = "HospitalServerManager.View.NewRecordDialog";
- _typeNameTable[36] = "System.Collections.Generic.List`1";
- _typeNameTable[37] = "HospitalServerManager.View.PatientsPage";
- _typeNameTable[38] = "HospitalServerManager.View.RoomsPage";
- _typeNameTable[39] = "HospitalServerManager.View.UserControls.ColumnListView";
+ _typeNameTable[35] = "HospitalServerManager.View.NewAdmissionPage";
+ _typeNameTable[36] = "HospitalServerManager.View.NewRecordDialog";
+ _typeNameTable[37] = "System.Collections.Generic.List`1";
+ _typeNameTable[38] = "HospitalServerManager.View.PatientsPage";
+ _typeNameTable[39] = "HospitalServerManager.View.RoomsPage";
+ _typeNameTable[40] = "HospitalServerManager.View.SurgeriesPage";
- _typeTable = new global::System.Type[40];
+ _typeTable = new global::System.Type[41];
_typeTable[0] = typeof(global::HospitalServerManager.ViewModel.RosterViewModel);
_typeTable[1] = typeof(global::System.Object);
_typeTable[2] = typeof(global::System.Collections.Generic.IEnumerable);
@@ -267,11 +268,12 @@ namespace HospitalServerManager.HospitalServerManager_XamlTypeInfo
_typeTable[32] = typeof(global::Windows.UI.Xaml.Controls.ContentDialog);
_typeTable[33] = typeof(global::Windows.UI.Xaml.Controls.ContentControl);
_typeTable[34] = typeof(global::HospitalServerManager.View.MainFrameView);
- _typeTable[35] = typeof(global::HospitalServerManager.View.NewRecordDialog);
- _typeTable[36] = typeof(global::System.Collections.Generic.List);
- _typeTable[37] = typeof(global::HospitalServerManager.View.PatientsPage);
- _typeTable[38] = typeof(global::HospitalServerManager.View.RoomsPage);
- _typeTable[39] = typeof(global::HospitalServerManager.View.UserControls.ColumnListView);
+ _typeTable[35] = typeof(global::HospitalServerManager.View.NewAdmissionPage);
+ _typeTable[36] = typeof(global::HospitalServerManager.View.NewRecordDialog);
+ _typeTable[37] = typeof(global::System.Collections.Generic.List);
+ _typeTable[38] = typeof(global::HospitalServerManager.View.PatientsPage);
+ _typeTable[39] = typeof(global::HospitalServerManager.View.RoomsPage);
+ _typeTable[40] = typeof(global::HospitalServerManager.View.SurgeriesPage);
}
private int LookupTypeIndexByName(string typeName)
@@ -312,10 +314,11 @@ namespace HospitalServerManager.HospitalServerManager_XamlTypeInfo
private object Activate_29_DiagnosesPage() { return new global::HospitalServerManager.View.DiagnosesPage(); }
private object Activate_30_DoctorsPage() { return new global::HospitalServerManager.View.DoctorsPage(); }
private object Activate_34_MainFrameView() { return new global::HospitalServerManager.View.MainFrameView(); }
- private object Activate_36_List() { return new global::System.Collections.Generic.List(); }
- private object Activate_37_PatientsPage() { return new global::HospitalServerManager.View.PatientsPage(); }
- private object Activate_38_RoomsPage() { return new global::HospitalServerManager.View.RoomsPage(); }
- private object Activate_39_ColumnListView() { return new global::HospitalServerManager.View.UserControls.ColumnListView(); }
+ private object Activate_35_NewAdmissionPage() { return new global::HospitalServerManager.View.NewAdmissionPage(); }
+ private object Activate_37_List() { return new global::System.Collections.Generic.List(); }
+ private object Activate_38_PatientsPage() { return new global::HospitalServerManager.View.PatientsPage(); }
+ private object Activate_39_RoomsPage() { return new global::HospitalServerManager.View.RoomsPage(); }
+ private object Activate_40_SurgeriesPage() { return new global::HospitalServerManager.View.SurgeriesPage(); }
private void MapAdd_3_IDictionary(object instance, object key, object item)
{
var collection = (global::System.Collections.Generic.IDictionary)instance;
@@ -330,7 +333,7 @@ namespace HospitalServerManager.HospitalServerManager_XamlTypeInfo
var newItem = (global::System.Type)item;
collection.Add(newKey, newItem);
}
- private void VectorAdd_36_List(object instance, object item)
+ private void VectorAdd_37_List(object instance, object item)
{
var collection = (global::System.Collections.Generic.ICollection)instance;
var newItem = (global::System.String)item;
@@ -658,37 +661,44 @@ namespace HospitalServerManager.HospitalServerManager_XamlTypeInfo
xamlType = userType;
break;
- case 35: // HospitalServerManager.View.NewRecordDialog
+ case 35: // HospitalServerManager.View.NewAdmissionPage
+ userType = new global::HospitalServerManager.HospitalServerManager_XamlTypeInfo.XamlUserType(this, typeName, type, GetXamlTypeByName("Windows.UI.Xaml.Controls.Page"));
+ userType.Activator = Activate_35_NewAdmissionPage;
+ userType.SetIsLocalType();
+ xamlType = userType;
+ break;
+
+ case 36: // HospitalServerManager.View.NewRecordDialog
userType = new global::HospitalServerManager.HospitalServerManager_XamlTypeInfo.XamlUserType(this, typeName, type, GetXamlTypeByName("Windows.UI.Xaml.Controls.ContentDialog"));
userType.AddMemberName("ValuesOfNewObject");
userType.SetIsLocalType();
xamlType = userType;
break;
- case 36: // System.Collections.Generic.List`1
+ case 37: // System.Collections.Generic.List`1
userType = new global::HospitalServerManager.HospitalServerManager_XamlTypeInfo.XamlUserType(this, typeName, type, GetXamlTypeByName("Object"));
- userType.CollectionAdd = VectorAdd_36_List;
+ userType.CollectionAdd = VectorAdd_37_List;
userType.SetIsReturnTypeStub();
xamlType = userType;
break;
- case 37: // HospitalServerManager.View.PatientsPage
+ case 38: // HospitalServerManager.View.PatientsPage
userType = new global::HospitalServerManager.HospitalServerManager_XamlTypeInfo.XamlUserType(this, typeName, type, GetXamlTypeByName("Windows.UI.Xaml.Controls.Page"));
- userType.Activator = Activate_37_PatientsPage;
+ userType.Activator = Activate_38_PatientsPage;
userType.SetIsLocalType();
xamlType = userType;
break;
- case 38: // HospitalServerManager.View.RoomsPage
+ case 39: // HospitalServerManager.View.RoomsPage
userType = new global::HospitalServerManager.HospitalServerManager_XamlTypeInfo.XamlUserType(this, typeName, type, GetXamlTypeByName("Windows.UI.Xaml.Controls.Page"));
- userType.Activator = Activate_38_RoomsPage;
+ userType.Activator = Activate_39_RoomsPage;
userType.SetIsLocalType();
xamlType = userType;
break;
- case 39: // HospitalServerManager.View.UserControls.ColumnListView
- userType = new global::HospitalServerManager.HospitalServerManager_XamlTypeInfo.XamlUserType(this, typeName, type, GetXamlTypeByName("Windows.UI.Xaml.Controls.UserControl"));
- userType.Activator = Activate_39_ColumnListView;
+ case 40: // HospitalServerManager.View.SurgeriesPage
+ userType = new global::HospitalServerManager.HospitalServerManager_XamlTypeInfo.XamlUserType(this, typeName, type, GetXamlTypeByName("Windows.UI.Xaml.Controls.Page"));
+ userType.Activator = Activate_40_SurgeriesPage;
userType.SetIsLocalType();
xamlType = userType;
break;
diff --git a/obj/x86/Debug/filtered.layout.resfiles b/obj/x86/Debug/filtered.layout.resfiles
index 84fdf06..1d8f469 100644
--- a/obj/x86/Debug/filtered.layout.resfiles
+++ b/obj/x86/Debug/filtered.layout.resfiles
@@ -13,8 +13,9 @@ View\DiagnosesPage.xbf
View\DoctorsPage.xbf
View\EditRecordDialog.xbf
View\MainFrameView.xbf
+View\NewAdmissionPage.xbf
View\NewRecordDialog.xbf
View\PatientsPage.xbf
View\RoomsPage.xbf
-View\UserControls\ColumnListView.xbf
+View\SurgeriesPage.xbf
Properties\Default.rd.xml
diff --git a/obj/x86/Debug/filtered.layout.resfiles.intermediate b/obj/x86/Debug/filtered.layout.resfiles.intermediate
index 84fdf06..1d8f469 100644
--- a/obj/x86/Debug/filtered.layout.resfiles.intermediate
+++ b/obj/x86/Debug/filtered.layout.resfiles.intermediate
@@ -13,8 +13,9 @@ View\DiagnosesPage.xbf
View\DoctorsPage.xbf
View\EditRecordDialog.xbf
View\MainFrameView.xbf
+View\NewAdmissionPage.xbf
View\NewRecordDialog.xbf
View\PatientsPage.xbf
View\RoomsPage.xbf
-View\UserControls\ColumnListView.xbf
+View\SurgeriesPage.xbf
Properties\Default.rd.xml
diff --git a/obj/x86/Debug/intermediatexaml/HospitalServerManager.exe b/obj/x86/Debug/intermediatexaml/HospitalServerManager.exe
index a0b938f..d1ec13c 100644
Binary files a/obj/x86/Debug/intermediatexaml/HospitalServerManager.exe and b/obj/x86/Debug/intermediatexaml/HospitalServerManager.exe differ
diff --git a/obj/x86/Debug/intermediatexaml/HospitalServerManager.pdb b/obj/x86/Debug/intermediatexaml/HospitalServerManager.pdb
index 4cc86e2..d87f4eb 100644
Binary files a/obj/x86/Debug/intermediatexaml/HospitalServerManager.pdb and b/obj/x86/Debug/intermediatexaml/HospitalServerManager.pdb differ
diff --git a/obj/x86/Debug/unfiltered.layout.resfiles b/obj/x86/Debug/unfiltered.layout.resfiles
index 84fdf06..1d8f469 100644
--- a/obj/x86/Debug/unfiltered.layout.resfiles
+++ b/obj/x86/Debug/unfiltered.layout.resfiles
@@ -13,8 +13,9 @@ View\DiagnosesPage.xbf
View\DoctorsPage.xbf
View\EditRecordDialog.xbf
View\MainFrameView.xbf
+View\NewAdmissionPage.xbf
View\NewRecordDialog.xbf
View\PatientsPage.xbf
View\RoomsPage.xbf
-View\UserControls\ColumnListView.xbf
+View\SurgeriesPage.xbf
Properties\Default.rd.xml
diff --git a/obj/x86/Debug/unfiltered.layout.resfiles.intermediate b/obj/x86/Debug/unfiltered.layout.resfiles.intermediate
index 84fdf06..1d8f469 100644
--- a/obj/x86/Debug/unfiltered.layout.resfiles.intermediate
+++ b/obj/x86/Debug/unfiltered.layout.resfiles.intermediate
@@ -13,8 +13,9 @@ View\DiagnosesPage.xbf
View\DoctorsPage.xbf
View\EditRecordDialog.xbf
View\MainFrameView.xbf
+View\NewAdmissionPage.xbf
View\NewRecordDialog.xbf
View\PatientsPage.xbf
View\RoomsPage.xbf
-View\UserControls\ColumnListView.xbf
+View\SurgeriesPage.xbf
Properties\Default.rd.xml