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

Fixed issue with attachment tokens. Changed how attachments are handled to be more modular. Added support for PNG files.

Browse Source
This commit is contained in:
MatttBurke
2024-02-09 19:02:09 -05:00
parent 40f9db3ea4
commit f31302438d
10 changed files with 410 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PWAPPv2/Source/API/PWApiConnection.cs
+43
View File
@@ -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
+53
View File
@@ -0,0 +1,53 @@
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;
}
}
}
PWAPPv2/Source/Attachments/FileHandler.cs
+134
View File
@@ -0,0 +1,134 @@
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");
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;
if (attachment.image != null)
{
att = AttachmentFactory.BuildAttachment(credentials, token, attachment.image);
}
else if (attachment.pdf != null)
{
att = AttachmentFactory.BuildAttachment(credentials, token, attachment.pdf);
}
if (att == null)
{
throw new AttachmentTypeNotYetSupportedException();
}
string json = JsonSerializer.Serialize(att);
connection.SendPostWithCredsInHeader("api/PWAttachment", json);
}
}
}
public class AttachmentTypeNotYetSupportedException : Exception { }
}
PWAPPv2/Source/Attachments/PWAttachment.cs
+28
View File
@@ -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/DataObjects/Attachment.cs
+4 -6
View File
@@ -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/PWImage.cs
+22
View File
@@ -12,6 +12,8 @@ namespace PWAPPv2.Source.DataObjects
private BitmapImage bitmap;
public string FileType { get; }
//private Bitmap bmp;
//private Bitmap thumb;
@@ -26,6 +28,17 @@ 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";
}
//bmp = (Bitmap)System.Drawing.Image.FromFile(ImagePath);
//thumb = resize(bmp, 50, 50);
//zoom = resize(bmp, bmp.Width, bmp.Height);
@@ -96,5 +109,14 @@ 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;
}
}
}
PWAPPv2/Source/Patient.cs → PWAPPv2/Source/DataObjects/Patient.cs
+7
View File
@@ -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," +
PWAPPv2/Source/PatientGUIAdapter.cs → PWAPPv2/Source/DataObjects/PatientGUIAdapter.cs
View File