MattBurke/PWAPP
2
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases 4 Wiki Activity

Cleaned references and imports

Browse Source
This commit is contained in:
Matthew Burke 2023-07-27 19:15:49 -04:00
parent 09d86b86c2
commit 19153c9d02
23 changed files with 48 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PWAPPv2/App.xaml.cs
View File

@ -1,10 +1,4 @@
using System; using System.Windows;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace PWAPPv2 namespace PWAPPv2
{ {
@ -16,7 +10,7 @@ namespace PWAPPv2
public static string[] Args; public static string[] Args;
void app_Startup(object sender, StartupEventArgs e) void app_Startup(object sender, StartupEventArgs e)
{ {
if(e.Args.Length > 0) if (e.Args.Length > 0)
{ {
Args = e.Args; Args = e.Args;
} }

38
PWAPPv2/MainWindow.xaml.cs
View File

@ -1,19 +1,9 @@
using System; using Microsoft.Win32;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.IO;
using Microsoft.Win32;
/** /**
* TODO: * TODO:
@ -49,7 +39,7 @@ namespace PWAPPv2
{ {
args = App.Args; args = App.Args;
} }
catch(Exception) catch (Exception)
{ } { }
images = new List<Source.DataObjects.PWImage>(); images = new List<Source.DataObjects.PWImage>();
@ -122,15 +112,15 @@ namespace PWAPPv2
{ {
TypeBox.GetSelectedID(); TypeBox.GetSelectedID();
} }
catch(Source.DataObjects.ReferralTypeDefaultException) catch (Source.DataObjects.ReferralTypeDefaultException)
{ {
} }
catch(Source.DataObjects.InvalidReferralTypeException) catch (Source.DataObjects.InvalidReferralTypeException)
{ {
} }
catch(NullReferenceException) catch (NullReferenceException)
{ {
} }
@ -146,7 +136,7 @@ namespace PWAPPv2
private void Button_Click_1(object sender, RoutedEventArgs e) private void Button_Click_1(object sender, RoutedEventArgs e)
{ {
Source.DataObjects.Referral referral; Source.DataObjects.Referral referral;
if(images.Count == 0) if (images.Count == 0)
{ {
referral = new Source.DataObjects.Referral(apiCreds, patient, referral = new Source.DataObjects.Referral(apiCreds, patient,
(Source.DataObjects.ReferralTypeBox)TypeBox, (Source.DataObjects.ReferralTypeBox)TypeBox,
@ -167,9 +157,9 @@ namespace PWAPPv2
{ {
string referralString = referral.ToJsonString(); string referralString = referral.ToJsonString();
string result = apiConnection.SendPostRequestAsync("api/PWMakeReferral", referralString); string result = apiConnection.SendPostRequestAsync("api/PWMakeReferral", referralString);
if(images.Count > 0) if (images.Count > 0)
{ {
foreach(Source.DataObjects.PWImage im in images) foreach (Source.DataObjects.PWImage im in images)
{ {
Source.DataObjects.Attachment att = new Source.DataObjects.Attachment(apiCreds, im, result); Source.DataObjects.Attachment att = new Source.DataObjects.Attachment(apiCreds, im, result);
string json = att.ToJsonString(); string json = att.ToJsonString();
@ -183,7 +173,7 @@ namespace PWAPPv2
} }
this.Close(); this.Close();
} }
catch(Source.DataObjects.Referral.InvalidReferalDataException) catch (Source.DataObjects.Referral.InvalidReferalDataException)
{ {
} }
@ -197,7 +187,7 @@ namespace PWAPPv2
openFileDialog.Filter = "Image files (*.jpg,*.jpeg)|*.jpg;*.jpeg"; openFileDialog.Filter = "Image files (*.jpg,*.jpeg)|*.jpg;*.jpeg";
openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyPictures); openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyPictures);
if(openFileDialog.ShowDialog() == true) if (openFileDialog.ShowDialog() == true)
{ {
foreach (string filename in openFileDialog.FileNames) foreach (string filename in openFileDialog.FileNames)
{ {
@ -205,7 +195,7 @@ namespace PWAPPv2
{ {
images.Add(new Source.DataObjects.PWImage(filename)); images.Add(new Source.DataObjects.PWImage(filename));
} }
catch(NullReferenceException) catch (NullReferenceException)
{ {
images = new List<Source.DataObjects.PWImage>(); images = new List<Source.DataObjects.PWImage>();
images.Add(new Source.DataObjects.PWImage(filename)); images.Add(new Source.DataObjects.PWImage(filename));
@ -222,7 +212,7 @@ namespace PWAPPv2
ImageList.Items.Add(CreateImageGridItem(image)); ImageList.Items.Add(CreateImageGridItem(image));
} }
} }
catch(NullReferenceException) catch (NullReferenceException)
{ } { }
} }
@ -230,7 +220,7 @@ namespace PWAPPv2
private void Button_Click_3(object sender, RoutedEventArgs e) private void Button_Click_3(object sender, RoutedEventArgs e)
{ {
int index = ImageList.SelectedIndex; int index = ImageList.SelectedIndex;
if(index == -1) if (index == -1)
{ {
return; return;
} }

1
PWAPPv2/PWAPPv2.csproj
View File

@ -210,7 +210,6 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</ApplicationDefinition> </ApplicationDefinition>
<Compile Include="PwImage.cs" />
<Compile Include="Source\API\APIConfig.cs" /> <Compile Include="Source\API\APIConfig.cs" />
<Compile Include="Source\API\APIConnection.cs" /> <Compile Include="Source\API\APIConnection.cs" />
<Compile Include="Source\API\APIRequestBuilder.cs" /> <Compile Include="Source\API\APIRequestBuilder.cs" />

2
PWAPPv2/Properties/AssemblyInfo.cs
View File

@ -1,6 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows; using System.Windows;

6
PWAPPv2/PwImage.cs
View File

@ -1,6 +0,0 @@
namespace PWAPPv2
{
internal class PwImage
{
}
}

8
PWAPPv2/Source/API/APIConfig.cs
View File

@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml; using System.Xml;
namespace PWAPPv2.Source namespace PWAPPv2.Source
@ -21,12 +17,12 @@ namespace PWAPPv2.Source
{ {
cfgDoc.Load(path); cfgDoc.Load(path);
} }
catch(XmlException) catch (XmlException)
{ {
Console.WriteLine("An error has occured parsing the config file."); Console.WriteLine("An error has occured parsing the config file.");
return; return;
} }
catch(System.IO.FileNotFoundException) catch (System.IO.FileNotFoundException)
{ {
Console.WriteLine("Config file could not be found!"); Console.WriteLine("Config file could not be found!");
return; return;

12
PWAPPv2/Source/API/APIConnection.cs
View File

@ -1,13 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.IO; using System.Text;
using Newtonsoft.Json;
namespace PWAPPv2.Source.API namespace PWAPPv2.Source.API
{ {
@ -82,7 +78,7 @@ namespace PWAPPv2.Source.API
text = sr.ReadToEnd(); text = sr.ReadToEnd();
} }
} }
catch(WebException wex) catch (WebException wex)
{ {
text = new StreamReader(wex.Response.GetResponseStream()).ReadToEnd(); text = new StreamReader(wex.Response.GetResponseStream()).ReadToEnd();
} }
@ -100,7 +96,7 @@ namespace PWAPPv2.Source.API
var response = client.PostAsync(apiUri, contetnt).Result; var response = client.PostAsync(apiUri, contetnt).Result;
if(response.IsSuccessStatusCode) if (response.IsSuccessStatusCode)
{ {
return response.Content.ReadAsStringAsync().Result; return response.Content.ReadAsStringAsync().Result;
} }

10
PWAPPv2/Source/API/APIRequestBuilder.cs
View File

@ -1,11 +1,5 @@
using System; using Newtonsoft.Json;
using System.Collections.Generic; using System;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml;
using System.Xml.Serialization;
using Newtonsoft.Json;
namespace PWAPPv2.Source.API namespace PWAPPv2.Source.API
{ {

8
PWAPPv2/Source/DataObjects/APICredentials.cs
View File

@ -1,10 +1,4 @@
using System; namespace PWAPPv2.Source.DataObjects
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PWAPPv2.Source.DataObjects
{ {
class APICredentials class APICredentials
{ {

8
PWAPPv2/Source/DataObjects/Attachment.cs
View File

@ -1,10 +1,4 @@
using System; namespace PWAPPv2.Source.DataObjects
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PWAPPv2.Source.DataObjects
{ {
class Attachment class Attachment
{ {

8
PWAPPv2/Source/DataObjects/ComboBoxData.cs
View File

@ -1,10 +1,4 @@
using System; using System.Windows.Controls;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
namespace PWAPPv2.Source.DataObjects namespace PWAPPv2.Source.DataObjects
{ {

4
PWAPPv2/Source/DataObjects/Exceptions.cs
View File

@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PWAPPv2.Source.DataObjects namespace PWAPPv2.Source.DataObjects
{ {

7
PWAPPv2/Source/DataObjects/NumValList.cs
View File

@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PWAPPv2.Source.DataObjects namespace PWAPPv2.Source.DataObjects
{ {
@ -18,11 +15,11 @@ namespace PWAPPv2.Source.DataObjects
public NumValList(string Content, char Delim) public NumValList(string Content, char Delim)
{ {
string[] split = Content.Split(Delim); string[] split = Content.Split(Delim);
if((split.Length % 2) != 0) if ((split.Length % 2) != 0)
{ {
throw new UnevenValuesException(); throw new UnevenValuesException();
} }
for(int i = 0; i < split.Length; i++) for (int i = 0; i < split.Length; i++)
{ {
this.Add(int.Parse(split[i]), split[i + 1]); this.Add(int.Parse(split[i]), split[i + 1]);
i++; i++;

8
PWAPPv2/Source/DataObjects/NumValPair.cs
View File

@ -1,10 +1,4 @@
using System; namespace PWAPPv2.Source.DataObjects
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PWAPPv2.Source.DataObjects
{ {
class NumValPair class NumValPair
{ {

7
PWAPPv2/Source/DataObjects/PWImage.cs
View File

@ -1,12 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Media.Imaging;
using System.Windows.Media;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Windows.Media.Imaging;
namespace PWAPPv2.Source.DataObjects namespace PWAPPv2.Source.DataObjects
{ {

4
PWAPPv2/Source/DataObjects/ReferFromBox.cs
View File

@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
namespace PWAPPv2.Source.DataObjects namespace PWAPPv2.Source.DataObjects

4
PWAPPv2/Source/DataObjects/ReferToBox.cs
View File

@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
namespace PWAPPv2.Source.DataObjects namespace PWAPPv2.Source.DataObjects

12
PWAPPv2/Source/DataObjects/Referral.cs
View File

@ -1,11 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Windows;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Documents; using System.Windows.Documents;
using System.Windows;
namespace PWAPPv2.Source.DataObjects namespace PWAPPv2.Source.DataObjects
{ {
@ -40,7 +36,7 @@ namespace PWAPPv2.Source.DataObjects
string RemarksText = new TextRange(RemarksBox.Document.ContentStart, RemarksBox.Document.ContentEnd).Text; string RemarksText = new TextRange(RemarksBox.Document.ContentStart, RemarksBox.Document.ContentEnd).Text;
int contact = 0; int contact = 0;
if(ContactBox.IsChecked == true) if (ContactBox.IsChecked == true)
{ {
contact = 1; contact = 1;
} }
@ -76,11 +72,11 @@ namespace PWAPPv2.Source.DataObjects
{ {
MessageBox.Show("Please select a referral type"); MessageBox.Show("Please select a referral type");
} }
catch(Source.DataObjects.ReferToDefaultException) catch (Source.DataObjects.ReferToDefaultException)
{ {
MessageBox.Show("Please select a refer to"); MessageBox.Show("Please select a refer to");
} }
catch(Source.DataObjects.ReferFromDefaultException) catch (Source.DataObjects.ReferFromDefaultException)
{ {
MessageBox.Show("Please select a refer from"); MessageBox.Show("Please select a refer from");
} }

12
PWAPPv2/Source/DataObjects/ReferralTypeBox.cs
View File

@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
namespace PWAPPv2.Source.DataObjects namespace PWAPPv2.Source.DataObjects
@ -28,7 +24,7 @@ namespace PWAPPv2.Source.DataObjects
TypeID.Add(id); TypeID.Add(id);
} }
catch(Exception) catch (Exception)
{ {
throw new DataInvalidException(); throw new DataInvalidException();
} }
@ -36,7 +32,7 @@ namespace PWAPPv2.Source.DataObjects
} }
foreach(string name in TypeName) foreach (string name in TypeName)
{ {
Add(name); Add(name);
} }
@ -52,9 +48,9 @@ namespace PWAPPv2.Source.DataObjects
{ {
throw new ReferralTypeDefaultException(); throw new ReferralTypeDefaultException();
} }
for(int i = 0; i < TypeName.Count; i++) for (int i = 0; i < TypeName.Count; i++)
{ {
if(TypeName[i] == Selected) if (TypeName[i] == Selected)
{ {
return TypeID[i]; return TypeID[i];
} }

8
PWAPPv2/Source/Database/DatabaseConfig.cs
View File

@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml; using System.Xml;
namespace PWAPPv2.Source.Database namespace PWAPPv2.Source.Database
@ -22,12 +18,12 @@ namespace PWAPPv2.Source.Database
{ {
cfg.Load(path); cfg.Load(path);
} }
catch(XmlException) catch (XmlException)
{ {
Console.WriteLine("An error has occured parsing the config file."); Console.WriteLine("An error has occured parsing the config file.");
return; return;
} }
catch(System.IO.FileNotFoundException) catch (System.IO.FileNotFoundException)
{ {
Console.WriteLine("Config file could not be found!"); Console.WriteLine("Config file could not be found!");
} }

10
PWAPPv2/Source/Database/DatabaseConnection.cs
View File

@ -1,10 +1,6 @@
using System; using MySqlConnector;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Data.SqlClient;
using MySqlConnector;
namespace PWAPPv2.Source.Database namespace PWAPPv2.Source.Database
{ {
@ -28,7 +24,7 @@ namespace PWAPPv2.Source.Database
{ {
Connection.Open(); Connection.Open();
} }
catch(Exception) catch (Exception)
{ {
throw new DatabaseConnectionException(); throw new DatabaseConnectionException();
} }

6
PWAPPv2/Source/Patient.cs
View File

@ -1,8 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PWAPPv2.Source namespace PWAPPv2.Source
{ {

8
PWAPPv2/Source/PatientGUIAdapter.cs
View File

@ -1,10 +1,4 @@
using System; namespace PWAPPv2.Source
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PWAPPv2.Source
{ {
class PatientGUIAdapter class PatientGUIAdapter
{ {