Skip to content

Merge remote-tracking branch 'me/25.1.3+' into 25.1.3+ #79

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 7 commits into
base: 25.1.3+
Choose a base branch
from
Open

Merge remote-tracking branch 'me/25.1.3+' into 25.1.3+ #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
324784f
TaskAttachedFile_DetailView use RichTextPropertyEditor
apobekiaris Jun 2, 2025
ecbd1d0
Disable FullText search for Customers Stores
apobekiaris Jun 5, 2025
a0c67e9
remove order listview columns
apobekiaris Jun 5, 2025
dc5497c
Replace the welcome PdfViewer with ImageViewer
apobekiaris Jun 6, 2025
edb0775
Multiple Welcome screen issue
apobekiaris Jun 6, 2025
4c063e6
remove dublicate ViewFilters
apobekiaris Jun 2, 2025
25bebb6
Merge remote-tracking branch 'me/25.1.3+' into 25.1.3+
apobekiaris Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions CS/OutlookInspired.Blazor.Server/Features/WelcomeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
using DevExpress.ExpressApp;
using OutlookInspired.Blazor.Server.Editors.PdfViewer;
using DevExpress.ExpressApp.Blazor.Editors;
using OutlookInspired.Module.BusinessObjects;

namespace OutlookInspired.Blazor.Server.Features {
public class WelcomeController : ObjectViewController<DetailView, Welcome> {
protected override void OnActivated() {
base.OnActivated();
View.CustomizeViewItemControl<PdfViewerPropertyEditor>(this, item => {
item.ComponentModel.CssClass = "welcome-pdf-viewer";
item.ComponentModel.IsSinglePagePreview = true;
View.CustomizeViewItemControl<ImagePropertyEditor>(this, item => {
item.ComponentModel.CssClass = "welcome-image-viewer";
});
}
}
Expand Down
18 changes: 15 additions & 3 deletions CS/OutlookInspired.Blazor.Server/Model.xafml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,15 +557,27 @@
<ListView Id="Quote_ListView" DataAccessMode="Client" EditorTypeName="OutlookInspired.Blazor.Server.Editors.Pivot.PivotGridListEditor" />
<ListView Id="QuoteAnalysis_ListView" EditorTypeName="OutlookInspired.Blazor.Server.Editors.Pivot.PivotGridListEditor" />
<ListView Id="QuoteMapItem_ListView" EditorTypeName="OutlookInspired.Blazor.Server.Editors.Maps.MapItemListEditor" />
<DetailView Id="TaskAttachedFile_DetailView">
<Items>
<PropertyEditor Id="Preview" PropertyEditorType="DevExpress.ExpressApp.Office.Blazor.Editors.RichTextPropertyEditor" />
</Items>
</DetailView>
<ListView Id="ViewFilter_ListView" AllowEdit="False">
<Columns>
<ColumnInfo Id="Name" AllowEdit="True" />
</Columns>
</ListView>
<DetailView Id="Welcome_DetailView">
<DetailView Id="Welcome_DetailView" AllowEdit="False" AllowDelete="False" AllowNew="False" DefaultFocusedItem="">
<Items>
<PropertyEditor Id="About" AllowEdit="False" />
</Items>
<Layout>
<LayoutGroup Id="Main" RelativeSize="3.865546218487395" />
<LayoutItem Id="Item1" Index="1" RelativeSize="96.1344537815126" IsNewNode="True" />
<LayoutGroup Id="Main" RelativeSize="100">
<LayoutGroup Id="About_Group" ShowCaption="False" Direction="Horizontal" RelativeSize="100" Caption="About">
<LayoutItem Id="About" ShowCaption="False" RelativeSize="33.333333333333336" CustomCSSClassName="welcome-image-viewer" />
<LayoutItem Id="right" Index="1" RelativeSize="66.66666666666667" IsNewNode="True" />
</LayoutGroup>
</LayoutGroup>
</Layout>
</DetailView>
</Views>
Expand Down
15 changes: 10 additions & 5 deletions CS/OutlookInspired.Blazor.Server/wwwroot/css/site.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,18 @@ app {
z-index: 100001;
}

.welcome-pdf-viewer {

.welcome-image-viewer {
width: 100%;
height: 500px;
}

.welcome-pdf-viewer .dxbrv-toolbar {
height: 2rem;
margin-top: 1.5rem;
padding-top: 1.5rem;
}
.welcome-image-viewer .img-thumbnail {
border: none !important;
box-shadow: none !important;
padding: 0 !important;
background: none !important;
}

.pe-pdf-viewer .dxbrv-toolbar {
Expand Down
7 changes: 4 additions & 3 deletions CS/OutlookInspired.Module/BusinessObjects/Welcome.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ namespace OutlookInspired.Module.BusinessObjects{
public class Welcome : NonPersistentBaseObject {
public Welcome(){
var assembly = GetType().Assembly;
About = Bytes(assembly.GetManifestResourceStream(assembly.GetManifestResourceNames().First(s => s.EndsWith("Welcome.pdf"))));
About = Bytes(assembly.GetManifestResourceStream(assembly.GetManifestResourceNames().First(s => s.EndsWith("Welcome.png"))));
Oid=Guid.Parse("8B8DF685-AD96-4BE9-A08A-8DD8C2A9F4C2");
}

byte[] Bytes( Stream stream){
Expand All @@ -22,8 +23,8 @@ byte[] Bytes( Stream stream){
return ms.ToArray();
}


[EditorAlias(EditorAliases.PdfViewerEditor)]
[EditorAlias(DevExpress.ExpressApp.Editors.EditorAliases.ImagePropertyEditor)]
public byte[] About{ get; set; }
}
}
26 changes: 18 additions & 8 deletions CS/OutlookInspired.Module/Model.DesignedDiffs.xafml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@
<ColumnInfo Id="AnnualSales" Index="8" />
<ColumnInfo Id="Crest" Index="9" />
</Columns>
<HiddenActions>
<ActionLink ActionId="FullTextSearch" IsNewNode="True" />
</HiddenActions>
</ListView>
<DetailView Id="Customer_DetailView" CustomizationFormEnabled="True">
<Layout>
Expand Down Expand Up @@ -728,6 +731,9 @@
<SplitLayout SplitterPosition="600" RelativePosition="70" />
</ListView>
<ListView Id="EmployeeTask_AttachedFiles_ListView" MasterDetailMode="ListViewAndDetailView">
<Columns>
<ColumnInfo Id="Preview" Index="-1" />
</Columns>
<SplitLayout RelativePosition="30" />
</ListView>
<DetailView Id="EmployeeTask_DetailView" FreezeLayout="True">
Expand Down Expand Up @@ -835,7 +841,7 @@
<LayoutItem Id="ShippingAmount" ViewItem="ShippingAmount" Index="5" RelativeSize="3.3653846153846154" CaptionLocation="Left" IsNewNode="True" />
<LayoutItem Id="TotalAmount" ViewItem="TotalAmount" Index="6" RelativeSize="3.3653846153846154" CaptionLocation="Left" IsNewNode="True" />
<LayoutItem Id="Tax" ViewItem="Tax" Index="7" RelativeSize="3.3653846153846154" CaptionLocation="Left" IsNewNode="True" />
<LayoutItem Id="ShipDate" ViewItem="ShipDate" Index="8" RelativeSize="3.3653846153846154" CaptionLocation="Left" IsNewNode="True" />
<LayoutItem Id="ShipDate" ViewItem="ShipDate" Index="8" RelativeSize="3.3653846153846154" CaptionLocation="Left" IsNewNode="True" />
<LayoutItem Id="ShipMethod" ViewItem="ShipMethod" Index="9" RelativeSize="72.43589743589743" CaptionLocation="Left" IsNewNode="True" />
</LayoutGroup>
<LayoutGroup Id="Order_col2" ShowCaption="False" Index="1" RelativeSize="50.11135857461024" IsNewNode="True">
Expand Down Expand Up @@ -992,6 +998,16 @@
</Variants>
</ListView>
<ListView Id="Order_ListView_Detail" DataAccessMode="ServerView" MasterDetailMode="ListViewAndDetailView" MasterDetailView="Order_DetailView_Child">
<Columns>
<ColumnInfo Id="ActualWeight" Index="-1" />
<ColumnInfo Id="Customer" Index="-1" />
<ColumnInfo Id="Employee" Index="-1" />
<ColumnInfo Id="Location" Index="-1" />
<ColumnInfo Id="ShipDate" Index="-1" />
<ColumnInfo Id="ShipmentCourier" Index="-1" />
<ColumnInfo Id="Store" Index="-1" />
<ColumnInfo Id="InvoiceNumber" Width="98" />
</Columns>
<SplitLayout SplitterPosition="0" RelativePosition="70" />
</ListView>
<DetailView Id="OrderItem_DetailView">
Expand Down Expand Up @@ -1320,14 +1336,8 @@
<DetailView Id="Welcome_DetailView">
<HiddenActions>
<ActionLink ActionId="FullTextSearch" IsNewNode="True" />
<ActionLink ActionId="Refresh" IsNewNode="True" />
</HiddenActions>
<Layout>
<LayoutGroup Id="Main" RelativeSize="100">
<LayoutGroup Id="About_Group" ShowCaption="False" Direction="Vertical" RelativeSize="100">
<LayoutItem Id="About" RelativeSize="100" CaptionLocation="Top" ShowCaption="False" />
</LayoutGroup>
</LayoutGroup>
</Layout>
</DetailView>
</Views>
</Application>
4 changes: 3 additions & 1 deletion CS/OutlookInspired.Module/Module.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ public override void AddGeneratorUpdaters(ModelNodesGeneratorUpdaters updaters)

private void nonPersistentObjectSpace_ObjectByKeyGetting(object sender, ObjectByKeyGettingEventArgs e) {
if (e.ObjectType!=typeof(Welcome)) return;
e.Object = ((IObjectSpace)sender).CreateObject<Welcome>();
var objectSpace = ((IObjectSpace)sender);
e.Object = objectSpace.CreateObject<Welcome>();
objectSpace.CommitChanges();
}
}

2 changes: 2 additions & 0 deletions CS/OutlookInspired.Module/OutlookInspired.Module.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@
<None Remove="Images\Welcome.png" />
<None Remove="Resources\Welcome.pdf" />
<EmbeddedResource Include="Resources\Welcome.pdf" />
<None Remove="Resources\Welcome.png" />
<EmbeddedResource Include="Resources\Welcome.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.Document.Processor" />
Expand Down
Binary file added CS/OutlookInspired.Module/Resources/Welcome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions CS/OutlookInspired.Win/Model.xafml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,5 +362,17 @@
<ListView Id="QuoteMapItem_ListView" EditorTypeName="OutlookInspired.Win.Editors.Maps.MapItemListEditor">
<ChartSettings Settings="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&#xD;&#xA;&lt;ChartXmlSerializer version=&quot;23.1.5.0&quot;&gt;&#xD;&#xA; &lt;Chart AppearanceNameSerializable=&quot;Default&quot; SelectionMode=&quot;None&quot; SeriesSelectionMode=&quot;Series&quot;&gt;&#xD;&#xA; &lt;DataContainer BoundSeriesSorting=&quot;None&quot; ValidateDataMembers=&quot;true&quot;&gt;&#xD;&#xA; &lt;SeriesSerializable&gt;&#xD;&#xA; &lt;Item1 Name=&quot;Series 1&quot; SeriesID=&quot;0&quot; ArgumentDataMember=&quot;Name&quot; ValueDataMembersSerializable=&quot;Value&quot; LegendTextPattern=&quot;{A}&quot;&gt;&#xD;&#xA; &lt;View ColorEach=&quot;true&quot; AlignToCenter=&quot;true&quot; PointShape=&quot;Trapezoid&quot; TypeNameSerializable=&quot;FunnelSeriesView&quot; /&gt;&#xD;&#xA; &lt;Label Position=&quot;Center&quot; TypeNameSerializable=&quot;FunnelSeriesLabel&quot; LineVisibility=&quot;True&quot; /&gt;&#xD;&#xA; &lt;/Item1&gt;&#xD;&#xA; &lt;/SeriesSerializable&gt;&#xD;&#xA; &lt;SeriesTemplate /&gt;&#xD;&#xA; &lt;/DataContainer&gt;&#xD;&#xA; &lt;Legend CrosshairContentOffset=&quot;4&quot; MaxCrosshairContentWidth=&quot;50&quot; MaxCrosshairContentHeight=&quot;0&quot; LegendID=&quot;-1&quot; Visibility=&quot;True&quot; AlignmentHorizontal=&quot;Center&quot; AlignmentVertical=&quot;BottomOutside&quot; Direction=&quot;LeftToRight&quot; MarkerSize=&quot;@2,Width=20@2,Height=20&quot; EnableAntialiasing=&quot;True&quot;&gt;&#xD;&#xA; &lt;Padding Left=&quot;0&quot; Top=&quot;40&quot; Right=&quot;0&quot; Bottom=&quot;0&quot; /&gt;&#xD;&#xA; &lt;Margins Left=&quot;0&quot; Top=&quot;0&quot; Right=&quot;0&quot; Bottom=&quot;0&quot; /&gt;&#xD;&#xA; &lt;Border Visibility=&quot;False&quot; /&gt;&#xD;&#xA; &lt;/Legend&gt;&#xD;&#xA; &lt;/Chart&gt;&#xD;&#xA;&lt;/ChartXmlSerializer&gt;" />
</ListView>
<DetailView Id="Welcome_DetailView">
<Items>
<PropertyEditor Id="About" ImageSizeMode="Normal" />
</Items>
<Layout>
<LayoutGroup Id="Main" RelativeSize="100">
<LayoutGroup Id="About_Group" TextAlignMode="AlignWithChildren" Direction="Vertical" RelativeSize="100" ShowCaption="False">
<LayoutItem Id="About" ShowCaption="False" RelativeSize="100" />
</LayoutGroup>
</LayoutGroup>
</Layout>
</DetailView>
</Views>
</Application>
Binary file modified Data/OutlookInspired.zip
View file
Open in desktop
Binary file not shown.