Browse Source

PRS MOBILE - working version

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

+ 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="714700" package="au.com.frogsoftware.timesheets.comal_timesheets" android:installLocation="preferExternal" android:versionName="7.14.7">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="715100" package="au.com.frogsoftware.timesheets.comal_timesheets" android:installLocation="preferExternal" android:versionName="7.15.1">
 	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

+ 1 - 1
prs.mobile/comal.timesheets.Android/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@ namespace comal.timesheets.Droid
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
 	public partial class Resource
 	{
 		

+ 1 - 0
prs.mobile/comal.timesheets.Android/comal.timesheets.Android.csproj

@@ -53,6 +53,7 @@
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <BundleAssemblies>false</BundleAssemblies>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />

+ 2 - 6
prs.mobile/comal.timesheets/Main/App.xaml.cs

@@ -56,7 +56,7 @@ namespace comal.timesheets
             {
                 InitAndRegister();
 
-                LoadSettings();            
+                LoadSettings();
 
                 SaveSettings();
 
@@ -166,10 +166,6 @@ namespace comal.timesheets
                     ApplyDemoSettings();
                 if (DBUrslBlank())
                     ApplyDemoURLs();
-
-                //if (DBSettings.URLs[0] != "demo.prsdigital.com.au:8033"
-                    //&& DBSettings.URLs[0] != "remote.com-al.com.au:8005")
-                    //DBSettings.URLs = new string[] { "remote.com-al.com.au:8000" };
             }
             catch { }
         }
@@ -183,7 +179,7 @@ namespace comal.timesheets
 
         private void ApplyDemoURLs()
         {
-            DBSettings.URLs[0] = "demo.prsdigital.com.au:8033";
+            DBSettings.URLs[0] = "remote.com-al.com.au:8000";
         }
 
         private bool DBUrslBlank()

+ 6 - 0
prs.mobile/comal.timesheets/Main/MainPage.xaml.cs

@@ -280,6 +280,12 @@ namespace comal.timesheets
 
                     MainPageUtils.firstLoad = false;
                     bBusy = false;
+
+                    if (App.DBSettings.UserID == "GUEST")
+                    {
+                        clockOnButton.IsEnabled = false;
+                        clockOnButton.Text = "PLEASE LOG IN";
+                    }
                 });
             }
             catch (Exception ex)