Browse Source

Version 1.01.10 (ios needs to be changed to 1.2.1 next update (Android did not support 1.01.10 - reverts to 1.01.1 which will not trigger phones to update)

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

+ 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="101800" android:versionName="1.01.8" package="comal.timesheets.Android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102100" android:versionName="1.02.1" package="comal.timesheets.Android">
 	<uses-sdk android:minSdkVersion="29" 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>1.01.9</string>
+	<string>1.01.10</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>CFBundleName</key>

+ 1 - 1
prs.mobile.new/PRS.Mobile.iOS/PRS.Mobile.iOS.csproj

@@ -33,7 +33,7 @@
         <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
-        <MtouchLink>None</MtouchLink>
+        <MtouchLink>SdkOnly</MtouchLink>
         <MtouchArch>x86_64</MtouchArch>
         <ConsolePause>false</ConsolePause>
     </PropertyGroup>

+ 6 - 6
prs.mobile.new/PRS.Mobile/MainPage.xaml.cs

@@ -360,14 +360,14 @@ namespace PRS.Mobile
                             if (tracker != null)
                                 CreateTimeSheet(tracker.JobID, tracker.JobNumber, tracker.JobName, here, App.GPS.Address, "Clocking On");
                         }
-                        else
+                        else if ((!App.GPS.Latitude.Equals(0.0F)) && (!App.GPS.Longitude.Equals(0.0F))
+                            || InABox.Core.Security.IsAllowed<CanBypassGPSClockIn>())
                         {
-                            if ((!App.GPS.Latitude.Equals(0.0F)) && (!App.GPS.Longitude.Equals(0.0F)))
-                            {
                                 var job = await ChooseNearbyJob(here);
                                 CreateTimeSheet(job?.ID ?? Guid.Empty, job?.JobNumber ?? "", job?.Name ?? "" , here, App.GPS.Address, "Clocking On");
-                            }
-                        }
+                         }
+                        
+                       
                     }
                     Dispatcher.BeginInvokeOnMainThread(RefreshScreen);
                 }
@@ -725,7 +725,7 @@ namespace PRS.Mobile
                 if (App.GPS.TimeStamp < DateTime.Now.Subtract(new TimeSpan(0, 5, 0)))
                 {
                     App.GPS.GetLocation(true);
-                    return "Searching for GPS";
+                    return InABox.Core.Security.IsAllowed<CanBypassGPSClockIn>()? "" : "Searching for GPS";
                 }
                 return App.GPS.Address;
             }