Merge remote-tracking branch 'origin/kenric' into frank

PRS.Avalonia/PRS.Avalonia/Components/FormsList/FormsList.axaml

@@ -27,7 +27,9 @@
 
 		<listView:PrsListView Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
 							  Repository="{Binding $parent[local:FormsList].Model}"
-							  FilterShell="FilterShell">
+							  FilterShell="FilterShell"
+							  Margin="{StaticResource PrsControlSpacing}"
+							  ClipToBounds="False">
 			<listView:PrsListView.ItemTemplate>
 				<DataTemplate DataType="prs:IDigitalFormInstanceShell">
 					<Button Classes="Standard" Background="{Binding .,Converter={StaticResource BackgroundColorConverter}}"
@@ -84,7 +86,8 @@
 		<TabStrip Name="_tabList"
 				  Grid.Row="1" Grid.Column="0"
 				  IsVisible="{Binding $parent[local:FormsList].SeparateHistory}"
-				  SelectionChanged="TabStrip_SelectionChanged">
+				  SelectionChanged="TabStrip_SelectionChanged"
+				  Margin="{StaticResource PrsControlSpacing}">
 			<TabStripItem Content="Open Forms"/>
 			<TabStripItem Content="History"/>
 		</TabStrip>

PRS.Avalonia/PRS.Avalonia/Modules/DigitalForms/FormsViewModel.cs

@@ -44,7 +44,8 @@ public partial class FormsViewModel : ModuleViewModel
 
         DigitalForms = new DigitalFormModel(DataAccess,
             () => new Filter<DigitalForm>(x => x.ID).InQuery(new Filter<EmployeeDigitalForm>(x => x.Employee.ID).IsEqualTo(Repositories.Me.ID), x => x.Form.ID)
-                .And(x => x.Active).IsEqualTo(true),
+                .And(x => x.Active).IsEqualTo(true)
+                .And(x => x.ID).InQuery(new Filter<DigitalFormLayout>(x => x.Active).IsEqualTo(true), x => x.Form.ID),
             () => DefaultCacheFileName<DigitalFormShell>());
 
         PrimaryMenu.Add(new AvaloniaMenuItem(Images.plus, AddForm));