개정판 fddb48f7
issue #1034 Save, Consolidate 시 User Information List Grouping Sorting
Change-Id: Ifed4d428b07aa3b5020a4fcb785cb2809990db38
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 5 | 5 |
<ProjectView>ProjectFiles</ProjectView> |
| 6 | 6 |
</PropertyGroup> |
| 7 | 7 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> |
| 8 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
|
|
| 8 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIiwiTW9kZSI6MH0=</StartArguments>
|
|
| 9 | 9 |
</PropertyGroup> |
| 10 | 10 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
| 11 | 11 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQwIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJIMjAxMTM1NyIsIk1vZGUiOjB9</StartArguments> |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 16 | 16 |
using System.Windows.Controls; |
| 17 | 17 |
using Telerik.Windows.Controls; |
| 18 | 18 |
using MarkupToPDF.Controls.Parsing; |
| 19 |
using Telerik.Windows.Data; |
|
| 19 | 20 |
|
| 20 | 21 |
namespace KCOM.Views |
| 21 | 22 |
{
|
| ... | ... | |
| 375 | 376 |
|
| 376 | 377 |
var select_item = ViewerDataModel.Instance._markupInfoList.Where(info => info.UserID == App.ViewInfo.UserID).OrderByDescending(order => order.Consolidate == Convert.ToInt32(true)).FirstOrDefault(); |
| 377 | 378 |
this.gridViewMarkup.SelectedItem = select_item; |
| 379 |
|
|
| 380 |
gridViewMarkup.GroupDescriptors.Clear(); |
|
| 381 |
GroupDescriptor descriptor = new GroupDescriptor(); |
|
| 382 |
descriptor.Member = "Depatment"; |
|
| 383 |
descriptor.DisplayContent = "DEPT"; |
|
| 384 |
descriptor.SortDirection = ListSortDirection.Ascending; |
|
| 385 |
gridViewMarkup.GroupDescriptors.Add(descriptor); |
|
| 378 | 386 |
} |
| 379 | 387 |
} |
| 380 | 388 |
|
| KCOM/Views/MainMenu.xaml | ||
|---|---|---|
| 672 | 672 |
CanUserDeleteRows="True" CanUserInsertRows="False" IsFilteringAllowed="False" RowIndicatorVisibility="Collapsed" |
| 673 | 673 |
CanUserSortColumns ="True" > |
| 674 | 674 |
<telerik:RadGridView.GroupDescriptors> |
| 675 |
<telerik:GroupDescriptor Member="Depatment" SortDirection="Ascending" DisplayContent = "DEPT"> |
|
| 675 |
<telerik:GroupDescriptor Member="Depatment" SortDirection="Ascending" DisplayContent = "DEPT" x:Name="gDept">
|
|
| 676 | 676 |
<telerik:GroupDescriptor.AggregateFunctions> |
| 677 | 677 |
<telerik:CountFunction Caption="Entries count : " /> |
| 678 | 678 |
</telerik:GroupDescriptor.AggregateFunctions> |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 39 | 39 |
using System.Windows.Media.Effects; |
| 40 | 40 |
using MarkupToPDF.Controls.Cad; |
| 41 | 41 |
using MarkupToPDF.Controls.Parsing; |
| 42 |
using Telerik.Windows.Data; |
|
| 43 |
using System.ComponentModel; |
|
| 42 | 44 |
|
| 43 | 45 |
namespace KCOM.Views |
| 44 | 46 |
{
|
| ... | ... | |
| 482 | 484 |
gridViewMarkup.ItemsSource = null; |
| 483 | 485 |
gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList; |
| 484 | 486 |
gridViewMarkup.SelectedItem = PreviewUserMarkupInfoItem; |
| 487 |
|
|
| 488 |
GroupDescriptor descriptor = new GroupDescriptor(); |
|
| 489 |
descriptor.Member = "Depatment"; |
|
| 490 |
descriptor.DisplayContent = "DEPT"; |
|
| 491 |
descriptor.SortDirection = ListSortDirection.Ascending; |
|
| 492 |
gridViewMarkup.GroupDescriptors.Add(descriptor); |
|
| 485 | 493 |
} |
| 486 | 494 |
} |
| 487 | 495 |
} |
내보내기 Unified diff
