Browse Source

Added "Mobile App" shortcut on main screen
Fixed Issue with Supplier Bills

frogsoftware 1 week ago
parent
commit
52c68d389b

+ 15 - 6
prs.desktop/MainWindow.xaml

@@ -250,19 +250,28 @@
                            Click="Setup_Click"
                            Margin="0,0,5,20"/>
 
-            <fluent:Button Grid.Row="1" Grid.Column="1"
-                           Header="Forms"
-                           LargeIcon="{svgc:SvgImage Source=/Resources/formslibrary.svg}"
-                           Click="Forms_Click"
-                           Margin="0,0,5,20"/>
+            <!-- <fluent:Button Grid.Row="1" Grid.Column="1" -->
+            <!--                Header="Forms" -->
+            <!--                LargeIcon="{svgc:SvgImage Source=/Resources/formslibrary.svg}" -->
+            <!--                Click="Forms_Click" -->
+            <!--                Margin="0,0,5,20"/> -->
             
-            <fluent:Button Grid.Row="1" Grid.Column="2"
+            <fluent:Button Grid.Row="1" Grid.Column="1"
                            x:Name="IssuesButton"
                            Header="Support Tickets"
                            LargeIcon="{svgc:SvgImage Source=/Resources/appicon.svg}"
                            Click="Issues_Click"
                            ToolTip="Raise an issue with the PRS team"
                            Margin="0,0,5,20"/>
+            
+            <fluent:Button Grid.Row="1" Grid.Column="2"
+                           x:Name="MobileButton"
+                           Header="Mobile App"
+                           LargeIcon="{svgc:SvgImage Source=/Resources/mobile.svg}"
+                           Click="Mobile_Click"
+                           ToolTip="Raise an issue with the PRS team"
+                           Margin="0,0,5,20"/>
+            
 
             <Border Grid.Row="1" Grid.Column="3" 
                     BorderBrush="Silver" BorderThickness="0,0.75,0.75,0.75" Padding="0,0,5,20">

+ 8 - 0
prs.desktop/MainWindow.xaml.cs

@@ -2119,6 +2119,14 @@ public partial class MainWindow : IPanelHostControl
             MessageWindow.ShowError("Could not load issues.", err);
         }
     }
+    
+    private void Mobile_Click(object sender, RoutedEventArgs args)
+    {
+        var _baseDirectory = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) ?? "";
+        var _mobileApp = System.IO.Path.Combine(_baseDirectory, "PRSAvalonia", "PRS.Avalonia.Desktop.exe");
+        var _info = new ProcessStartInfo(_mobileApp);
+        Process.Start(_info);
+    }
 
     private void StartForm<TEntityForm, TEntity, TEntityLink>(DigitalForm form)
         where TEntityForm : BaseEntityForm<TEntity, TEntityLink, TEntityForm>, new()

+ 2 - 1
prs.desktop/PRSDesktop.csproj

@@ -839,6 +839,8 @@
         <Resource Include="Resources\kpi.svg" />
         <None Remove="Resources\gasket.png" />
         <Resource Include="Resources\gasket.png" />
+        <None Remove="Resources\mobile.svg" />
+        <Resource Include="Resources\mobile.svg" />
     </ItemGroup>
 
     <ItemGroup>
@@ -1145,7 +1147,6 @@
 
     <ItemGroup>
       <Folder Include="Tesseract\" />
-      <Folder Include="Utils\LogikalUtils\" />
     </ItemGroup>
 
     <ItemGroup>

+ 7 - 2
prs.desktop/Panels/Suppliers/Bills/SupplierBillLineGrid.cs

@@ -78,9 +78,13 @@ public class SupplierBillLineGrid : DynamicOneToManyGrid<Bill, BillLine>
             }
         );
 
-        _editColumn = new DynamicImageColumn(pencil, BillLineEdit_Click);
+        _editColumn = new DynamicImageColumn(pencil, BillLineEdit_Click)
+        {
+            Position = Options.EditRows ? DynamicActionColumnPosition.End : DynamicActionColumnPosition.Hidden
+        };
         ActionColumns.Add(_editColumn);
 
+
         ShowProblemsButton = AddButton("Only Show Problems", null, ShowProblems_Click);
     }
 
@@ -88,7 +92,8 @@ public class SupplierBillLineGrid : DynamicOneToManyGrid<Bill, BillLine>
     {
         base.OptionsChanged();
 
-        _editColumn.Position = Options.EditRows ? DynamicActionColumnPosition.End : DynamicActionColumnPosition.Hidden;
+        if (_editColumn != null)
+            _editColumn.Position = Options.EditRows ? DynamicActionColumnPosition.End : DynamicActionColumnPosition.Hidden;
     }
 
     private bool ShowProblems_Click(Button button, CoreRow[] rows)

File diff suppressed because it is too large
+ 0 - 0
prs.desktop/Resources/mobile.svg


+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "8.55.1"
+#define MyAppVersion "8.55.3"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

+ 1 - 1
prs.licensing/PRSLicensing.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Licensing"
-#define MyAppVersion "8.55.1"
+#define MyAppVersion "8.55.3"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

BIN
prs.media/FlatIcon Downloads/5987242-human-resources/._mobile.svg


File diff suppressed because it is too large
+ 0 - 0
prs.media/FlatIcon Downloads/5987242-human-resources/mobile.svg


+ 1 - 1
prs.server/PRSServer.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "8.55.1"
+#define MyAppVersion "8.55.3"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"

Some files were not shown because too many files changed in this diff