From fa06c2521b2cb738c382f54ee7657a104c5fc591 Mon Sep 17 00:00:00 2001
From: Marcel Hirschle <marcel.hirschle@beyondsoft.de>
Date: Fri, 19 Feb 2021 10:43:23 +0100
Subject: [PATCH] =?UTF-8?q?MH:=20Pivot-Tabelle:=20Checkbox=20hinzugef?=
 =?UTF-8?q?=C3=BCgt,=20mit=20der=20man=20Layout=20f=C3=BCr=20alle=20Mitarb?=
 =?UTF-8?q?eiter=20verf=C3=BCgbar=20macht=20Allgemeine=20Rechnung=20und=20?=
 =?UTF-8?q?Eigenanteilsrechnung:=20Anrede=20auf=20Sehr=20geehrte=20Damen?=
 =?UTF-8?q?=20und=20Herren=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo.sln                                      | 19 ++++++
 .../Detail/Report/FlexibleReportView.xaml     | 35 +++++++++-
 .../Detail/Report/FlexibleReportView.xaml.cs  | 67 ++++++++++++++++---
 Data/Entities/FlexibleReportLayout.cs         | 16 +++++
 Data/Mappings/FlexibleReportLayout.hbm.xml    |  1 +
 .../InvoiceCustomerReport.Designer.cs         | 11 ++-
 .../DefaultReports/InvoiceCustomerReport.cs   |  6 +-
 ...ibleReportLayoutDC_FlexibleReportLayout.cs |  2 +
 Service/Plugins/PluginLoader.cs               |  2 +-
 .../OperationsServiceImp.cs                   | 14 +++-
 .../DataContracts/FlexibleReportLayoutDC.cs   |  5 +-
 11 files changed, 155 insertions(+), 23 deletions(-)

diff --git a/BeWo.sln b/BeWo.sln
index e79c9d4c0..6f812ecad 100644
--- a/BeWo.sln
+++ b/BeWo.sln
@@ -437,6 +437,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProBeWoDueren", "ReportImp\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobiloAmbulant", "ReportImp\MobiloAmbulant\MobiloAmbulant.csproj", "{0F14574F-9637-40FE-8FCE-E047EFA4EC0B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KcmGmbH", "ReportImp\KcmGmbH\KcmGmbH.csproj", "{815DC325-1C77-4EC1-964F-D54D2321EDAF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -3320,6 +3322,22 @@ Global
 		{0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|x86.ActiveCfg = Release|Any CPU
 		{0F14574F-9637-40FE-8FCE-E047EFA4EC0B}.Release|x86.Build.0 = Release|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Debug|.NET.Build.0 = Debug|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Debug|x86.Build.0 = Debug|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Release|.NET.Build.0 = Release|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Release|x86.ActiveCfg = Release|Any CPU
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3534,6 +3552,7 @@ Global
 		{A368A18F-0D5F-49EB-885A-CEED97B5A5C5} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{BBF156EC-BC54-4A6C-BEDD-FF024347AD75} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 		{0F14574F-9637-40FE-8FCE-E047EFA4EC0B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+		{815DC325-1C77-4EC1-964F-D54D2321EDAF} = {D8A691C5-146D-4613-86CC-438F02FE9106}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml b/BeWo/View/Detail/Report/FlexibleReportView.xaml
index 3a0cc0d00..b0ba530fa 100644
--- a/BeWo/View/Detail/Report/FlexibleReportView.xaml
+++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml
@@ -10,8 +10,8 @@
                     xmlns:dxpg="http://schemas.devexpress.com/winfx/2008/xaml/pivotgrid"
                     xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/charts"
                     xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
-                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
-                    x:Class="BeWo.View.Detail.Report.FlexibleReportView"
+                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:controls="clr-namespace:BeWo.View.Controls"
+    x:Class="BeWo.View.Detail.Report.FlexibleReportView"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch" Focusable="True">
     <Grid>
@@ -54,6 +54,37 @@
                     <Button Content="Aktualisieren" Grid.Column="5" Margin="5,0,0,0" Click="buttonRefresh_Click" />
                     <Button Content="{markup:Translate Feldauswahl anzeigen}" Grid.Column="9" Margin="5,0,0,0" x:Name="ButtonShowOptions" Click="ButtonShowOptions_Click" />
                     <Button Content="{markup:Translate Bericht speichern}" Grid.Column="10" Margin="5,0,0,0" x:Name="ButtonLayoutSave" Click="ButtonLayoutSave_Click" />
+                    <controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popup_save_layout" Width="350" StaysOpen="True" Placement="MousePoint">
+                        <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
+                            <GroupBox x:Name="groupbox_saveLayout" Header="Bericht speichern" Style="{StaticResource ObjectEditGroupBox}">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+
+                                    </Grid.ColumnDefinitions>
+                                    <Label VerticalAlignment="Center" Content="Layoutname" />
+                                    <!--<uc:PopUpEdit IsReadOnly="True" DeleteButtonVisibility="Collapsed"
+                                                            Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="popup_berichtname"
+                                                            PopUpClick="popup_berichtname_PopUpClick"  Cursor="Arrow" />-->
+                                    <TextBox x:Name="textbox_layoutname" Grid.Column="1" Grid.Row="0"  Grid.ColumnSpan="2" Margin="3" Height="23"/>
+                                    <CheckBox x:Name="checkbox_VisibleForAllEmployee"  Grid.Column="2" Grid.Row="1" Margin="0 0 0 20"  Content="Für alle Sichtbar"/>
+                                    <Button Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
+                                                          Margin="3" Content="Speichern" x:Name="popupbutton_layout_speichern" Click="popupbutton_layout_speichern_Click" />
+                                    <Button Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
+                                                            Margin="3" Content="Abbrechen" x:Name="button_speichern_abbrechen" Click="popupbutton_speichern_abbrechen_Click" />
+                                </Grid>
+                            </GroupBox>
+                        </Border>
+                    </controls:PopupNonTopmost>
                     <Button Content="{markup:Translate Bericht bearbeiten}" Grid.Column="11" Margin="5,0,0,0" x:Name="ButtonLayoutEdit" Click="ButtonLayoutEdit_Click" />
                     <Button Content="{markup:Translate Bericht laden}" Grid.Column="12" Margin="5,0,0,0" x:Name="ButtonLayoutLoad" Click="ButtonLayoutLoad_Click" />
                     <Button Content="{markup:Translate Bericht drucken}" Grid.Column="13" Margin="5,0,0,0" x:Name="ButtonLayoutPrint" Click="ButtonLayoutPrint_Click" />
diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
index 545474e1d..6872bcc60 100644
--- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
+++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
@@ -259,6 +259,10 @@ namespace BeWo.View.Detail.Report
 
         private void ButtonLayoutSave_Click(object sender, RoutedEventArgs e)
         {
+            popup_save_layout.IsOpen = true;
+
+            #region Fenster (alt)
+            /*
             var control = new FlexibleReportLayoutSaveControl();
             var beWoWindow = new BeWoWindow();
 
@@ -307,6 +311,50 @@ namespace BeWo.View.Detail.Report
             beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
             beWoWindow.rootGroupBox.Header = "Bericht speichern";
             beWoWindow.ShowDialog();
+            */
+            #endregion
+        }
+        private void popupbutton_layout_speichern_Click(object sender, RoutedEventArgs e)
+        {
+            var liste = new List<FlexibleReportLayout>();
+            ServiceFacade.DoOperationsServiceAsync(
+                s => s.GetFlexibleReportLayouts(), //hier muss noch Filter angepasst werden, damit alle Layouts geliefert werden, die für alle sichtbar sind
+                r => this.Dispatch(delegate
+                {
+                    foreach (var item in r)
+                    {
+                        liste.Add(FlexibleReportLayout.InitByFlexibleReportLayoutDC(item));
+                    }
+                }));
+
+            if (string.IsNullOrWhiteSpace(textbox_layoutname.Text))
+            {
+                MessageBox.Show("Fehler beim Hinzufügen des Berichts. Der Name darf nicht leer sein.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                return;
+            }
+
+            if (liste.Any(x => x.LayoutName == textbox_layoutname.Text))
+            {
+                MessageBox.Show("Fehler beim Hinzufügen des Berichts. Der Name existiert bereits.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                return;
+            }
+
+            var layout = new FlexibleReportLayoutDC()
+            {
+                LayoutName = textbox_layoutname.Text,
+                LayoutString = LayoutString,
+                VisibleForAllEmployee = (bool)checkbox_VisibleForAllEmployee.IsChecked ? true : false
+            };
+
+            ServiceFacade.DoOperationsServiceAsync(s => s.InsertNewFlexibleReportLayout(layout));
+            MessageBox.Show("Bericht erfolgreich hinzugefügt!", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Information);
+
+            popup_save_layout.IsOpen = false;
+        }
+
+        private void popupbutton_speichern_abbrechen_Click(object sender, RoutedEventArgs e)
+        {
+            popup_save_layout.IsOpen = false;
         }
 
         private void ButtonLayoutLoad_Click(object sender, RoutedEventArgs e)
@@ -381,26 +429,25 @@ namespace BeWo.View.Detail.Report
 
             control.CancelButtonClicked += delegate
             {
-                if (!control.IsDirty) return;
+                if (!control.IsDirty)
+                {
+                    beWoWindow.Close();
+                    return;
+                }
 
-                var result = MessageBox.Show("Möchten Sie die Änderung(en) verwerfen?", "BeWoPlaner", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
+                var result = MessageBox.Show("Möchten Sie die Änderung(en) verwerfen?", "BeWoPlaner", MessageBoxButton.YesNo, MessageBoxImage.Question);
                 switch (result)
                 {
                     case MessageBoxResult.None:
                         return;
-                    case MessageBoxResult.Cancel:
-                        return;
                     case MessageBoxResult.Yes:
-                        control.Save();
                         beWoWindow.Close();
                         break;
                     case MessageBoxResult.No:
+                        control.Save();
+                        MessageBox.Show("Die Liste wurde erfolgreich aktualisiert.", "BeWoPlaner", MessageBoxButton.OK, MessageBoxImage.Asterisk);
                         beWoWindow.Close();
                         break;
-                    case MessageBoxResult.OK:
-                        return;
-                    default:
-                        return;
                 }
             };
 
@@ -956,5 +1003,7 @@ namespace BeWo.View.Detail.Report
             }
         }
         #endregion
+
+      
     }
 }
\ No newline at end of file
diff --git a/Data/Entities/FlexibleReportLayout.cs b/Data/Entities/FlexibleReportLayout.cs
index b2c379039..3edb34a21 100644
--- a/Data/Entities/FlexibleReportLayout.cs
+++ b/Data/Entities/FlexibleReportLayout.cs
@@ -10,6 +10,7 @@ namespace BeWo.Data.Entities
     public class FlexibleReportLayout : BeWoEntityBase
     {
         private long _CreatorOid;
+        private bool _VisibleForAllEmployee;
         private string _LayoutName;
         private string _LayoutString;
 
@@ -33,6 +34,21 @@ namespace BeWo.Data.Entities
             }
         }
 
+        public virtual bool VisibleForAllEmployee
+        {
+            get
+            {
+                return _VisibleForAllEmployee;
+            }
+            set
+            {
+                if (AreDifferent(_VisibleForAllEmployee, value))
+                {
+                    _VisibleForAllEmployee = value;
+                }
+            }
+        }
+
         public virtual string LayoutName
         {
             get
diff --git a/Data/Mappings/FlexibleReportLayout.hbm.xml b/Data/Mappings/FlexibleReportLayout.hbm.xml
index ebacafa96..69b89d14a 100644
--- a/Data/Mappings/FlexibleReportLayout.hbm.xml
+++ b/Data/Mappings/FlexibleReportLayout.hbm.xml
@@ -16,6 +16,7 @@
     <property column="SystemEntryID"            type="BS.Shared.SystemEntryID, BS.Shared"     name="SystemEntryID" />
     
     <property column="CreatorOid"               type="Int64"                                  name="CreatorOid" />
+    <property column="VisibleForAllEmployee"    type="bool"                                   name="VisibleForAllEmployee" />
     <property column="LayoutName"               type="String"                                 name="LayoutName" />
     <property column="LayoutString"             type="String"                                 name="LayoutString" />
   </class>
diff --git a/Report/DefaultReports/InvoiceCustomerReport.Designer.cs b/Report/DefaultReports/InvoiceCustomerReport.Designer.cs
index ca310b7a6..4923c234f 100644
--- a/Report/DefaultReports/InvoiceCustomerReport.Designer.cs
+++ b/Report/DefaultReports/InvoiceCustomerReport.Designer.cs
@@ -370,7 +370,7 @@ namespace BeWo.Report.DefaultReports
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(581.4177F, 17.00003F);
             this.xrLabel5.StylePriority.UseFont = false;
-            this.xrLabel5.Text = "[RecipientSalutation] [RecipientFirstName] [RecipientLastName],";
+            this.xrLabel5.Text = "[RecipientSalutation]";
             // 
             // xrLabel4
             // 
@@ -539,9 +539,6 @@ namespace BeWo.Report.DefaultReports
             // ruleRateFactorNull
             // 
             this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
-            // 
-            // 
-            // 
             this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.ruleRateFactorNull.Name = "ruleRateFactorNull";
             // 
@@ -619,7 +616,7 @@ namespace BeWo.Report.DefaultReports
             this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell23.BorderWidth = 2;
+            this.xrTableCell23.BorderWidth = 2F;
             this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold);
             this.xrTableCell23.Name = "xrTableCell23";
             this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
@@ -634,10 +631,12 @@ namespace BeWo.Report.DefaultReports
             // 
             // topMarginBand1
             // 
+            this.topMarginBand1.HeightF = 100F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
             // bottomMarginBand1
             // 
+            this.bottomMarginBand1.HeightF = 100F;
             this.bottomMarginBand1.Name = "bottomMarginBand1";
             // 
             // DetailReport
@@ -679,7 +678,7 @@ namespace BeWo.Report.DefaultReports
             this.PageHeight = 1169;
             this.PageWidth = 827;
             this.PaperKind = System.Drawing.Printing.PaperKind.A4;
-            this.Version = "13.1";
+            this.Version = "17.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
diff --git a/Report/DefaultReports/InvoiceCustomerReport.cs b/Report/DefaultReports/InvoiceCustomerReport.cs
index 645471f3a..50932931b 100644
--- a/Report/DefaultReports/InvoiceCustomerReport.cs
+++ b/Report/DefaultReports/InvoiceCustomerReport.cs
@@ -47,7 +47,11 @@ namespace BeWo.Report.DefaultReports
 			}
 			lblAddress.Text = sb.ToString();
 
-            this.bindingSource1.DataSource = pRO;
+			
+
+
+
+			this.bindingSource1.DataSource = pRO;
         }
     }
 }
diff --git a/Service/DCEntityMapper/FlexibleReportLayoutDC_FlexibleReportLayout.cs b/Service/DCEntityMapper/FlexibleReportLayoutDC_FlexibleReportLayout.cs
index d2607e7de..09ebb2bbf 100644
--- a/Service/DCEntityMapper/FlexibleReportLayoutDC_FlexibleReportLayout.cs
+++ b/Service/DCEntityMapper/FlexibleReportLayoutDC_FlexibleReportLayout.cs
@@ -17,6 +17,7 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.FlexibleReportSystemEntryID = pEntity.SystemEntryID;
             pDataContract.FlexibleReportUdpUser = pEntity.UdpUser;
             pDataContract.FlexibleReportVersion = pEntity.Version;
+            pDataContract.VisibleForAllEmployee = pEntity.VisibleForAllEmployee;
             pDataContract.LayoutName = pEntity.LayoutName;
             pDataContract.LayoutString = pEntity.LayoutString;
 
@@ -36,6 +37,7 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.SystemEntryID = pDataContract.FlexibleReportSystemEntryID;
             pEntity.UdpUser = pDataContract.FlexibleReportUdpUser;
             pEntity.Version = pDataContract.FlexibleReportVersion;
+            pEntity.VisibleForAllEmployee = pDataContract.VisibleForAllEmployee;
             pEntity.LayoutName = pDataContract.LayoutName;
             pEntity.LayoutString = pDataContract.LayoutString;
 
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 67bb2b251..b6d79cc87 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -257,7 +257,7 @@ namespace BeWo.Service.Plugins
                 //t = "2623845876"; // Passgenau Hildesheim
                 //t = "4368361336"; // Kompass BeWo Wesel
                 //t = "3257905806"; // Diakonisches Werk Herne 
-                t = "2535794597"; // Mobilo Ambulant
+                //t = "2535794597"; // Mobilo Ambulant
 
                 return t;
 #else
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 821200823..054d5752e 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -5523,9 +5523,11 @@ namespace BeWo.Service.ServiceImplementations
         {
             var result = new List<FlexibleReportLayoutDC>();
 
-            foreach (var item in DAOFactory.GenericDAO.GetAllActive<FlexibleReportLayout>().Where(x => x.CreatorOid == LoggedInUserOperationContextExt.Current.User.Oid.Value))
+            var alle = DAOFactory.GenericDAO.GetAllActive<FlexibleReportLayout>();
+            foreach (var item in alle)
             {
-                result.Add(MapperFactory.FlexibleReportLayoutDC_FlexibleReportLayout.MapToNewDC(item));
+                if (item.CreatorOid == LoggedInUserOperationContextExt.Current.User.Oid.Value || item.VisibleForAllEmployee)
+                    result.Add(MapperFactory.FlexibleReportLayoutDC_FlexibleReportLayout.MapToNewDC(item));
             }
 
             return result;
@@ -5550,7 +5552,13 @@ namespace BeWo.Service.ServiceImplementations
             try
             {
                 //Enity
-                var flexOriList = DAOFactory.GenericDAO.GetAllActive<FlexibleReportLayout>().Where(x => x.CreatorOid == LoggedInUserOperationContextExt.Current.User.Oid.Value);
+                var flexOriList = new List<FlexibleReportLayout>();
+                var alle = DAOFactory.GenericDAO.GetAllActive<FlexibleReportLayout>();
+                foreach (var item in alle)
+                {
+                    if (item.CreatorOid == LoggedInUserOperationContextExt.Current.User.Oid.Value || item.VisibleForAllEmployee)
+                        flexOriList.Add(item);
+                }
                 //DC
                 var flexNewList = flexibleReportLayouts;
 
diff --git a/Shared/DataContracts/FlexibleReportLayoutDC.cs b/Shared/DataContracts/FlexibleReportLayoutDC.cs
index 10daca24b..9725b57a2 100644
--- a/Shared/DataContracts/FlexibleReportLayoutDC.cs
+++ b/Shared/DataContracts/FlexibleReportLayoutDC.cs
@@ -34,7 +34,10 @@ namespace BS.Shared.DataContracts
 
         [DataMember]
         public long CreatorOid { get; set; }
-
+        
+        [DataMember]
+        public bool VisibleForAllEmployee { get; set; }
+        
         [DataMember]
         public string LayoutName { get; set; }