Updated some issues before pushing for release

MohawkMEDIC · Jul 31, 2017 · 8cff57a · 8cff57a
1 parent cbcba4d
commit 8cff57a
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 15 deletions.
diff --git a/ConfigTool/ConfigTool.csproj b/ConfigTool/ConfigTool.csproj
@@ -26,7 +26,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/ConfigTool/Program.cs b/ConfigTool/Program.cs
@@ -98,6 +98,7 @@ static void Main(string[] args)
                         if (start.ShowDialog() == DialogResult.Cancel)
                             return;
                     }
+
                     MARC.HI.EHRS.SVC.Core.ApplicationContext.Current.GetService<FileConfigurationService>().Open(ConfigurationApplicationContext.s_configFile);
                     try
                     {
@@ -112,6 +113,8 @@ static void Main(string[] args)
             catch (Exception e)
             {
                 Console.WriteLine(e.ToString());
+                Trace.TraceError(e.ToString());
+                MessageBox.Show(e.ToString());
             }
             finally
             {

diff --git a/ConfigTool/Properties/AssemblyInfo.cs b/ConfigTool/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ConfigTool")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("OpenIZ Configuration Tool")]
+[assembly: AssemblyDescription("Configuration tool for setting up and maintaining OpenIZ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ConfigTool")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyProduct("OpenIZ")]
+[assembly: AssemblyCopyright("Copyright ©  2016-2017 Mohawk College of Applied Arts and Technology")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.*")]
+[assembly: AssemblyVersion("0.9.7.*")]
 [assembly: AssemblyInformationalVersion("Edmonton CTP3")]
 [assembly: AssemblyFileVersion("0.8.0.0")]
diff --git a/Installer/OpenIZInstall.iss b/Installer/OpenIZInstall.iss
@@ -2,10 +2,10 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Open Immunize"
-#define MyAppVersion "0.9.7.0"
+#define MyAppVersion "0.9.7.3"
 #define MyAppPublisher "Mohawk College mHealth & eHealth Development and Innovation Centre"
 #define MyAppURL "http://openiz.org"
-#define DEBUG
+
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
@@ -120,11 +120,13 @@ Source: ..\Solution Items\MARC.Everest.dll; DestDir: {app}; Components: core;
 Source: ..\Solution Items\MARC.Everest.Connectors.WCF.dll; DestDir: {app}; Components: core
 Source: ..\Solution Items\MARC.HI.EHRS.QM.Core.dll; DestDir: {app}; Components: core
 Source: ..\Solution Items\MARC.HI.EHRS.QM.Persistence.Data.dll; DestDir: {app}; Components: core
-Source: ..\Solution Items\MARC.HI.EHRS.SVC.Core.ComponentModel.dll; DestDir: {app}; Components: core
+Source: ..\Solution Items\SharpCompress.dll; DestDir: {app}; Components: core
 Source: ..\Solution Items\MARC.HI.EHRS.SVC.Core.dll; DestDir: {app}; Components: core
 Source: ..\Solution Items\MARC.HI.EHRS.SVC.Core.Timer.dll; DestDir: {app}; Components: core
 Source: ..\Solution Items\MARC.HI.EHRS.SVC.Localization.dll; DestDir: {app}; Components: core
 Source: ..\Solution Items\MARC.HI.EHRS.SVC.Messaging.Persistence.Data.dll; DestDir: {app}; Components: core
+Source: ..\bin\Release\OpenIZ.Messaging.AMI.Client.dll; DestDir: {app}; Components: core
+Source: ..\bin\Release\OpenIZ.Messaging.IMSI.Client.dll; DestDir: {app}; Components: core
 Source: ..\bin\Release\OpenIZ.Core.Model.ViewModelSerializers.dll; DestDir: {app}; Components: core
 Source: ..\bin\Release\OpenIZ.Core.Applets.dll; DestDir: {app}; Components: core
 Source: ..\bin\Release\OpenIZ.Core.PCL.dll; DestDir: {app}; Components: core
@@ -133,7 +135,11 @@ Source: ..\bin\Release\OpenIZ.Core.Model.dll; DestDir: {app}; Components: core
 Source: ..\bin\Release\OpenIZ.Core.dll; DestDir: {app}; Components: core
 Source: ..\bin\release\OpenIZ.exe; DestDir: {app}; Components: core
 Source: ..\bin\Release\OpenIZ.Core.Model.RISI.dll; DestDir: {app}; Components: core
-Source: ..\bin\Release\MARC.HI.EHRS.SVC.Configuration.dll; DestDir: {app}; Components: core
+Source: ..\Solution Items\MARC.HI.EHRS.SVC.Configuration.dll; DestDir: {app}; Components: core
+Source: ..\Solution Items\MARC.HI.EHRS.SVC.Configurator.Npgsql.dll; DestDir: {app}; Components: core
+Source: ..\Solution Items\MARC.HI.EHRS.SVC.Core.dll; DestDir: {app}; Components: core
+Source: ..\bin\Release\ConfigTool.exe; DestDir: {app}; Components: core
+Source: ..\bin\Release\ConfigTool.exe.config; DestDir: {app}; Components: core
 ; AMI
 Source: ..\Solution Items\MARC.Util.CertificateTools.dll; DestDir: {app}; Components: msg\ami
 Source: ..\Solution Items\CERTADMINLib.dll; DestDir: {app}; Components: msg\ami
@@ -165,6 +171,7 @@ Source: ..\bin\release\OpenIZ.Messaging.HL7.dll; DestDir: {app}; Components: int
 Source: ..\Solution Items\AjaxMin.dll; DestDir: {app}; Components: tools
 Source: ..\bin\release\oizdt.exe; DestDir: {app}; Components: tools
 Source: ..\bin\release\LogViewer.exe; DestDir: {app}; Components: tools
+Source: ..\bin\release\oizac.exe; DestDir: {app}; Components: tools
 
 ; Twilio
 Source: ..\Solution Items\RestSharp.dll; DestDir: {app}; Components: tfa\twilio
@@ -420,6 +427,8 @@ Filename: "{dotnet40}\\ngen.exe"; Parameters: "uninstall ""{app}\OpenIZ.Persiste
 #endif
 
 [Icons]
+Name: "{commonprograms}\Open Immunize\OpenIZ Administration Console"; Filename: "{app}\oizac.exe"; Parameters: "-r localhost -a org.openiz.administration -s Mohawk123"
+Name: "{commonprograms}\Open Immunize\Configure OpenIZ IMS"; Filename: "{app}\configtool.exe"; 
 
 ; Components
 [Code]

diff --git a/OpenIZ.Core/Configuration/UI/CoreConfigurationPanel.cs b/OpenIZ.Core/Configuration/UI/CoreConfigurationPanel.cs
@@ -72,7 +72,6 @@ public void Configure(XmlDocument configurationDom)
         /// <param name="configFile"></param>
         public void EasyConfigure(XmlDocument configFile)
         {
-            throw new NotImplementedException();
         }
 
         /// <summary>

diff --git a/OpenIZ.Core/Services/Impl/FileConfigurationService.cs b/OpenIZ.Core/Services/Impl/FileConfigurationService.cs
@@ -28,11 +28,15 @@ public class FileConfigurationService : MARC.HI.EHRS.SVC.Core.Services.IConfigur
         /// </summary>
         public FileConfigurationService()
         {
-            var configFile = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "openiz.config");
-            if (!File.Exists(configFile))
-                configFile = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "openiz.exe.config");
+            try
+            {
+                var configFile = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "openiz.config");
+                if (!File.Exists(configFile))
+                    configFile = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "openiz.exe.config");
 
-            this.Open(configFile);
+                this.Open(configFile);
+            }
+            catch { }
         }
 
         /// <summary>

diff --git a/Solution Items/MARC.HI.EHRS.SVC.Configuration.dll b/Solution Items/MARC.HI.EHRS.SVC.Configuration.dll