Skip to content

Commit 7fd6850

Browse files
authored
Merge pull request #77 from vladimirlashko/ProgressBarPropertyEditor
New ProgressBarPropertyEditor integrated
2 parents f494441 + 67d82a8 commit 7fd6850

File tree

10 files changed

+6
-106
lines changed

10 files changed

+6
-106
lines changed

CS/OutlookInspired.Blazor.Server/Editors/ProgressBar/ProgressBar.razor

Lines changed: 0 additions & 7 deletions
This file was deleted.

CS/OutlookInspired.Blazor.Server/Editors/ProgressBar/ProgressBar.razor.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

CS/OutlookInspired.Blazor.Server/Editors/ProgressBar/ProgressBar.razor.css

Lines changed: 0 additions & 14 deletions
This file was deleted.

CS/OutlookInspired.Blazor.Server/Editors/ProgressBar/ProgressBarPropertyEditor.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

CS/OutlookInspired.Module/BusinessObjects/EmployeeTask.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public virtual string DescriptionText{
4141
public virtual EmployeeTaskPriority Priority { get; set; }
4242

4343
[HideInUI(HideInUI.DetailView)][XafDisplayName(nameof(Priority))]
44-
public byte[] PriorityImage => ImageLoader.Instance.GetEnumValueImageInfo(Priority).ImageBytes;
45-
46-
[EditorAlias(EditorAliases.ProgressEditor)]
44+
public byte[] PriorityImage => ImageLoader.Instance.GetEnumValueImageInfo(Priority).ImageBytes;
45+
46+
[EditorAlias(DevExpress.ExpressApp.Editors.EditorAliases.ProgressBarPropertyEditor)]
4747
public virtual int Completion { get; set; }
4848
public virtual bool Reminder { get; set; }
4949
public virtual DateTime? ReminderDateTime { get; set; }

CS/OutlookInspired.Module/BusinessObjects/Quote.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public class Quote :OutlookInspiredBaseObject, IViewFilter,IMapsMarker{
3030
public virtual decimal ShippingAmount { get; set; }
3131
[Column(TypeName = CurrencyType)]
3232
public virtual decimal Total { get; set; }
33-
[EditorAlias(EditorAliases.ProgressEditor)]
34-
33+
[EditorAlias(DevExpress.ExpressApp.Editors.EditorAliases.ProgressBarPropertyEditor)]
34+
3535
public virtual double Opportunity { get; set; }
3636
[DevExpress.ExpressApp.DC.Aggregated]
3737
public virtual ObservableCollection<QuoteItem> QuoteItems{ get; set; } = new();

CS/OutlookInspired.Module/EditorAliases.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ public struct EditorAliases {
66
public const string PdfViewerEditor = "PdfViewerEditor";
77
public const string LabelPropertyEditor = "LabelPropertyEditor";
88
public const string HyperLinkPropertyEditor = "HyperLinkPropertyEditor";
9-
public const string ProgressEditor = "ProgressEditor";
109
public const string DxHtmlPropertyEditor = "DxHtmlPropertyEditor";
1110
public const string MapHomeOfficePropertyEditor = "MapHomeOfficePropertyEditor";
1211
}

CS/OutlookInspired.Win/Editors/ProgressEditor/ProgressPropertyEditor.cs

Lines changed: 0 additions & 38 deletions
This file was deleted.

CS/OutlookInspired.Win/Editors/ProgressEditor/PropertyEditorController.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ protected override void OnViewControlsCreated(){
5757
if (!repositoryItems.TryGetValue(e.DataField, out var item)) return;
5858
e.RepositoryItem = item;
5959
};
60-
pivotGridControl.CustomCellValue += (_, e) => {
61-
if (!repositoryItems.TryGetValue(e.DataField, out var item) || item is not IValueCalculator valueCalculator) return;
62-
e.Value = valueCalculator.Calculate(e.Value);
63-
};
6460
pivotGridControl.CustomDrawCell += (_, e) => {
6561
if (!repositoryItems.TryGetValue(e.DataField, out var item)) return;
6662
e.Appearance = item.Appearance;

CS/OutlookInspired.Win/Model.xafml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
<ListView Id="QuoteAnalysis_ListView" EditorTypeName="DevExpress.ExpressApp.PivotGrid.Win.PivotGridListEditor" DataAccessMode="Client">
356356
<Columns>
357357
<ColumnInfo Id="Total" Width="100" />
358-
<ColumnInfo Id="Opportunity" Width="250" PropertyEditorType="OutlookInspired.Win.Editors.ProgressEditor.ProgressPropertyEditor" />
358+
<ColumnInfo Id="Opportunity" Width="250" PropertyEditorType="DevExpress.ExpressApp.Win.Editors.ProgressBarPropertyEditor" />
359359
</Columns>
360360
<PivotSettings AddNewColumns="False" ShowColumnGrandTotals="True" ShowColumnTotals="True" ShowRowGrandTotals="True" ShowRowTotals="True" Settings="&lt;XtraSerializer version=&quot;1.0&quot; application=&quot;PivotGrid&quot;&gt;&#xD;&#xA; &lt;property name=&quot;#LayoutVersion&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;#LayoutScaleFactor&quot;&gt;@1,Width=1@1,Height=1&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FixedColumnFieldValues&quot; iskey=&quot;true&quot; value=&quot;0&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;Fields&quot; iskey=&quot;true&quot; value=&quot;4&quot;&gt;&#xD;&#xA; &lt;property name=&quot;Item1&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;Options&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;AllowRunTimeSummaryChange&quot;&gt;true&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ImageIndex&quot;&gt;-1&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ToolTips&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;HeaderText&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;ValueText&quot; /&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FieldEditName&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;Name&quot;&gt;Field_Opportunity&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Area&quot;&gt;DataArea&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FieldName&quot;&gt;Opportunity&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Caption&quot;&gt;PERCENTAGE&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;SummaryType&quot;&gt;Average&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;CellFormat&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;FormatString&quot;&gt;{0:#,###,##0.##############################}&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FormatType&quot;&gt;Custom&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;GrandTotalCellFormat&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;FormatString&quot;&gt;{0:#,###,##0.##############################}&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FormatType&quot;&gt;Custom&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ValueFormat&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;FormatString&quot;&gt;{0:#,###,##0.##############################}&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FormatType&quot;&gt;Custom&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Index&quot;&gt;0&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;AreaIndex&quot;&gt;1&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;SortOrder&quot;&gt;Descending&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;MinWidth&quot;&gt;20&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Width&quot;&gt;127&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Item2&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;Options&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;AllowRunTimeSummaryChange&quot;&gt;true&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ImageIndex&quot;&gt;-1&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ToolTips&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;HeaderText&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;ValueText&quot; /&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FieldEditName&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;Name&quot;&gt;Field_City&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Area&quot;&gt;RowArea&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FieldName&quot;&gt;City&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;SummaryType&quot;&gt;Count&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;GrandTotalCellFormat&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;FormatString&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;FormatType&quot;&gt;Custom&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ValueFormat&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;FormatString&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;FormatType&quot;&gt;Custom&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Index&quot;&gt;1&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;AreaIndex&quot;&gt;1&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;MinWidth&quot;&gt;20&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Width&quot;&gt;100&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Item3&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;ImageIndex&quot;&gt;-1&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ToolTips&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;HeaderText&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;ValueText&quot; /&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FieldEditName&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;Name&quot;&gt;Field_1_&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Area&quot;&gt;RowArea&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FieldName&quot;&gt;State&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Caption&quot;&gt;State&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;SummaryType&quot;&gt;Count&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Index&quot;&gt;2&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;AreaIndex&quot;&gt;0&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;MinWidth&quot;&gt;20&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Width&quot;&gt;100&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Item4&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;Options&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;AllowRunTimeSummaryChange&quot;&gt;true&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ImageIndex&quot;&gt;-1&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ToolTips&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;HeaderText&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;ValueText&quot; /&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FieldEditName&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;Name&quot;&gt;Field_Total&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Area&quot;&gt;DataArea&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FieldName&quot;&gt;Total&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Caption&quot;&gt;Opportunities&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;CellFormat&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;FormatString&quot;&gt;{0:C}&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FormatType&quot;&gt;Custom&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;GrandTotalCellFormat&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;FormatString&quot;&gt;{0:C}&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FormatType&quot;&gt;Custom&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ValueFormat&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;FormatString&quot;&gt;{0:C}&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FormatType&quot;&gt;Custom&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Index&quot;&gt;3&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;AreaIndex&quot;&gt;0&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;MinWidth&quot;&gt;20&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Width&quot;&gt;148&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Prefilter&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;ShowOperandTypeIcon&quot;&gt;false&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Enabled&quot;&gt;false&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;CriteriaString&quot; /&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ActiveFilter&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;Enabled&quot;&gt;false&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;OptionsCustomization&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;CustomizationFormStyle&quot;&gt;Excel2007&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;OptionsChartDataSource&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;ProvideColumnGrandTotals&quot;&gt;true&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ProvideRowGrandTotals&quot;&gt;true&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ProvideColumnTotals&quot;&gt;true&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;ProvideRowTotals&quot;&gt;true&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;DataProvideMode&quot;&gt;UseCustomSettings&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;OptionsFilter&quot; isnull=&quot;true&quot; iskey=&quot;true&quot;&gt;&#xD;&#xA; &lt;property name=&quot;DefaultFilterEditorView&quot;&gt;VisualAndText&lt;/property&gt;&#xD;&#xA; &lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;FixedLineWidth&quot;&gt;2&lt;/property&gt;&#xD;&#xA; &lt;property name=&quot;Groups&quot; iskey=&quot;true&quot; value=&quot;0&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;FormatRules&quot; iskey=&quot;true&quot; value=&quot;0&quot; /&gt;&#xD;&#xA; &lt;property name=&quot;FormatConditions&quot; iskey=&quot;true&quot; value=&quot;0&quot; /&gt;&#xD;&#xA;&lt;/XtraSerializer&gt;" />
361361
</ListView>

0 commit comments

Comments
 (0)