Procházet zdrojové kódy

Fixed Issue with Site / General Documents

Frank van den Bos před 1 rokem
rodič
revize
5b01b0aebc

+ 1 - 1
prs.mobile.new/PRS.Mobile.Droid/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="746000" android:versionName="7.46.0" package="comal.timesheets.Android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="747000" android:versionName="7.47.0" package="comal.timesheets.Android">
 	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="33" />
 	<queries>
 		<intent>

+ 1 - 1
prs.mobile.new/PRS.Mobile.iOS/Info.plist

@@ -27,7 +27,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.prsdigital.prssiteapp</string>
 	<key>CFBundleVersion</key>
-	<string>7.46.0</string>
+	<string>7.47.0</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>CFBundleName</key>

+ 4 - 1
prs.mobile.new/PRS.Mobile/Modules/Site/JobWebDocuments/JobWebDocuments.xaml.cs

@@ -25,7 +25,10 @@ namespace PRS.Mobile
             Webview.On<Xamarin.Forms.PlatformConfiguration.Android>().DisplayZoomControls(true);
             
             var webSettings = new GlobalConfiguration<WebSettings>().Load();
-            var DBSettings = new LocalConfiguration<MobileDatabaseSettings>().Load();
+            var allDBSettings = new LocalConfiguration<MobileDatabaseSettings>().LoadAll();
+            var DBSettings = allDBSettings.Any(x => x.Value.IsDefault)
+                ? allDBSettings.First(x => x.Value.IsDefault).Value
+                : allDBSettings.First().Value;
             string userid = Encryption.Encrypt(DBSettings.UserID, DateTime.Now.ToString("yyyy-MM-dd"), true);
             string password = Encryption.Encrypt(DBSettings.Password, DateTime.Now.ToString("yyyy-MM-dd"), true);
             Webview.Source = $"{webSettings.URL}:{webSettings.Port}/v1/Job/job_documents?id={Job.ID}&userid={userid}&password={password}";