프로젝트

일반

사용자정보

개정판 e78f0871

IDe78f08716fed8308ad906fc8d77c6b8e3230ebf7
상위 0cd6d4c9
하위 c9f98e3b

alzkakdixm 이(가) 약 5년 전에 추가함

DataBaseItemsModel 기능 추가

Change-Id: Ifffa6189b54cd183d981a569340628f5bb8a41a2

차이점 보기:

ConvertService/ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs
122 122
                        TotalPage = item.TOTAL_PAGE,
123 123
                        CurrentPageNo = item.CURRENT_PAGE,
124 124
                        Exception = item.EXCEPTION,
125
                        ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID),
125 126

  
126 127
                        Revision = item.REVISION,
127 128
                        DocumnetNo = item.DOCUMENT_NO,
......
129 130
                        GroupNo = item.GROUP_NO,
130 131
                        DocumentID = item.DOCUMENT_ID,
131 132

  
132
                        MarkusLink = Markus.Service.DataBase.Extensions.MarkusAPI.CreateMarkusParam(item.PROJECT_NO, item.DOCUMENT_ID, "doftech")
133
                        MarkusLink = "kcom://" + Markus.Service.DataBase.Extensions.MarkusAPI.CreateMarkusParam(item.PROJECT_NO, item.DOCUMENT_ID, "doftech")
133 134
                    };
134 135
                    convertItems.Add(convertitem);
135 136
                }
......
199 200
                            DocumnetName = item.DOCUMENT_NAME,
200 201
                            GroupNo = item.GROUP_NO,
201 202

  
202
                            MarkusLink = MarkusAPI.CreateMarkusParam(item.PROJECT_NO, item.DOCUMENT_ID, "doftech")
203
                            MarkusLink = "kcom://" + MarkusAPI.CreateMarkusParam(item.PROJECT_NO, item.DOCUMENT_ID, "doftech")
203 204
                        };
204 205

  
205 206
                        StatusKeep.Add(convertitem);
......
273 274
                        DocumnetName = item.DOCUMENT_NAME,
274 275
                        GroupNo = item.GROUP_NO,
275 276

  
276
                        MarkusLink = Markus.Service.DataBase.Extensions.MarkusAPI.CreateMarkusParam(item.PROJECT_NO, item.DOCUMENT_ID, "doftech")
277
                        MarkusLink = "kcom://" + Markus.Service.DataBase.Extensions.MarkusAPI.CreateMarkusParam(item.PROJECT_NO, item.DOCUMENT_ID, "doftech")
277 278
                    };
278 279
                    StatusKeep.Add(convertitem);
279 280
                }
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj
94 94
      <HintPath>..\packages\Expression.Blend.Sdk.WPF.1.0.1\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
95 95
    </Reference>
96 96
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
97
      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
97
      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
98 98
    </Reference>
99 99
    <Reference Include="System" />
100 100
    <Reference Include="System.ComponentModel.DataAnnotations" />
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs
17 17
using ConvertItem = Markus.Service.Interface.ConvertItem;
18 18
using System.Net;
19 19
using System.Windows.Threading;
20
using System.Diagnostics;
21
using System.Windows.Input;
22
using Markus.Mvvm.ToolKit;
20 23

  
21 24
namespace Markus.Service.StationController.ViewModel
22 25
{
......
34 37
            ConvertCommand = new DelegateCommand(DataConvert);
35 38
            DeleteCommand = new DelegateCommand(DataDelete);
36 39
            ValidateCommand = new DelegateCommand(DataValidate);
40
            MarkusLinkCommand = new DelegateCommand(MarkusLink);
37 41
        }
38 42

  
39 43
        #endregion
......
202 206
        public DelegateCommand DeleteCommand { get; private set; }
203 207
        public DelegateCommand ValidateCommand { get; private set; }
204 208
        public DelegateCommand DataSaveFileGemBoxCommand { get; private set; }
205

  
209
        public DelegateCommand MarkusLinkCommand { get; private set; }
206 210
        #endregion
207 211

  
208 212
        #region Main Logic
......
634 638

  
635 639
        #endregion
636 640

  
641
        #region MarkusLink
642

  
643
        private void MarkusLink(object obj)///여기서 부터 
644
        {
645
            if (obj is ConvertItem)
646
            {
647
                if (obj != null)
648
                {
649
                    var convertitem = obj as ConvertItem;
650

  
651
                    SelectFilterConvert = convertitem;
652

  
653
                    SelectRealConvert = convertitem;
654

  
655
                    ProcessStartInfo startInfo = null;
656

  
657
                    startInfo = new ProcessStartInfo("iexplore.exe", convertitem.MarkusLink);
658

  
659
                    Process.Start(startInfo);
660
                }
661
            }
662
        }
663

  
664
        #endregion
665

  
637 666
        #region Data Delete
638 667

  
639 668
        private void DataDelete(object obj)
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml
9 9
             xmlns:Data="clr-namespace:Markus.Service.StationController.Data"
10 10
             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
11 11
             xmlns:local="clr-namespace:Markus.Service.StationController.Views" x:Class="Markus.Service.StationController.Views.DataBaseView"
12
             mc:Ignorable="d"  Background="White"
12
             mc:Ignorable="d"  Background="White" DataContext="{DynamicResource DataBaseItemsModel}"
13 13
        d:DesignHeight="450" d:DesignWidth="800">
14

  
15 14
    <UserControl.Resources>
16 15
        <Style TargetType="{x:Type telerik:GridViewHeaderCell}">
17 16
            <Setter Property="HorizontalContentAlignment" Value="Center"/>
18 17
            <Setter Property="Background" Value="Gray"/>
19 18
        </Style>
19
        <Style TargetType="{x:Type telerik:GridViewCell}">
20
            <Setter Property="HorizontalContentAlignment" Value="Center"/>
21
        </Style>
22
        <Style TargetType="{x:Type controls:RowIndexColumn}">
23
            <Setter Property="TextAlignment" Value="Center"/>
24
        </Style>
25
        <VM:DataBaseItemsModel x:Key="DataBaseItemsModel"/>
20 26
    </UserControl.Resources>
21

  
22
    <UserControl.DataContext>
27
    <!--<UserControl.DataContext>
23 28
        <VM:DataBaseItemsModel/>
24
    </UserControl.DataContext>
29
    </UserControl.DataContext>-->
25 30

  
26 31
    <i:Interaction.Triggers>
27 32
        <i:EventTrigger  EventName="Loaded">
......
47 52
            <!--SelectedIndex 디폴트 값 ItemsSource콤보박스에 넣을 값 중 DisplayMemberPath 키와 값중 화면에 보여질거 선택 SelectedValuePath 콤보박스 아이템 선택하면 SelectedItem에 DisplayMember이 값나감-->
48 53
            <!--SelectedItem : object값 리턴-->
49 54
            <TextBlock Text="Status Type : " Margin="10,0,0,0"  VerticalAlignment="Center"/>
50
            <telerik:RadComboBox Width="100" SelectedItem="{Binding SelectedStatus, Mode=TwoWay}"
55
            <telerik:RadComboBox Width="100" SelectedItem="{Binding SelectedStatus, Mode=TwoWay}" SelectedIndex="4"
51 56
               DisplayMemberPath="DisplayName" SelectedValuePath="Value" ItemsSource="{Binding StatusCodeList}" Height="20"/>
52 57
            <telerik:RadToggleButton Content="  엑셀 저장  " Margin="10,0" Height="20" Command="{Binding DataSaveFileGemBoxCommand, Mode=OneWay}"/>
53 58
        </StackPanel>
......
71 76
                <telerik:RadGridView.Columns>
72 77
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
73 78
                    <telerik:GridViewDataColumn Header="Convert ID "
74
											DataMemberBinding="{Binding ConvertID}" MinWidth="180" MaxWidth="200" />
75
                    <telerik:GridViewDataColumn Header="MarkusLink "
76
											DataMemberBinding="{Binding MarkusLink}" MinWidth="180" MaxWidth="200" />
79
											DataMemberBinding="{Binding ConvertID}" MinWidth="180"  />
80
                    <telerik:GridViewDataColumn x:Name="commend" Header="MarkusLink " MinWidth="100">
81
                        <telerik:GridViewDataColumn.CellTemplate>
82
                            <DataTemplate>
83
                                <telerik:RadButton Content="Click " Command="{Binding MarkusLinkCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/>
84
                            </DataTemplate>
85
                        </telerik:GridViewDataColumn.CellTemplate>
86
                    </telerik:GridViewDataColumn>
77 87
                    <telerik:GridViewDataColumn Header="ProjectNO" 
78
											DataMemberBinding="{Binding ProjectNumber}" MinWidth="50" MaxWidth="70"/>
88
											DataMemberBinding="{Binding ProjectNumber}" MinWidth="50" />
79 89

  
80 90
                    <telerik:GridViewDataColumn Header="ConvertState"
81
											DataMemberBinding="{Binding ConvertState, Mode=TwoWay}" MinWidth="60" MaxWidth="80" />
91
											DataMemberBinding="{Binding ConvertState, Mode=TwoWay}" MinWidth="60" />
82 92

  
83 93
                    <telerik:GridViewDataColumn Header="CurrentPageNo"
84
											DataMemberBinding="{Binding CurrentPageNo, Mode=TwoWay}" MinWidth="80" MaxWidth="100"/>
94
											DataMemberBinding="{Binding CurrentPageNo, Mode=TwoWay}" MinWidth="80" />
85 95
                    <telerik:GridViewDataColumn Header="TotalPage"
86
											DataMemberBinding="{Binding TotalPage, Mode=TwoWay}" MinWidth="60" MaxWidth="80" />
96
											DataMemberBinding="{Binding TotalPage, Mode=TwoWay}" MinWidth="60"  />
87 97
                    <!--<telerik:GridViewDataColumn Header=" OriginfilePath"
88 98
											DataMemberBinding="{Binding  OriginfilePath}" MinWidth="170"/>-->
89 99
                    <telerik:GridViewDynamicHyperlinkColumn Header="원본파일"
......
98 108
                    </telerik:GridViewDynamicHyperlinkColumn>
99 109

  
100 110
                    <telerik:GridViewDataColumn Header=" ConvertPath"
101
											DataMemberBinding="{Binding ConvertPath}" MinWidth="70" MaxWidth="90"/>
111
											DataMemberBinding="{Binding ConvertPath}" MinWidth="70" />
102 112
                    <telerik:GridViewDataColumn Header="CreateTime" 
103
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" MinWidth="120" MaxWidth="140"/>
113
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" MinWidth="120" />
104 114
                    <telerik:GridViewDataColumn Header="Exception"
105 115
											DataMemberBinding="{Binding Exception}"/>
106 116
                    <telerik:GridViewDataColumn Header="ProcessorAffinity"
107
											DataMemberBinding="{Binding ProcessorAffinity}" MinWidth="90" MaxWidth="110"/>
117
											DataMemberBinding="{Binding ProcessorAffinity}" MinWidth="90" />
108 118
                    <telerik:GridViewDataColumn Header="ReConverter"
109
											DataMemberBinding="{Binding ReConverter, Mode=TwoWay}" MinWidth="70" MaxWidth="90"/>
119
											DataMemberBinding="{Binding ReConverter, Mode=TwoWay}" MinWidth="70" />
110 120
                    <telerik:GridViewDataColumn Header="UniqueKey"
111
											DataMemberBinding="{Binding UniqueKey}" MinWidth="60" MaxWidth="80"/>
121
											DataMemberBinding="{Binding UniqueKey}" MinWidth="60" />
112 122

  
113 123
                    <telerik:GridViewDataColumn Header="REVISION"
114 124
											DataMemberBinding="{Binding Revision}"/>
......
121 131
                    <telerik:GridViewDataColumn Header="Validation"
122 132
											DataMemberBinding="{Binding Validation}"/>
123 133
                    <telerik:GridViewDataColumn Header="Service ID"
124
											DataMemberBinding="{Binding ServiceID}"  MinWidth="250" MaxWidth="270"/>
134
											DataMemberBinding="{Binding ServiceID}"  MinWidth="250" />
125 135
                </telerik:RadGridView.Columns>
126 136
            </telerik:RadGridView>
127 137
        </GroupBox>
......
129 139
        <GroupBox Grid.Row="2"
130 140
                  Header="Status 4 under Items"  BorderThickness="0" 
131 141
                  ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
132
            <telerik:RadGridView GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
142
            <telerik:RadGridView Name="dataGrid2" GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
133 143
							 ItemsSource="{Binding RealConvertSource}"
134 144
                             SelectedItem="{Binding SelectRealConvert, Mode=TwoWay}"
135 145
							 AutoGenerateColumns="False" CanUserFreezeColumns="False"
......
146 156
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
147 157

  
148 158
                    <telerik:GridViewDataColumn Header="Convert ID "
149
											DataMemberBinding="{Binding ConvertID}" MinWidth="180" MaxWidth="200" />
150
                    <telerik:GridViewDataColumn Header="MarkusLink "
151
											DataMemberBinding="{Binding MarkusLink}" MinWidth="180" MaxWidth="200" />
159
											DataMemberBinding="{Binding ConvertID}" MinWidth="180"  />
160
                    
161
                    <telerik:GridViewDataColumn Header="MarkusLink " MinWidth="100">
162
                        <telerik:GridViewDataColumn.CellTemplate>
163
                            <DataTemplate>
164
                                <!--<telerik:RadButton Content="Click " Command="{Binding MarkusLinkCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding ElementName=dataGrid2, Path=SelectedItems}"/>-->
165
                                <telerik:RadButton Content="Click " Command="{Binding MarkusLinkCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/>
166
                            </DataTemplate>
167
                        </telerik:GridViewDataColumn.CellTemplate>
168
                    </telerik:GridViewDataColumn>
169

  
152 170
                    <telerik:GridViewDataColumn Header="ProjectNO" 
153
											DataMemberBinding="{Binding ProjectNumber}" MinWidth="50" MaxWidth="70"/>
171
											DataMemberBinding="{Binding ProjectNumber}" MinWidth="50" />
154 172

  
155 173
                    <telerik:GridViewDataColumn Header="ConvertState"
156
											DataMemberBinding="{Binding ConvertState, Mode=TwoWay}" MinWidth="60" MaxWidth="80" />
174
											DataMemberBinding="{Binding ConvertState, Mode=TwoWay}" MinWidth="60" />
157 175

  
158 176
                    <telerik:GridViewDataColumn Header="CurrentPageNo"
159
											DataMemberBinding="{Binding CurrentPageNo, Mode=TwoWay}" MinWidth="80" MaxWidth="100"/>
177
											DataMemberBinding="{Binding CurrentPageNo, Mode=TwoWay}" MinWidth="80" />
160 178
                    <telerik:GridViewDataColumn Header="TotalPage"
161
											DataMemberBinding="{Binding TotalPage, Mode=TwoWay}" MinWidth="60" MaxWidth="80" />
179
											DataMemberBinding="{Binding TotalPage, Mode=TwoWay}" MinWidth="60" />
162 180
                    <!--<telerik:GridViewDataColumn Header=" OriginfilePath"
163 181
											DataMemberBinding="{Binding  OriginfilePath}" MinWidth="170"/>-->
164 182
                    <telerik:GridViewDynamicHyperlinkColumn x:Name="navigation" Header="원본파일"
......
172 190
                        </telerik:GridViewDynamicHyperlinkColumn.CellTemplate>
173 191
                    </telerik:GridViewDynamicHyperlinkColumn>
174 192
                    <telerik:GridViewDataColumn Header=" ConvertPath"
175
											DataMemberBinding="{Binding ConvertPath}" MinWidth="70" MaxWidth="90"/>
193
											DataMemberBinding="{Binding ConvertPath}" MinWidth="70" />
176 194
                    <telerik:GridViewDataColumn Header="CreateTime"
177
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" MinWidth="120" MaxWidth="140"/>
195
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" MinWidth="120" />
178 196
                    <telerik:GridViewDataColumn Header="Exception"
179 197
											DataMemberBinding="{Binding Exception}"/>
180 198
                    <telerik:GridViewDataColumn Header="ProcessorAffinity"
181
											DataMemberBinding="{Binding ProcessorAffinity}" MinWidth="90" MaxWidth="110"/>
199
											DataMemberBinding="{Binding ProcessorAffinity}" MinWidth="90" />
182 200
                    <telerik:GridViewDataColumn Header="ReConverter"
183
											DataMemberBinding="{Binding ReConverter, Mode=TwoWay}" MinWidth="70" MaxWidth="90"/>
201
											DataMemberBinding="{Binding ReConverter, Mode=TwoWay}" MinWidth="70" />
184 202
                    <telerik:GridViewDataColumn Header="UniqueKey"
185
											DataMemberBinding="{Binding UniqueKey}" MinWidth="60" MaxWidth="80"/>
203
											DataMemberBinding="{Binding UniqueKey}" MinWidth="60" />
186 204

  
187 205
                    <telerik:GridViewDataColumn Header="REVISION"
188 206
											DataMemberBinding="{Binding Revision}"/>
......
195 213
                    <telerik:GridViewDataColumn Header="Validation"
196 214
											DataMemberBinding="{Binding Validation}"/>
197 215
                    <telerik:GridViewDataColumn Header="Service ID"
198
											DataMemberBinding="{Binding ServiceID}"  MinWidth="250" MaxWidth="270"/>
216
											DataMemberBinding="{Binding ServiceID}"  MinWidth="250"/>
199 217
                </telerik:RadGridView.Columns>
200 218
            </telerik:RadGridView>
201 219
        </GroupBox>
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml.cs
25 25
        public DataBaseView()
26 26
        {
27 27
            InitializeComponent();
28
        }
28
             }
29 29
    }
30 30
}
ConvertService/ServiceBase/Markus.Service.StationController/packages.config
9 9
  <package id="MaterialDesignColors" version="1.2.0" targetFramework="net45" />
10 10
  <package id="MaterialDesignThemes" version="2.6.0" targetFramework="net45" />
11 11
  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net45" />
12
  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
12
  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
13 13
  <package id="Salaros.ConfigParser" version="0.3.3" targetFramework="net461" />
14 14
</packages>

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)