浏览代码

PRS MOBILE - update version 7.14.8 (bug fix to frame details page)

Nick-PRSDigital@bitbucket.org 2 年之前
父节点
当前提交
7d01fc477b

+ 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.7</string>
+	<string>7.14.8</string>
 	<key>CFBundleVersion</key>
-	<string>7.14.7</string>
+	<string>7.14.8</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>Bluetooth access is needed to locate equipment items</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>

+ 6 - 6
prs.mobile/comal.timesheets.iOS/comal.timesheets.iOS.csproj

@@ -27,10 +27,10 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchArch>x86_64</MtouchArch>
-    <MtouchLink>None</MtouchLink>
+    <MtouchLink>SdkOnly</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
     <CodesignKey>Apple Development: Created via API (3FWUMF4RJ4)</CodesignKey>
-    <CodesignProvision>VS: au.com.frogsoftware.timesheets Development</CodesignProvision>
+    <CodesignProvision>Automatic</CodesignProvision>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <LangVersion>8.0</LangVersion>
@@ -41,7 +41,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>
     <CodesignKey>Apple Development: Created via API (3FWUMF4RJ4)</CodesignKey>
@@ -68,7 +68,7 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <LangVersion>8.0</LangVersion>
     <MtouchExtraArgs>--interpreter</MtouchExtraArgs>
-    <CodesignProvision>VS: au.com.frogsoftware.timesheets Development</CodesignProvision>
+    <CodesignProvision>Automatic</CodesignProvision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -78,10 +78,10 @@
     <WarningLevel>0</WarningLevel>
     <MtouchArch>ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
-    <CodesignKey>Apple Development: Created via API (3FWUMF4RJ4)</CodesignKey>
+    <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>
-    <CodesignProvision>VS: au.com.frogsoftware.timesheets Development</CodesignProvision>
+    <CodesignProvision>Automatic</CodesignProvision>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">

+ 2 - 1
prs.mobile/comal.timesheets/Data Classes/NotifyChanges.cs

@@ -17,7 +17,8 @@ namespace comal.timesheets
             string latestChanges = "";
             List<string> changes = new List<string>
                 {
-                "- Stability improvements to connections"
+                "- Bug fix to Frame Details Page",
+                "- Changed demo settings to new port"
                 };
             foreach (string s in changes)
             {

+ 33 - 30
prs.mobile/comal.timesheets/FrameScanner/FrameDetailsPage.xaml.cs

@@ -64,41 +64,44 @@ namespace comal.timesheets
                         x => x.JobLink.Name,
                         x => x.ManufacturingPacketLink.SetoutLink.Number,
                         x => x.ManufacturingPacketLink.SetoutLink.Description,
-                        x => x.ManufacturingPacketLink.Serial
+                        x => x.ManufacturingPacketLink.Serial,
+                        x => x.SetoutLink.ID
                 ));
 
                 if (items.Rows.Any())
                 {
                     item = items.Rows.FirstOrDefault().ToObject<DeliveryItem>();
 
-                    Task.Run(() =>
-                    {
-                        CoreTable docs = new Client<SetoutDocument>().Query(
-                            new Filter<SetoutDocument>(x => x.EntityLink.ID).IsEqualTo(item.ManufacturingPacketLink.SetoutLink.ID).And(x => x.Superceded).IsEqualTo(DateTime.MinValue),
-                            new Columns<SetoutDocument>(x => x.DocumentLink.FileName, x => x.DocumentLink.ID)
-                        );
-
-                        foreach (var row in docs.Rows)
-                        {
-                            if (string.IsNullOrWhiteSpace(row.Get<SetoutDocument, string>(x => x.DocumentLink.FileName)))
-                                continue;
-
-                            MaterialButton button = new MaterialButton();
-                            button.Text = row.Get<SetoutDocument, String>(x => x.DocumentLink.FileName);
-                            button.Padding = new Thickness(0, 10, 0, 10);
-                            button.ButtonType = MaterialButtonType.Elevated;
-                            button.Clicked += ViewPDF;
-                            button.HorizontalOptions = LayoutOptions.FillAndExpand;
-                            pdfs[button] = row.Get<SetoutDocument, Guid>(x => x.DocumentLink.ID);
-                        }
-
-                        Device.BeginInvokeOnMainThread(() =>
-                        {
-                            this.documents.Children.Clear();
-                            foreach (var button in pdfs.Keys)
-                                this.documents.Children.Add(button);
-                        });
-                    });
+                    if (item.SetoutLink.ID != Guid.Empty)
+                        Task.Run(() =>
+                          {
+                              CoreTable docs = new Client<SetoutDocument>().Query(
+                              new Filter<SetoutDocument>(x => x.EntityLink.ID).IsEqualTo(item.SetoutLink.ID)
+                              .And(x => x.Superceded).IsEqualTo(DateTime.MinValue),
+                              new Columns<SetoutDocument>(x => x.DocumentLink.FileName, x => x.DocumentLink.ID)
+                              );
+
+                              foreach (var row in docs.Rows)
+                              {
+                                  if (string.IsNullOrWhiteSpace(row.Get<SetoutDocument, string>(x => x.DocumentLink.FileName)))
+                                      continue;
+
+                                  MaterialButton button = new MaterialButton();
+                                  button.Text = row.Get<SetoutDocument, String>(x => x.DocumentLink.FileName);
+                                  button.Padding = new Thickness(0, 10, 0, 10);
+                                  button.ButtonType = MaterialButtonType.Elevated;
+                                  button.Clicked += ViewPDF;
+                                  button.HorizontalOptions = LayoutOptions.FillAndExpand;
+                                  pdfs[button] = row.Get<SetoutDocument, Guid>(x => x.DocumentLink.ID);
+                              }
+
+                              Device.BeginInvokeOnMainThread(() =>
+                              {
+                                  this.documents.Children.Clear();
+                                  foreach (var button in pdfs.Keys)
+                                      this.documents.Children.Add(button);
+                              });
+                          });
                 }
                 else
                     item = new DeliveryItem();
@@ -106,7 +109,7 @@ namespace comal.timesheets
                 Device.BeginInvokeOnMainThread(() =>
                 {
                     if (item != null)
-                        this.BindingContext = item;              
+                        this.BindingContext = item;
                 });
             }
         }

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

@@ -56,7 +56,7 @@ namespace comal.timesheets
             {
                 InitAndRegister();
 
-                LoadSettings();
+                LoadSettings();            
 
                 SaveSettings();
 
@@ -166,6 +166,10 @@ 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 { }
         }
@@ -179,9 +183,7 @@ namespace comal.timesheets
 
         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";
+            DBSettings.URLs[0] = "demo.prsdigital.com.au:8033";
         }
 
         private bool DBUrslBlank()

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

@@ -1599,7 +1599,7 @@ namespace comal.timesheets
                         Image = "scanner"
                     };
                     Scanner.OnTapped += ((object sender, EventArgs e) =>
-                    {
+                    {                        
                         ScannerPage scannerPage = new ScannerPage();
                         Navigation.PushAsync(scannerPage);
                     });