Modified how attachments are pushed to the API.

Added support for BMP and GIF image types.

PWAPPv2/MainWindow.xaml.cs

@@ -1,7 +1,11 @@
-using System;
+using PWAPPv2.Source;
+using PWAPPv2.Source.Attachments;
+using PWAPPv2.Source.Database;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Text.Json;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
@@ -40,27 +44,43 @@ namespace PWAPPv2
 
         List<Source.DataObjects.Attachment> attachments;
 
+        List<string> SupportedImageTypes = new List<string>();
+
 
         //string ConfigPath = "C:\\PWAPP\\Config\\Config.xml";
 
         string ConfigPath;
 
+        FileHandler fileHandler;
+
         public MainWindow()
         {
+            SupportedImageTypes.Clear();
+            SupportedImageTypes.Add(".jpeg");
+            SupportedImageTypes.Add(".jpg");
+            SupportedImageTypes.Add(".png");
+            SupportedImageTypes.Add(".gif");
+            SupportedImageTypes.Add(".bmp");
+
+
             try
             {
                 args = App.Args;
+                if(args.Length == 0)
+                {
+                    throw new NoArgumentsException();
+                }
+            }
+            catch (NoArgumentsException)
+            {
+                System.Windows.MessageBox.Show("No Patient ID was selected.\nPlease select a patient and retry the referral.");
+                return;
             }
             catch (Exception)
             { }
             ConfigPath = "C:\\PWAPP\\Config\\";
             try
             {
-                //ConfigPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
-                //ConfigPath = Path.Combine(ConfigPath, "PWAPP\\Config\\");
-
-
-
                 practiceConfig = new Source.Config.Configuration("C:\\PWAPP\\Config\\PracticeConfig.xml");
                 universalConfig = new Source.Config.Configuration("C:\\PWAPP\\App\\Config\\UniversalConfig.xml");
             }
@@ -74,7 +94,7 @@ namespace PWAPPv2
 
             try
             {
-                if (pwapiConnection.CheckForUpdate() == true)
+                /*if (pwapiConnection.CheckForUpdate() == true)
                 {
                     string message = "An update is available! Would you like to install it?";
                     string title = "Update available!";
@@ -101,7 +121,9 @@ namespace PWAPPv2
                         p.Start();
                         Environment.Exit(0);
                     }
-                }
+                }*/
+
+                pwapiConnection.Update(args);
             }
             catch (Exception)
             {
@@ -118,23 +140,33 @@ namespace PWAPPv2
                 apiCreds = new Source.DataObjects.APICredentials(apiconfig);
                 apiConnection = new Source.API.APIConnection(universalConfig.Get("PWBaseURI"), apiCreds);
 
+                fileHandler = new FileHandler(apiCreds);
+
                 InitializeComponent();
 
                 PopulateComboBoxes();
 
-                patient = new Source.Patient();
+                //patient = new Source.Patient();
 
-                patient.BuildFromDatabase(dbcon, args[0]);
+                //patient.BuildFromDatabase(dbcon, args[0]);
+
+                patient = Patient.GetPatient(dbcon, args[0]);
 
                 this.DataContext = new Source.PatientGUIAdapter(patient);
             }
             catch (NullReferenceException)
             {
 
+            }
+            catch (CouldNotOpenConnectionException)
+            {
+                System.Windows.MessageBox.Show("An problem occurred trying to connect to the OpenDental database.\nThe program will now exit.");
+                Environment.Exit(-1);
             }
             catch (Exception e)
             {
-                System.Windows.MessageBox.Show(e.Message);
+                System.Windows.MessageBox.Show("An unknow error has occurred.\n" + e.Message);
+                System.Environment.Exit(-1);
             }
         }
 
@@ -211,7 +243,7 @@ namespace PWAPPv2
         {
             Source.DataObjects.Referral referral;
 
-            if (attachments.Count == 0)
+            if (fileHandler.Attachments.Count == 0)
             {
                 referral = new Source.DataObjects.Referral(apiCreds, patient,
                     (Source.DataObjects.ReferralTypeBox)TypeBox,
@@ -234,16 +266,7 @@ namespace PWAPPv2
                 string referralString = referral.ToJsonString();
                 string result = pwapiConnection.SendReferral(referralString);
 
-
-                if (attachments.Count > 0)
-                {
-                    foreach (Source.DataObjects.Attachment attachment in attachments)
-                    {
-                        attachment.Token = result;
-                        string json = attachment.ToJsonString();
-                        apiConnection.SendPostWithCredsInHeader("api/PWAttachment", json);
-                    }
-                }
+                fileHandler.SendFilesAsAttachments(apiConnection, result);
 
                 System.Windows.MessageBox.Show("Referral added successfully!");
 
@@ -258,57 +281,60 @@ namespace PWAPPv2
         //AddImage Button
         private void Button_Click_2(object sender, RoutedEventArgs e)
         {
-            System.Windows.Forms.OpenFileDialog openFileDialog = new System.Windows.Forms.OpenFileDialog();
-            openFileDialog.Multiselect = true;
-            openFileDialog.Filter = "Attachment files (*.jpg,*.jpeg,*.pdf)|*.jpg;*.jpeg;*.pdf";
-            openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyPictures);
+            /*//System.Windows.Forms.OpenFileDialog openFileDialog = new System.Windows.Forms.OpenFileDialog();
+            //openFileDialog.Multiselect = true;
+            //openFileDialog.Filter = "Attachment files (*.jpg,*.jpeg,*.pdf,*.png)|*.jpg;*.jpeg;*.pdf;*.png;";
+            //openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyPictures);
 
-            if (openFileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-            {
-                foreach (string filename in openFileDialog.FileNames)
-                {
-                    if (Path.GetExtension(filename) == ".jpg" || Path.GetExtension(filename) == ".jpeg")
-                    {
-                        try
-                        {
-                            attachments.Add(new Source.DataObjects.Attachment(apiCreds, new Source.DataObjects.PWImage(filename)));
-                        }
-                        catch (NullReferenceException)
-                        {
+            //if (openFileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            //{
+            //    foreach (string filename in openFileDialog.FileNames)
+            //    {
+            //        //if (Path.GetExtension(filename) == ".jpg" || Path.GetExtension(filename) == ".jpeg")
+            //        if(SupportedImageTypes.Contains(Path.GetExtension(filename)))
+            //        {
+            //            try
+            //            {
+            //                attachments.Add(new Source.DataObjects.Attachment(apiCreds, new Source.DataObjects.PWImage(filename)));
+            //            }
+            //            catch (NullReferenceException)
+            //            {
 
-                            attachments = new List<Source.DataObjects.Attachment>
-                            {
-                                new Source.DataObjects.Attachment(apiCreds, new Source.DataObjects.PWImage(filename))
-                            };
-                        }
-                    }
-                    if (Path.GetExtension(filename) == ".pdf")
-                    {
-                        try
-                        {
-                            attachments.Add(new Source.DataObjects.Attachment(apiCreds, new Source.DataObjects.PWPdf(filename)));
-                        }
-                        catch (NullReferenceException)
-                        {
-                            attachments = new List<Source.DataObjects.Attachment>()
-                            {
-                                new Source.DataObjects.Attachment(apiCreds, new Source.DataObjects.PWPdf(filename))
-                            };
-                        }
-                    }
-                }
+            //                attachments = new List<Source.DataObjects.Attachment>
+            //                {
+            //                    new Source.DataObjects.Attachment(apiCreds, new Source.DataObjects.PWImage(filename))
+            //                };
+            //            }
+            //        }
+            //        if (Path.GetExtension(filename) == ".pdf")
+            //        {
+            //            try
+            //            {
+            //                attachments.Add(new Source.DataObjects.Attachment(apiCreds, new Source.DataObjects.PWPdf(filename)));
+            //            }
+            //            catch (NullReferenceException)
+            //            {
+            //                attachments = new List<Source.DataObjects.Attachment>()
+            //                {
+            //                    new Source.DataObjects.Attachment(apiCreds, new Source.DataObjects.PWPdf(filename))
+            //                };
+            //            }
+            //        }
+            //    }
 
-            }
+            //}*/
+
+            fileHandler.AddFile();
 
             try
             {
                 ImageList.Items.Clear();
 
-                foreach (var attachment in attachments)
+                foreach (var attachment in fileHandler.Attachments)
                 {
-                    if (attachment.image == null)
+                    if (attachment.pdf != null)
                     {
-                        ImageList.Items.Add(CreateImageGridItem(new Source.DataObjects.PWImage("C:\\PWAPP\\App\\App\\pdf.jpg")));
+                        ImageList.Items.Add(CreateImageGridItem(new Source.DataObjects.PWImage("C:\\PWAPP\\App\\App\\pdf.jpg"), attachment.pdf.path));
                     }
                     else
                     {
@@ -334,11 +360,11 @@ namespace PWAPPv2
             {
                 ImageList.Items.Clear();
 
-                foreach (var attachment in attachments)
+                foreach (var attachment in fileHandler.Attachments)
                 {
-                    if (attachment.image == null)
+                    if (attachment.pdf != null)
                     {
-                        ImageList.Items.Add(CreateImageGridItem(new Source.DataObjects.PWImage("C:\\PWAPP\\App\\App\\pdf.jpg")));
+                        ImageList.Items.Add(CreateImageGridItem(new Source.DataObjects.PWImage("C:\\PWAPP\\App\\App\\pdf.jpg"), attachment.pdf.path));
                     }
                     else
                     {
@@ -382,5 +408,43 @@ namespace PWAPPv2
             return imageGrid;
 
         }
+
+        public Grid CreateImageGridItem(Source.DataObjects.PWImage image, string path)
+        {
+            Grid imageGrid = new Grid();
+            imageGrid.Width = 477;
+            imageGrid.HorizontalAlignment = System.Windows.HorizontalAlignment.Left;
+            imageGrid.VerticalAlignment = VerticalAlignment.Top;
+            imageGrid.ShowGridLines = true;
+
+            ColumnDefinition imageColumn = new ColumnDefinition();
+            imageColumn.Width = new GridLength(50);
+            ColumnDefinition textColumn = new ColumnDefinition();
+            textColumn.Width = new GridLength(427);
+
+            imageGrid.ColumnDefinitions.Add(imageColumn);
+            imageGrid.ColumnDefinitions.Add(textColumn);
+
+            Image addedImage = new Image();
+            addedImage.Source = image.GetBitmapImage();
+
+            TextBlock text = new TextBlock();
+            text.Text = path;
+            text.FontSize = 12;
+
+
+            Grid.SetColumn(addedImage, 0);
+            Grid.SetColumn(text, 1);
+
+            imageGrid.Children.Add(addedImage);
+            imageGrid.Children.Add(text);
+            return imageGrid;
+
+        }
+    }
+
+    public class NoArgumentsException : Exception
+    {
+
     }
 }

PWAPPv2/PWAPPv2.csproj

@@ -227,6 +227,11 @@
     <Compile Include="Source\API\APIConnection.cs" />
     <Compile Include="Source\API\APIRequestBuilder.cs" />
     <Compile Include="Source\API\PWApiConnection.cs" />
+    <Compile Include="Source\Attachments\AttachmentFactory.cs" />
+    <Compile Include="Source\Attachments\FileHandler.cs" />
+    <Compile Include="Source\Attachments\PWAttachment.cs" />
+    <Compile Include="Source\Attachments\PWBaseAttachment.cs" />
+    <Compile Include="Source\Attachments\PWFileUpload.cs" />
     <Compile Include="Source\Config\Configuration.cs" />
     <Compile Include="Source\Database\DatabaseConfig.cs" />
     <Compile Include="Source\Database\DatabaseConnection.cs" />
@@ -234,6 +239,7 @@
     <Compile Include="Source\DataObjects\Attachment.cs" />
     <Compile Include="Source\DataObjects\ComboBoxData.cs" />
     <Compile Include="Source\DataObjects\Exceptions.cs" />
+    <Compile Include="Source\DataObjects\PWFile.cs" />
     <Compile Include="Source\DataObjects\PWImage.cs" />
     <Compile Include="Source\DataObjects\NumValList.cs" />
     <Compile Include="Source\DataObjects\NumValPair.cs" />
@@ -242,8 +248,8 @@
     <Compile Include="Source\DataObjects\Referral.cs" />
     <Compile Include="Source\DataObjects\ReferralTypeBox.cs" />
     <Compile Include="Source\DataObjects\ReferToBox.cs" />
-    <Compile Include="Source\Patient.cs" />
-    <Compile Include="Source\PatientGUIAdapter.cs" />
+    <Compile Include="Source\DataObjects\Patient.cs" />
+    <Compile Include="Source\DataObjects\PatientGUIAdapter.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

PWAPPv2/Source/API/PWApiConnection.cs

@@ -1,9 +1,11 @@
 using PWAPPv2.Source.DataObjects;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace PWAPPv2.Source.API
 {
@@ -57,6 +59,45 @@ namespace PWAPPv2.Source.API
             return false;
         }
 
+        public void Update(string[] args)
+        {
+            try
+            {
+                if (CheckForUpdate() == true)
+                {
+                    string message = "An update is available! Would you like to install it?";
+                    string title = "Update available!";
+                    MessageBoxButtons buttons = MessageBoxButtons.YesNo;
+                    DialogResult result = System.Windows.Forms.MessageBox.Show(message, title, buttons);
+                    if (result == System.Windows.Forms.DialogResult.Yes)
+                    {
+                        //System.Windows.MessageBox.Show("HAHA NO UPDATE FOR YOU!");
+                        Process p = new Process();
+                        p.StartInfo.FileName = "C:\\PWAPP\\Updater\\PWAppUpdaterForm.exe";
+                        p.StartInfo.WindowStyle = ProcessWindowStyle.Maximized;
+                        p.StartInfo.UseShellExecute = false;
+                        p.StartInfo.RedirectStandardOutput = true;
+                        p.StartInfo.RedirectStandardError = true;
+                        try
+                        {
+                            p.StartInfo.Arguments = args[0];
+                        }
+                        catch { }
+                        if (System.Environment.OSVersion.Version.Major >= 6)
+                        {
+                            p.StartInfo.Verb = "runas";
+                        }
+                        p.Start();
+                        Environment.Exit(0);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                throw new UpdateException();
+            }
+        }
+
         public string GetReferalTypes()
         {
             return ReferTypesConnection.SendPostWithCredsInHeader("", "");
@@ -78,4 +119,6 @@ namespace PWAPPv2.Source.API
         }
 
     }
+
+    public class UpdateException : Exception { }
 }

PWAPPv2/Source/Attachments/AttachmentFactory.cs

@@ -0,0 +1,78 @@
+using Microsoft.Identity.Client;
+using PWAPPv2.Source.DataObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PWAPPv2.Source.Attachments
+{
+    public class AttachmentFactory
+    {
+        public static PWAttachment BuildAttachment(APICredentials credentials, string token, PWImage image)
+        {
+            PWAttachment attachment = new PWAttachment();
+            attachment.UserID = credentials.UserID;
+            attachment.Password = credentials.Password;
+            attachment.PracticeId = credentials.PracticeId;
+            attachment.APIid = credentials.APIid;
+            attachment.UserNum = "API";
+            attachment.AttToken = token.Replace("\"", "");
+            attachment.ThumbExists = "1";
+            attachment.ZoomExists = "1";
+            attachment.FileDate = "";
+            attachment.FileName = image.ShortFileName();
+            attachment.FileType = image.FileType;
+            attachment.Base64FileContents = image.GetBase64String();
+            attachment.Base64ThumbContents = image.GetBase64ThumbString();
+            attachment.Base64ZoomContents = image.GetBase64ZoomString();
+            return attachment;
+        }
+
+        public static PWAttachment BuildAttachment(APICredentials credentials, string token, PWPdf pdf)
+        {
+            PWAttachment attachment = new PWAttachment();
+            attachment.UserID = credentials.UserID;
+            attachment.Password = credentials.Password;
+            attachment.PracticeId = credentials.PracticeId;
+            attachment.APIid = credentials.APIid;
+            attachment.UserNum = "API";
+            attachment.AttToken = token.Replace("\"", "");
+            attachment.ThumbExists = "0";
+            attachment.ZoomExists = "0";
+            attachment.FileDate = "";
+            attachment.FileName = pdf.ShortFileName();
+            attachment.FileType = "application/pdf";
+            attachment.Base64FileContents = pdf.GetBase64String();
+            attachment.Base64ThumbContents = "";
+            attachment.Base64ZoomContents = "";
+            return attachment;
+
+        }
+
+        public static PWBaseAttachment BuildBaseAttachment(string token, PWImage image)
+        {
+            PWBaseAttachment attachment = new PWBaseAttachment();
+            attachment.AttToken = token.Replace("\"", "");
+            attachment.ThumbExists = true;
+            attachment.ZoomExists = true;
+            attachment.FileDate = "";
+            attachment.FileName = image.ShortFileName();
+            attachment.FileType = image.FileType;
+            return attachment;
+        }
+
+        public static PWBaseAttachment BuildBaseAttachment(string token, PWPdf pdf)
+        {
+            PWBaseAttachment attachment = new PWBaseAttachment();
+            attachment.AttToken = token.Replace("\"", "");
+            attachment.ThumbExists = false;
+            attachment.ZoomExists = true;
+            attachment.FileDate = "";
+            attachment.FileName = pdf.ShortFileName();
+            attachment.FileType = "application/pdf";
+            return attachment;
+        }
+    }
+}

PWAPPv2/Source/Attachments/AttachmentResponse.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PWAPPv2.Source.Attachments
+{
+    public class AttachmentResponse
+    {
+    }
+}

PWAPPv2/Source/Attachments/FileHandler.cs

@@ -0,0 +1,164 @@
+using PWAPPv2.Source.API;
+using PWAPPv2.Source.DataObjects;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Forms;
+
+namespace PWAPPv2.Source.Attachments
+{
+    public class FileHandler
+    {
+
+        public List<string> SupportedImageTypes;
+        public List<string> SupportedVideoTypes;
+        public List<string> SupportedDocumentTypes;
+
+        public List<Source.DataObjects.Attachment> Attachments;
+
+        private APICredentials credentials;
+
+        private string filterString;
+
+        public FileHandler(APICredentials apiCredentials)
+        {
+            credentials = apiCredentials;
+            SupportedImageTypes = new List<string>();
+            SupportedVideoTypes = new List<string>();
+            SupportedDocumentTypes = new List<string>();
+
+            SupportedImageTypes.Clear();
+            SupportedImageTypes.Add(".jpeg");
+            SupportedImageTypes.Add(".jpg");
+            SupportedImageTypes.Add(".png");
+            SupportedImageTypes.Add(".tiff");
+            SupportedImageTypes.Add(".tif");
+            SupportedImageTypes.Add(".gif");
+            SupportedImageTypes.Add(".bmp");
+
+            SupportedDocumentTypes.Clear();
+            SupportedDocumentTypes.Add(".pdf");
+            
+            Attachments = new List<Source.DataObjects.Attachment>();
+
+            filterString = "Attachment files (";
+            string filter = "|";
+            foreach (string imageType in SupportedImageTypes)
+            {
+                filterString += "*" + imageType + ",";
+                filter += "*" + imageType + ";";
+            }
+            foreach (string videoType in SupportedVideoTypes)
+            {
+                filterString += "*" + videoType + ",";
+                filter += "*" + videoType + ";";
+            }
+            foreach (string documentType in SupportedDocumentTypes)
+            {
+                filterString += "*" + documentType + ",";
+                filter += "*" + documentType + ";";
+            }
+            filterString = filterString.Remove(filterString.Length - 1, 1);
+            filterString += ")" + filter;
+
+        }
+
+        public void AddFile()
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Multiselect = true;
+            
+
+            openFileDialog.Filter = filterString;
+            openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyPictures);
+
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                foreach (string filename in openFileDialog.FileNames)
+                {
+                    if(SupportedImageTypes.Contains(Path.GetExtension(filename)))
+                    {
+                        try
+                        {
+                            Attachments.Add(new DataObjects.Attachment(credentials, new DataObjects.PWImage(filename)));
+                        }
+                        catch (NullReferenceException)
+                        { }
+                    }
+                    if(SupportedDocumentTypes.Contains(Path.GetExtension(filename)))
+                    {
+                        try
+                        {
+                            Attachments.Add(new Source.DataObjects.Attachment(credentials, new Source.DataObjects.PWPdf(filename)));
+                        }
+                        catch(NullReferenceException) { }
+                    }
+                }
+            }
+        }
+
+        public void SendFilesAsAttachments(APIConnection connection, string token)
+        {
+            if(Attachments.Count <= 0)
+            {
+                return;
+            }
+            foreach(DataObjects.Attachment attachment in Attachments)
+            {
+                //PWAttachment att = null;
+                PWBaseAttachment ba = null;
+
+                List<PWFileUpload> fileUploads = new List<PWFileUpload>();
+
+                if (attachment.image != null)
+                {
+                    //att = AttachmentFactory.BuildAttachment(credentials, token, attachment.image);
+                    ba = AttachmentFactory.BuildBaseAttachment(token, attachment.image);
+                    //fileUploads.Add(attachment.image.GetFileUploads(attachment.co))
+
+                    string json = JsonSerializer.Serialize(ba);
+                    string contId = connection.SendPostWithCredsInHeader("api/PWAddAttachment", json);
+                    contId = contId.Replace("\"", "").Replace("\\n", "").Trim();
+                    fileUploads = attachment.image.GetFileUploads(token, contId);
+                    foreach(PWFileUpload file in fileUploads)
+                    {
+                        json = JsonSerializer.Serialize(file);
+                        connection.SendPostWithCredsInHeader("api/PWUploadFile", json);
+                    }
+                }
+                else if (attachment.pdf != null)
+                {
+                    //att = AttachmentFactory.BuildAttachment(credentials, token, attachment.pdf);
+                    ba = AttachmentFactory.BuildBaseAttachment(token, attachment.pdf);
+
+                    string json = JsonSerializer.Serialize(ba);
+                    string contId = connection.SendPostWithCredsInHeader("api/PWAddAttachment", json);
+                    fileUploads = attachment.pdf.GetFileUploads(token, contId);
+                    foreach (PWFileUpload file in fileUploads)
+                    {
+                        json = JsonSerializer.Serialize(file);
+                        connection.SendPostWithCredsInHeader("api/PWUploadFile", json);
+                    }
+                }
+
+                //if (att == null)
+                //{
+                //    throw new AttachmentTypeNotYetSupportedException();
+                //}
+                //string json = JsonSerializer.Serialize(att);
+                //connection.SendPostWithCredsInHeader("api/PWAttachment", json);
+                //json = JsonSerializer.Serialize(ba);
+                //connection.SendPostWithCredsInHeader("api/PWAddAttachment", json);
+            }
+        }
+
+    }
+
+    public class AttachmentTypeNotYetSupportedException : Exception { }
+}

PWAPPv2/Source/Attachments/PWAttachment.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PWAPPv2.Source.Attachments
+{
+    public class PWAttachment
+    {
+        public string UserID { get; set; }
+        public string Password { get; set; }
+        public string PracticeId { get; set; }
+        public string APIid { get; set; }
+        public string UserNum { get; set; }
+        public string AttToken { get; set; }
+        public string FileName { get; set; }
+        public string ThumbExists { get; set; }
+        public string ZoomExists { get; set; }
+        public string FileDate { get; set; }
+        public string FileType { get; set; }
+        public string Base64FileContents { get; set; }
+        public string Base64ThumbContents { get; set; }
+        public string Base64ZoomContents { get; set; }
+
+    }
+}

PWAPPv2/Source/Attachments/PWBaseAttachment.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PWAPPv2.Source.Attachments
+{
+    public class PWBaseAttachment
+    {
+        public string AttToken { get; set; }
+        public string FileName { get; set; }
+        public bool ThumbExists { get; set; }
+        public bool ZoomExists { get; set; }
+        public string FileDate { get; set; }
+        public string FileType { get; set; }
+
+    }
+}

PWAPPv2/Source/Attachments/PWFileUpload.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PWAPPv2.Source.Attachments
+{
+    public class PWFileUpload
+    {
+        public string Base64Content { get; set; }
+        public string AttToken { get; set; }
+        public string ContentId { get; set; }
+        public string Tag {  get; set; }
+    }
+}

PWAPPv2/Source/DataObjects/Attachment.cs

@@ -1,6 +1,6 @@
 namespace PWAPPv2.Source.DataObjects
 {
-    class Attachment
+    public class Attachment
     {
         APICredentials Credentials;
         public PWImage image {  get; set; }
@@ -28,7 +28,7 @@
 
         public string ToJsonString()
         {
-            if (fileType == "image/jpeg")
+            if (image != null)
             {
                 return "\"{" + Credentials.BuildJsonBodyContents() +
                     ",'UserNum':'API'," +
@@ -37,10 +37,8 @@
                     "'ThumbExists':'1'," +
                     "'ZoomExists':'1'," +
                     "'FileDate':''," +
-                    "'FileType':'" + fileType + "'," +
-                    "'Base64FileContents':'" + image.GetBase64String() + "',\n" +
-                    "'Base64ThumbContents':'" + image.GetBase64ThumbString() + "',\n" +
-                    "'Base64ZoomContents':'" + image.GetBase64ZoomString() + "'}\"";
+                    "'FileType':'" + image.FileType + "'," +
+                    image.GetJsonContents() + "}\"";
             }
             else
             {

PWAPPv2/Source/DataObjects/PWFile.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PWAPPv2.Source.DataObjects
+{
+    interface PWFile
+    {
+        List<Attachments.PWFileUpload> GetFileUploads(string attToken, string ContentId);
+    }
+}

PWAPPv2/Source/DataObjects/PWImage.cs

@@ -1,17 +1,22 @@
-using System;
+using PWAPPv2.Source.Attachments;
+using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
 
 namespace PWAPPv2.Source.DataObjects
 {
-    public class PWImage
+    public class PWImage : PWFile
     {
 
         private string ImagePath;
 
         private BitmapImage bitmap;
 
+        public string FileType { get; }
+
 
         //private Bitmap bmp;
         //private Bitmap thumb;
@@ -26,6 +31,29 @@ namespace PWAPPv2.Source.DataObjects
             bitmap.DecodePixelWidth = 100;
             bitmap.EndInit();
 
+            string extension = Path.GetExtension(path).ToLower();
+
+            if (extension == ".jpeg" || extension == ".jpg")
+            {
+                FileType = "image/jpeg";
+            }
+            else if (extension == ".png")
+            {
+                FileType = "image/png";
+            }
+            else if (extension == ".tiff" || extension == ".tif")
+            {
+                FileType = "image/tiff";
+            }
+            else if(extension == ".gif")
+            {
+                FileType = "image/gif";
+            }
+            else if(extension == ".bmp")
+            {
+                FileType = "image/bmp";
+            }
+
             //bmp = (Bitmap)System.Drawing.Image.FromFile(ImagePath);
             //thumb = resize(bmp, 50, 50);
             //zoom = resize(bmp, bmp.Width, bmp.Height);
@@ -96,5 +124,38 @@ namespace PWAPPv2.Source.DataObjects
             return ImagePath.Substring(ImagePath.LastIndexOf("\\") + 1);
         }
 
+        public string GetJsonContents()
+        {
+            string str = "'Base64FileContents':'" + GetBase64String() + "',\n" +
+                "'Base64ThumbContents':'" + GetBase64ThumbString() + "',\n" +
+                "'Base64ZoomContents':'" + GetBase64ZoomString() + "'\n";
+
+            return str;
+        }
+
+        public List<PWFileUpload> GetFileUploads(string attToken, string ContentId)
+        {
+            List<PWFileUpload> fileUploads = new List<PWFileUpload>();
+            PWFileUpload baseImage = new PWFileUpload();
+            baseImage.ContentId = ContentId;
+            baseImage.Base64Content = GetBase64String();
+            baseImage.AttToken = attToken;
+            
+            PWFileUpload zoom = new PWFileUpload();
+            zoom.Base64Content = GetBase64ZoomString();
+            zoom.ContentId = ContentId;
+            zoom.Tag = "_zoom";
+            zoom.AttToken = attToken;
+
+            PWFileUpload thumb = new PWFileUpload();
+            thumb.Base64Content= GetBase64ThumbString();
+            thumb.ContentId = ContentId;
+            thumb.Tag = "_th";
+            thumb.AttToken = attToken;
+            fileUploads.Add(baseImage);
+            fileUploads.Add(zoom);
+            fileUploads.Add(thumb);
+            return fileUploads;
+        }
     }
 }

PWAPPv2/Source/DataObjects/PWPdf.cs

@@ -1,4 +1,5 @@
-using System;
+using PWAPPv2.Source.Attachments;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -7,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace PWAPPv2.Source.DataObjects
 {
-    public class PWPdf
+    public class PWPdf : PWFile
     {
         public string path;
 
@@ -23,6 +24,17 @@ namespace PWAPPv2.Source.DataObjects
             return Convert.ToBase64String(bytes);
         }
 
+        public List<PWFileUpload> GetFileUploads(string attToken, string ContentId)
+        {
+            List<PWFileUpload> fileUploads = new List<PWFileUpload>();
+            PWFileUpload file = new PWFileUpload();
+            file.Base64Content = GetBase64String();
+            file.ContentId = ContentId;
+            file.AttToken = attToken;
+            fileUploads.Add(file);
+            return fileUploads;
+        }
+
         public string ShortFileName()
         {
             return path.Substring(path.LastIndexOf("\\") + 1);

PWAPPv2/Source/DataObjects/Patient.cs

@@ -24,6 +24,13 @@ namespace PWAPPv2.Source
         public string Email;
 
 
+        public static Patient GetPatient(Database.DatabaseConnection connection, string patNum)
+        {
+            Patient patient = new Patient();
+            patient.BuildFromDatabase(connection, patNum);
+            return patient;
+        }
+
         public void BuildFromDatabase(Database.DatabaseConnection databaseConnection, string patNum)
         {
             List<string> result = databaseConnection.QueryDatabase("SELECT PatNum, LName, FName, MiddleI, Gender, Birthdate," +