Browse Source

Version 1.1.9

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

+ 5 - 0
prs.classes/SecurityDescriptors/Common_Descriptors.cs

@@ -27,6 +27,11 @@ namespace Comal.Classes
     {
     }
 
+    [Caption("Bypass GPS For Clock In")]
+    public class CanBypassGPSClockIn : DisabledSecurityDescriptor<HumanResourcesLicense, TimeSheet>
+    {
+    }
+
     [Caption("Automatically Create Timesheet on Log In")]
     public class AutoGenerateTimesheet : DisabledSecurityDescriptor<HumanResourcesLicense, TimeSheet>
     {

+ 2 - 2
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="101600" android:versionName="1.01.6" package="comal.timesheets.Android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="101800" android:versionName="1.01.8" package="comal.timesheets.Android">
 	<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="33" />
 	<queries>
 		<intent>
@@ -31,7 +31,7 @@
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.CAMERA" />
-	<application>
+	<application android:label="PRS Site App">
 		<provider android:name="android.support.v4.content.FileProvider" android:authorities="${applicationId}.fileprovider" android:exported="false" android:grantUriPermissions="true">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"></meta-data>
 		</provider>

+ 1 - 0
prs.mobile.new/PRS.Mobile.Droid/Resources/Resource.designer.cs

@@ -2,6 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

+ 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.6</string>
+	<string>1.01.9</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>CFBundleName</key>

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

@@ -706,7 +706,9 @@ namespace PRS.Mobile
             // drop this to max 1 or 2 minutes..
             // Also, we would expect the GPS / Bluetooth subsystems to take care
             // of purging stale data
-            
+
+            if (InABox.Core.Security.IsAllowed<CanBypassGPSClockIn>())
+                return true;
             if (InABox.Core.Security.IsAllowed<CanBypassBluetoothGates>())
                 return App.GPS.TimeStamp > DateTime.Now.Subtract(new TimeSpan(0, 15, 0));
             if (App.Bluetooth.TimeStamp < DateTime.Now.Subtract(new TimeSpan(0, 15, 0)))