Browse Source

PRS MOBILE - version 7.14.7

Nick-PRSDigital@bitbucket.org 2 years ago
parent
commit
1a048a3a22

+ 1 - 1
prs.mobile/comal.timesheets.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="714600" package="au.com.frogsoftware.timesheets.comal_timesheets" android:installLocation="preferExternal" android:versionName="7.14.6">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="714700" package="au.com.frogsoftware.timesheets.comal_timesheets" android:installLocation="preferExternal" android:versionName="7.14.7">
 	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

+ 2 - 2
prs.mobile/comal.timesheets.iOS/Info.plist

@@ -9,9 +9,9 @@
 	<key>CFBundleName</key>
 	<string>TimeBench</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.14.6</string>
+	<string>7.14.7</string>
 	<key>CFBundleVersion</key>
-	<string>7.14.6</string>
+	<string>7.14.7</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>Bluetooth access is needed to locate equipment items</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>

+ 30 - 0
prs.mobile/comal.timesheets/Main/App.xaml.cs

@@ -149,6 +149,8 @@ namespace comal.timesheets
         {
             try
             {
+                DBSettings = new DatabaseSettings();
+
                 Settings = new LocalConfiguration<ConnectionSettings>().Load();
 
                 DBSettings = new LocalConfiguration<DatabaseSettings>().Load();
@@ -157,10 +159,38 @@ namespace comal.timesheets
                     DBSettings.UserID = Settings.UserID;
                 if (!string.IsNullOrWhiteSpace(Settings.Password) && string.IsNullOrWhiteSpace(DBSettings.Password))
                     DBSettings.Password = Settings.Password;
+
+                if (string.IsNullOrWhiteSpace(DBSettings.UserID)
+                    && string.IsNullOrWhiteSpace(DBSettings.Password)
+                    && DBUrslBlank())
+                    ApplyDemoSettings();
+                if (DBUrslBlank())
+                    ApplyDemoURLs();
             }
             catch { }
         }
 
+        private void ApplyDemoSettings()
+        {
+            DBSettings.UserID = "GUEST";
+            DBSettings.Password = "guest";
+            ApplyDemoURLs();
+        }
+
+        private void ApplyDemoURLs()
+        {
+            DBSettings.URLs[0] = "demo.prsdigital.com.au:8003";
+            DBSettings.URLs[1] = "demo2.prsdigital.com.au:8003";
+            DBSettings.URLs[2] = "demo3.prsdigital.com.au:8003";
+        }
+
+        private bool DBUrslBlank()
+        {
+            if (DBSettings.URLs.Count() == 0 || string.IsNullOrWhiteSpace(DBSettings.URLs[0]))
+                return true;
+            return false;
+        }
+
         private void InitAndRegister()
         {
             try