Merge branch 'frank' of http://192.168.100.242:3000/PRSDigital/prs into frank

prs.desktop/prsdesktop.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "8.03"
+#define MyAppVersion "8.03b"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

prs.licensing/PRSLicensing.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Licensing"
-#define MyAppVersion "8.03"
+#define MyAppVersion "8.03b"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

prs.server/Engines/Database/DatabaseEngine.cs

@@ -182,16 +182,26 @@ public class DatabaseEngine : Engine<DatabaseServerProperties>
         UserStore.PasswordExpirationTime = TimeSpan.FromDays(Properties.PasswordExpiryTime);
         RestService.CheckPasswordExpiration = Properties.PasswordExpiryTime > 0;
 
-        var users = DbFactory.Provider.Load<User>();
-        if (!users.Any())
-        {
-            var user = new User { UserID = "ADMIN", Password = "admin" };
-            DbFactory.Provider.Save(user);
+        if (DbFactory.IsReadOnly)
 
-            var employee = DbFactory.Provider.Load(new Filter<Employee>(x => x.Code).IsEqualTo("ADMIN")).FirstOrDefault() 
-                           ?? new Employee { Code = "ADMIN", Name = "Administrator Account" };
-            employee.UserLink.ID = user.ID;
-            DbFactory.Provider.Save(employee);
+            
+        {
+            Logger.Send(LogType.Error,"","Unable to create ADMIN user at this time.");
+        }
+        else
+        {
+            var users = DbFactory.Provider.Load<User>();
+            if (!users.Any())
+            {
+                var user = new User { UserID = "ADMIN", Password = "admin" };
+                DbFactory.Provider.Save(user);
+
+                var employee = DbFactory.Provider.Load(new Filter<Employee>(x => x.Code).IsEqualTo("ADMIN"))
+                                   .FirstOrDefault()
+                               ?? new Employee { Code = "ADMIN", Name = "Administrator Account" };
+                employee.UserLink.ID = user.ID;
+                DbFactory.Provider.Save(employee);
+            }
         }
 
         StoreUtils.GoogleAPIKey = Properties.GoogleAPIKey;

prs.server/Forms/DatabaseLicense/LicenseTrackingItemGrid.cs

@@ -13,5 +13,11 @@ namespace PRSServer.Forms.DatabaseLicense
 {
     public class LicenseTrackingItemGrid : DynamicItemsListGrid<LicenseTrackingItem>
     {
+
+        public LicenseTrackingItemGrid() : base()
+        {
+            HiddenColumns.Add(x => x.Type);
+            HiddenColumns.Add(x => x.ExGST);
+        }
     }
 }

prs.server/PRSServer.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "8.03"
+#define MyAppVersion "8.03b"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"