avalonia: Renamed DocsScanner to SubmitDocs

PRS.Avalonia/PRS.Avalonia/HomePage/HomePageViewModel.cs

@@ -53,7 +53,7 @@ public partial class HomePageViewModel : ViewModelBase
         Modules.Add<ViewMobileAssignmentsModule, AssignmentsViewModel>("Assignments", "", Images.schedule, isVisible: false);
         Modules.Add<ViewMobileDeliveriesModule, DeliveryModuleViewModel>("Deliveries", "", Images.delivery);
         Modules.Add<ViewMobileEquipmentModule, EquipmentModuleViewModel>("Equipment", "", Images.drill);
-        Modules.Add<ViewMobileDocumentScannerModule, DocumentScannerViewModel>("Scanner", "", Images.camera);
+        Modules.Add<ViewMobileDocumentScannerModule, SubmitDocsViewModel>("Submit Docs", "", Images.camera);
         Modules.Add<ViewMobileFormsModule, FormsViewModel>("Forms", "", Images.digitalform);
         Modules.Add<ViewMobileInOutModule, InOutViewModel>("In/Out", "", Images.clock);
         Modules.Add<ViewMobileManufacturingModule, ManufacturingViewModel>("Factory", "", Images.factory, isVisible: false);
@@ -62,7 +62,6 @@ public partial class HomePageViewModel : ViewModelBase
         _notifications = Modules.Add<NotificationsViewModel>("Notifications", "", Images.notification, isVisible: false);
         Modules.Add<ViewMobileProductsModule, ProductsViewModel>("Products", "", Images.stock, isVisible: false);
         Modules.Add<ViewMobilePurchaseOrdersModule, PurchaseOrdersViewModel>("Orders", "", Images.shoppingcart, isVisible: false);
-        Modules.Add<ViewMobileDocumentScannerModule, DocumentScannerViewModel>("Doc Scanner", "", Images.camera, isVisible: false);
         Modules.Add<ViewMobileSiteModule, SiteViewModel>("Site Module", "", Images.construction);
         Modules.Add<ViewMobileMyTasksModule, MyTasksViewModel>("My Tasks", "", Images.task, configure: model =>
         {

PRS.Avalonia/PRS.Avalonia/Modules/DocumentScanner/DocumentScannerEditorView.axaml → PRS.Avalonia/PRS.Avalonia/Modules/SubmitDocs/SubmitDocsEditorView.axaml

@@ -6,8 +6,8 @@
 			 xmlns:components="using:InABox.Avalonia.Components"
 			 xmlns:converters="using:InABox.Avalonia.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="PRS.Avalonia.Modules.DocumentScannerEditorView"
-			 x:DataType="modules:DocumentScannerEditorViewModel">
+             x:Class="PRS.Avalonia.Modules.SubmitDocsEditorView"
+			 x:DataType="modules:SubmitDocsEditorViewModel">
 	<Grid Margin="{StaticResource PrsControlSpacing}">
 		<Grid.RowDefinitions>
 			<RowDefinition Height="*"/>

PRS.Avalonia/PRS.Avalonia/Modules/DocumentScanner/DocumentScannerEditorView.axaml.cs → PRS.Avalonia/PRS.Avalonia/Modules/SubmitDocs/SubmitDocsEditorView.axaml.cs

@@ -7,11 +7,11 @@ using System.Threading.Tasks;
 
 namespace PRS.Avalonia.Modules;
 
-public partial class DocumentScannerEditorView : UserControl
+public partial class SubmitDocsEditorView : UserControl
 {
-    private DocumentScannerEditorViewModel? ViewModel;
+    private SubmitDocsEditorViewModel? ViewModel;
 
-    public DocumentScannerEditorView()
+    public SubmitDocsEditorView()
     {
         InitializeComponent();
     }
@@ -20,7 +20,7 @@ public partial class DocumentScannerEditorView : UserControl
     {
         base.OnDataContextChanged(e);
 
-        ViewModel = DataContext as DocumentScannerEditorViewModel;
+        ViewModel = DataContext as SubmitDocsEditorViewModel;
         if(ViewModel != null)
         {
             ViewModel.GetImage = GetImage;

PRS.Avalonia/PRS.Avalonia/Modules/DocumentScanner/DocumentScannerEditorViewModel.cs → PRS.Avalonia/PRS.Avalonia/Modules/SubmitDocs/SubmitDocsEditorViewModel.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace PRS.Avalonia.Modules;
 
-internal partial class DocumentScannerEditorViewModel : ModuleViewModel
+internal partial class SubmitDocsEditorViewModel : ModuleViewModel
 {
     public override string Title => "Document Editor";
 
@@ -30,7 +30,7 @@ internal partial class DocumentScannerEditorViewModel : ModuleViewModel
     [ObservableProperty]
     private bool _imageChanged;
 
-    public DocumentScannerEditorViewModel()
+    public SubmitDocsEditorViewModel()
     {
         PrimaryMenu.Add(new AvaloniaMenuItem(Images.save, Save));
     }

PRS.Avalonia/PRS.Avalonia/Modules/DocumentScanner/DocumentScannerView.axaml → PRS.Avalonia/PRS.Avalonia/Modules/SubmitDocs/SubmitDocsView.axaml

@@ -7,8 +7,8 @@
 			 xmlns:listView="using:PRS.Avalonia.Components.ListView"
 			 xmlns:prs="using:PRS.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="PRS.Avalonia.Modules.DocumentScannerView"
-             x:DataType="local:DocumentScannerViewModel">
+             x:Class="PRS.Avalonia.Modules.SubmitDocsView"
+             x:DataType="local:SubmitDocsViewModel">
 	<listView:PrsListView Repository="{Binding Documents}"
 						  RefreshVisible="True"
 						  Margin="{StaticResource PrsControlSpacing}"
@@ -17,7 +17,7 @@
 			<DataTemplate DataType="prs:DataEntryDocumentShell">
 				<Button Classes="Standard"
 						CommandParameter="{Binding}"
-						Command="{Binding $parent[local:DocumentScannerView].((local:DocumentScannerViewModel)DataContext).ClickCommand}"
+						Command="{Binding $parent[local:SubmitDocsView].((local:SubmitDocsViewModel)DataContext).ClickCommand}"
 						HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
 					<Button.Styles>
 						<Style Selector="Button.Standard">

PRS.Avalonia/PRS.Avalonia/Modules/DocumentScanner/DocumentScannerView.axaml.cs → PRS.Avalonia/PRS.Avalonia/Modules/SubmitDocs/SubmitDocsView.axaml.cs

@@ -4,9 +4,9 @@ using Avalonia.Markup.Xaml;
 
 namespace PRS.Avalonia.Modules;
 
-public partial class DocumentScannerView : UserControl
+public partial class SubmitDocsView : UserControl
 {
-    public DocumentScannerView()
+    public SubmitDocsView()
     {
         InitializeComponent();
     }

PRS.Avalonia/PRS.Avalonia/Modules/DocumentScanner/DocumentScannerViewModel.cs → PRS.Avalonia/PRS.Avalonia/Modules/SubmitDocs/SubmitDocsViewModel.cs

@@ -17,9 +17,9 @@ using PRS.Avalonia.Components;
 
 namespace PRS.Avalonia.Modules;
 
-public partial class DocumentScannerViewModel : ModuleViewModel
+public partial class SubmitDocsViewModel : ModuleViewModel
 {
-    public override string Title => "Doc Scanner";
+    public override string Title => "Submit Docs";
 
     [ObservableProperty]
     private DataEntryDocumentModel _documents;
@@ -27,7 +27,7 @@ public partial class DocumentScannerViewModel : ModuleViewModel
     [ObservableProperty]
     private DataEntryTagModel _tags;
     
-    public DocumentScannerViewModel()
+    public SubmitDocsViewModel()
     {
         Documents = new(DataAccess,
             () => new Filter<DataEntryDocument>(x => x.Employee.ID).IsEqualTo(Repositories.Me.ID)
@@ -63,7 +63,7 @@ public partial class DocumentScannerViewModel : ModuleViewModel
     [RelayCommand]
     private void Click(DataEntryDocumentShell shell)
     {
-        Navigation.Navigate<DocumentScannerEditorViewModel>(model =>
+        Navigation.Navigate<SubmitDocsEditorViewModel>(model =>
         {
             model.DataEntryDocument = shell;
         });
@@ -113,9 +113,8 @@ public partial class DocumentScannerViewModel : ModuleViewModel
             await Client.SaveAsync(document, "Created on Mobile Device");
 
             shell.DocumentID = document.ID;
-            await shell.SaveAsync("Created on Mobile Device");
 
-            Documents.CommitItem(shell);
+            await shell.SaveAsync("Created on Mobile Device");
 
             ProgressVisible = false;
         }

PRS.Avalonia/PRS.Avalonia/PRS.Avalonia.csproj

@@ -356,8 +356,11 @@
             <DependentUpon>DeliveriesView.axaml</DependentUpon>
             <SubType>Code</SubType>
         </Compile>
-        <Compile Update="Modules\DocumentScanner\DocumentScannerEditorView.axaml.cs">
-          <DependentUpon>DocumentScannerEditorView.axaml</DependentUpon>
+        <Compile Update="Modules\SubmitDocs\SubmitDocsView.axaml.cs">
+          <DependentUpon>SubmitDocsView.axaml</DependentUpon>
+        </Compile>
+        <Compile Update="Modules\SubmitDocs\SubmitDocsEditorView.axaml.cs">
+          <DependentUpon>SubmitDocsEditorView.axaml</DependentUpon>
         </Compile>
         <Compile Update="Modules\Equipment\EquipmentView.axaml.cs">
             <DependentUpon>EquipmentView.axaml</DependentUpon>

prs.classes/SecurityDescriptors/Mobile_Access.cs

@@ -76,7 +76,7 @@ namespace Comal.Classes.SecurityDescriptors
     { 
     }
     
-    [Caption("View Mobile Document Scanner Module")]
+    [Caption("View Mobile Submit Docs Module")]
     public class ViewMobileDocumentScannerModule : EnabledSecurityDescriptor<MobileAccessLicence>
     { 
     }