프로젝트

일반

사용자정보

개정판 c854511f

IDc854511f0d813a3e667c4d079921b6b1eeb52edb
상위 b9df9ab0
하위 91c5e7a1

김태성이(가) 약 5년 전에 추가함

issue #111101 PEMSS Comment 선택 이동에서 페이지 변경문제 해결

Change-Id: I08f30e404b7032a7183879e71061ff3f93b71d96

차이점 보기:

KCOM/Converters/ActualSizeConverter.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Globalization;
4
using System.Linq;
5
using System.Text;
6
using System.Threading.Tasks;
7
using System.Windows.Data;
8

  
9
namespace KCOM.Converters
10
{
11
   public  class ActualSizeConverter : IValueConverter
12
    {
13
        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
14
        {
15
            double result = 0.0;
16

  
17
            if(value is double)
18
            {
19
                result = (double)value;
20
            }
21

  
22
            return result;
23
        }
24

  
25
        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
26
        {
27
            throw new NotImplementedException();
28
        }
29
    }
30
}
KCOM/KCOM.csproj
302 302
    </Compile>
303 303
    <Compile Include="Converters\GridSelectMultiValueConverter.cs" />
304 304
    <Compile Include="Converters\BiddersToKeyAndValueConvert.cs" />
305
    <Compile Include="Converters\ActualSizeConverter.cs" />
305 306
    <Compile Include="Converters\IListToIListCountConverter.cs" />
306 307
    <Compile Include="Converters\StringMultiLineConvert.cs" />
307 308
    <Compile Include="Extensions\CollectionExtenstions.cs" />
KCOM/MainWindow.xaml
13 13
        navigation:RadWindowInteropHelper.ShowInTaskbar="True"
14 14
        Style="{StaticResource MainWindowStyle}" BorderBrush="#FF40568D"
15 15
		navigation:RadWindowInteropHelper.Icon="markup.ico"
16
        Background="{DynamicResource KCOMColor_TopMenubackgroundBrush}"
16
        Background="{DynamicResource KCOMColor_TopMenubackgroundBrush}" PreviewKeyUp="KeyEventDownAction"
17 17
        Header="MARKUS" Foreground="White" >
18 18
    <telerik:RadWindow.Resources>
19 19
        <Style x:Key="NoMarginGrid" TargetType="{x:Type Grid}">
KCOM/MainWindow.xaml.cs
54 54
            App.splashString(ISplashMessage.MAINWINDOW);
55 55
            this.Loaded += MainWindow_Loaded;
56 56

  
57
            this.AddHandler(Keyboard.KeyDownEvent,
58
                        new KeyEventHandler((sender, e) =>KeyEventDownAction(sender, e)),true);
57
            //this.AddHandler(Keyboard.KeyDownEvent,
58
                        //new KeyEventHandler((sender, e) =>KeyEventDownAction(sender, e)),false);
59 59

  
60 60
            //this.PreviewKeyDown += new KeyEventHandler(KeyEventDownAction);
61 61
            //this.SourceInitialized += new EventHandler(win_SourceInitialized);
KCOM/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("2.2.1.100")]
55
[assembly: AssemblyFileVersion("2.2.1.100")]
54
[assembly: AssemblyVersion("2.2.2.100")]
55
[assembly: AssemblyFileVersion("2.2.2.100")]
KCOM/ViewModel/BiddersViewModel.cs
172 172
            {
173 173
                selectedComment = null;
174 174
            }
175
            else
176
            {
177
                SelectBidders = (obj as Telerik.Windows.Controls.GridView.GridViewRow).DataContext as Bidders;
178
            }
179 175

  
180 176
            if (SelectBidders != null && SelectionSet.Instance.SelectedItems?.Count() > 0)
181 177
            {
......
226 222

  
227 223
        private void OnDelVPCommentCommand(object obj)
228 224
        {
229
            if(obj is Telerik.Windows.Controls.GridView.GridViewRow)
225
            if(obj is VpCommant)
230 226
            {
231
                selectedComment = (obj as Telerik.Windows.Controls.GridView.GridViewRow).DataContext as VpCommant;
227
                selectedComment = obj as VpCommant;
232 228

  
233 229
                var parameters = new DialogParameters()
234 230
                {
......
288 284

  
289 285
        private void GotoMarkup(IEnumerable<string> CommentIdList)
290 286
        {
291
             var selectComments = Common.ViewerDataModel.Instance.MarkupControls_USER.Where(x=> CommentIdList.Count(y=> y == x.CommentID) > 0).ToList();
287
            var instance = Common.ViewerDataModel.Instance;
288

  
289
            var commentList = instance._markupInfoList.Where(x => x.MarkupList != null).SelectMany(x => x.MarkupList).Where(f => f.ID == CommentIdList.First());
290

  
291
            if (commentList.Count() > 0)
292
            {
293
                //하단 그리드의 markup list에서 commentid가 포함된 markupinfo를 선택되게 한다.
294
                #region markup list grid select items
295

  
296
                var infoItem = instance._markupInfoList.Where(x => x.MarkupList != null).Where(f => f.MarkupList.Count(y => y == commentList.First()) > 0);
297

  
298
                if (infoItem.Count() > 0)
299
                {
300
                    var gridMarkup = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup;
301
                    gridMarkup.SelectedItems.Add(infoItem.First());
302
                }
303

  
304
                #endregion
305

  
306
                var pageNavigator = instance.SystemMain.dzMainMenu.pageNavigator;
292 307

  
293
                if (selectComments.Count() > 0)
308
                pageNavigator.GotoPage(commentList.First().PageNumber);
309

  
310
                pageNavigator.PageChanged += (snd, evt) =>
294 311
                {
295
                    var infoList = Common.ViewerDataModel.Instance.MyMarkupList.Where(f => f.MarkupInfoID == selectComments.First().MarkupInfoID);
312
                    var selectOrderComments = instance.MarkupControls.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList();
313
                    var selectMyComments = instance.MarkupControls_USER.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList();
296 314

  
297
                    if (infoList.Count() > 0)
315
                    if (selectMyComments.Count() > 0 || selectOrderComments.Count() > 0)
298 316
                    {
299
                        Common.ViewerDataModel.Instance.PageBalanceNumber = infoList.First().PageNumber;
300
                        selectComments.First().IsSelected = true;
301
                        GotoMarkup(selectComments);
317
                        selectMyComments.ForEach(x => x.IsSelected = true);
318
                        selectMyComments.AddRange(selectOrderComments);
302 319

  
303
                        selectComments.First().IsSelected =false;
320
                        GotoMarkup(selectMyComments);
304 321
                    }
305
                }
322
                };
323
            }
306 324
        }
307 325

  
308 326
        private void GotoMarkup(IEnumerable<MarkupToPDF.Common.CommentUserInfo> commentUserInfo)
KCOM/ViewModel/RequirementViewModel.cs
176 176
            {
177 177
                selectedComment = null;
178 178
            }
179
            else
180
            {
181
                SelectRequirement = (obj as Telerik.Windows.Controls.GridView.GridViewRow).DataContext as Requirement;
182
            }
183 179

  
184 180
            if (SelectRequirement != null && SelectionSet.Instance.SelectedItems?.Count() > 0)
185 181
            {
......
230 226

  
231 227
        private void OnDelVPCommentCommand(object obj)
232 228
        {
233
            if(obj is Telerik.Windows.Controls.GridView.GridViewRow)
229
            if(obj is VpCommant)
234 230
            {
235
                selectedComment = (obj as Telerik.Windows.Controls.GridView.GridViewRow).DataContext as VpCommant;
231
                selectedComment = obj  as VpCommant;
236 232

  
237 233
                var parameters = new DialogParameters()
238 234
                {
......
299 295
            //var gridMarkup = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup;
300 296

  
301 297
            //var markuplist = (gridMarkup.ItemsSource as IEnumerable<IKCOM.MarkupInfoItem>).SelectMany(x => x.MarkupList);
298
            var instance = Common.ViewerDataModel.Instance;
302 299

  
303
            var infoList = Common.ViewerDataModel.Instance._markupInfoList.Where(x=>x.MarkupList != null).SelectMany(x => x.MarkupList).Where(f => f.ID == CommentIdList.First());
300
            var commentList = instance._markupInfoList.Where(x=>x.MarkupList != null).SelectMany(x => x.MarkupList).Where(f => f.ID == CommentIdList.First());
304 301

  
305
            if (infoList.Count() > 0)
302
            if (commentList.Count() > 0)
306 303
            {
307
                var pageNavigator = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator;
304
                //하단 그리드의 markup list에서 commentid가 포함된 markupinfo를 선택되게 한다.
305
                #region markup list grid select items
306

  
307
                var infoItem = instance._markupInfoList.Where(x => x.MarkupList != null).Where(f => f.MarkupList.Count(y => y == commentList.First()) > 0);
308

  
309
                if (infoItem.Count() > 0)
310
                {
311
                    var gridMarkup = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup;
312
                    gridMarkup.SelectedItems.Add(infoItem.First());
313
                }
314

  
315
                #endregion
308 316

  
309
                pageNavigator.GotoPage(infoList.First().PageNumber);
317
                var pageNavigator = instance.SystemMain.dzMainMenu.pageNavigator;
318

  
319
                pageNavigator.GotoPage(commentList.First().PageNumber);
310 320

  
311 321
                pageNavigator.PageChanged += (snd, evt) =>
312 322
                {
313
                    var selectComments = Common.ViewerDataModel.Instance.MarkupControls_USER.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList();
323
                    var selectOrderComments = instance.MarkupControls.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList();
324
                    var selectMyComments = instance.MarkupControls_USER.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList();
314 325

  
315
                    if (selectComments.Count() > 0)
326
                    if (selectMyComments.Count() > 0 || selectOrderComments.Count() > 0)
316 327
                    {
317
                        selectComments.ForEach(x => x.IsSelected = true);
318
                        GotoMarkup(selectComments);
328
                        selectMyComments.ForEach(x => x.IsSelected = true);
329
                        selectMyComments.AddRange(selectOrderComments);
330

  
331
                        GotoMarkup(selectMyComments);
319 332
                    }
320 333
                };
321 334
            }
KCOM/Views/BiddersView.xaml
114 114
                <telerik:RadPathButton Width="100" HorizontalAlignment="Left" Content="연결 추가" FontSize="12" Grid.ColumnSpan="2" Margin="15,2,2,2"
115 115
                                                Command="{Binding AddVPCommentCommand, Source={StaticResource ViewModel}}"
116 116
                                                ContentPlacement="Left" telerik:StyleManager.Theme="Office2016"
117
                                                CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=telerik:GridViewRow}}"
118 117
                                                PathGeometry="m4,7l0,2l3,0l0,3l2,0l0,-3l3,0l0,-2l-3,0l0,-3l-2,0l0,3l-3,0zm4,9c-4.41828,0 -8,-3.58172 -8,-8c0,-4.41828 3.58172,-8 8,-8c4.41828,0 8,3.58172 8,8c0,4.41828 -3.58172,8 -8,8zm0,0" >
119 118
                    <telerik:RadPathButton.PathStyle>
120 119
                        <Style TargetType="Path">
......
165 164
                            <DataTemplate>
166 165
                                <telerik:RadPathButton ToolTip="Delete Comment" Height="22" Width="22"
167 166
                                                Command="{Binding DelVPCommentCommand, Source={StaticResource ViewModel}}"
168
                                                CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=telerik:GridViewRow}}" Background="{x:Null}" BorderBrush="{x:Null}"
167
                                                CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"  Background="{x:Null}" BorderBrush="{x:Null}"
169 168
                                                PathGeometry="M108.319,108.319c-2.106,2.107-5.523,2.106-7.632-0.001l-0.003-0.003L70.159,77.79L39.63,108.318   c-2.106,2.108-5.523,2.107-7.634,0c-2.104-2.106-2.105-5.523,0-7.633l30.528-30.528l-30.54-30.541   c-2.106-2.104-2.106-5.521,0-7.631c2.105-2.107,5.522-2.107,7.633-0.001l30.541,30.541l30.528-30.527   c2.105-2.105,5.523-2.105,7.633,0c2.109,2.106,2.107,5.524,0,7.633L77.791,70.157l30.527,30.528   C110.427,102.794,110.427,106.212,108.319,108.319 M119.767,119.767c27.396-27.397,27.396-71.818,0-99.217   C92.37-6.849,47.947-6.85,20.547,20.548c-27.397,27.398-27.396,71.819,0.001,99.22C47.947,147.166,92.368,147.165,119.767,119.767">
170 169
                                </telerik:RadPathButton>
171 170
                            </DataTemplate>
KCOM/Views/MainMenu.xaml
1
<UserControl xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"  x:Class="KCOM.Views.MainMenu"
1
<UserControl xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
2 2
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:toggle="clr-namespace:ToggleSwitch;assembly=ToggleSwitch"
3 3
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:telerikGrid="clr-namespace:Telerik.Windows.Controls.GridView;assembly=Telerik.Windows.Controls.GridView"
4 4
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
......
6 6
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"  xmlns:common="clr-namespace:KCOM.Common"
7 7
             xmlns:controls="clr-namespace:KCOM.Controls"  xmlns:ZoomAndPan="clr-namespace:ZoomAndPan;assembly=ZoomAndPan"
8 8
             xmlns:view="clr-namespace:KCOM.Views"
9
             xmlns:messanger="clr-namespace:KCOM.Messenger"
10
             xmlns:Angle="clr-namespace:MarkupToPDF.Controls.Angle;assembly=MarkupToPDF" xmlns:Converters="clr-namespace:KCOM.Converters"  x:Class="KCOM.Views.MainMenu"
9 11
             mc:Ignorable="d" 
10 12
             d:DesignHeight="1080"
11
             d:DesignWidth="1080" IsTabStop="True" xmlns:messanger="clr-namespace:KCOM.Messenger"
12
             xmlns:Angle="clr-namespace:MarkupToPDF.Controls.Angle;assembly=MarkupToPDF" LayoutUpdated="UserControl_LayoutUpdated">
13
             d:DesignWidth="1080" IsTabStop="True" LayoutUpdated="UserControl_LayoutUpdated">
13 14
    <UserControl.Resources>
14
        <Style TargetType="telerik:GridViewHeaderCell" x:Key="GridViewHeaderStyle">
15
        <Converters:ActualSizeConverter x:Key="ActualSizeConverter"/>
16
        <Style TargetType="{x:Type telerikGrid:GridViewHeaderCell}" x:Key="GridViewHeaderStyle">
15 17
            <Setter Property="VerticalContentAlignment" Value="Center"/>
16 18
            <Setter Property="HorizontalContentAlignment" Value="Center"/>
17 19
            <Setter Property="BorderThickness" Value="0"/>
......
26 28
            <Setter Property="telerik:StyleManager.Theme" Value="Office2013"/>
27 29
            <!--<Setter Property="FontWeight" Value="Black"/>-->
28 30
        </Style>
29
        <Style x:Key="GridViewAlign" TargetType="telerikGrid:GridViewCell">
31
        <Style x:Key="GridViewAlign" TargetType="{x:Type telerikGrid:GridViewCell}">
30 32
            <Setter Property="HorizontalContentAlignment" Value="Center" />
31 33
            <Setter Property="TextBlock.TextDecorations">
32 34
                <Setter.Value>
......
40 42
                                    <Pen.Brush>
41 43
                                        <LinearGradientBrush Opacity="0.5"
42 44
                		StartPoint="0,0.5"  EndPoint="1,0.5">
43
                                            <LinearGradientBrush.GradientStops>
44
                                                <GradientStop Color="Yellow" Offset="0" />
45
                                                <GradientStop Color="Red" Offset="1" />
46
                                            </LinearGradientBrush.GradientStops>
45
                                            <GradientStop Color="Yellow" Offset="0" />
46
                                            <GradientStop Color="Red" Offset="1" />
47 47
                                        </LinearGradientBrush>
48 48
                                    </Pen.Brush>
49 49
                                </Pen>
......
106 106
                            </telerik:RadDocumentPane.HeaderTemplate>
107 107
                            <!--<Grid Background="{DynamicResource KCOMColor_AlternativeBrush}">-->
108 108
                            <Grid Background="{DynamicResource KCOMColor_DocumnetBackgroundBrush}">
109
                                <Rectangle Name="rect" Margin="50,50,0,0" Width="100" Height="100" Fill="LightBlue"/>
110
                                <Popup Name="floatingTip" AllowsTransparency="True" Placement="Relative" PlacementTarget="{Binding ElementName=rect}">
109
                                <Rectangle x:Name="rect" Margin="50,50,0,0" Width="100" Height="100" Fill="LightBlue"/>
110
                                <Popup x:Name="floatingTip" AllowsTransparency="True" Placement="Relative" PlacementTarget="{Binding ElementName=rect}">
111 111
                                    <TextBlock x:Name="txtBatch" Foreground="Red" FontSize="20" Text="Mark Control을 그립니다."/>
112 112
                                </Popup>
113 113
                                <telerik:RadBusyIndicator x:Name="busyIndicator" IsBusy="False" BusyContent="Saving...">
114
                                <ZoomAndPan:ZoomAndPanControl x:Name="zoomAndPanControl"
114
                                    <ZoomAndPan:ZoomAndPanControl x:Name="zoomAndPanControl"
115 115
                                                              MouseWheel="zoomAndPanControl_MouseWheel"
116 116
                                                              MouseDown="zoomAndPanControl_MouseDown"
117 117
                                                              MouseMove="zoomAndPanControl_MouseMove"
......
125 125
                                                              ConstrainedContentViewportWidth="{Binding ContentViewportWidth, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
126 126
                                                              ConstrainedContentViewportHeight="{Binding ContentViewportHeight, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
127 127
                                                              Background="LightGray">
128
                                    <Canvas x:Name="zoomAndPanCanvas" Opacity="1" Background="White">
128
                                        <Canvas x:Name="zoomAndPanCanvas" Opacity="1" Background="White">
129 129

  
130
                                        <Canvas x:Name="drawingRotateCanvas"
130
                                            <Canvas x:Name="drawingRotateCanvas"
131 131
                                                        Panel.ZIndex="1"
132 132
                                                        Background="{Binding BackgroundImage, Mode=OneWay, Source={x:Static common:ViewerDataModel.Instance}}">
133
                                            <Canvas.RenderTransform>
134
                                                <TransformGroup>
135
                                                    <RotateTransform x:Name="rotate" Angle="0"/>
136
                                                    <TranslateTransform x:Name="translate" X="0" Y="0"/>
137
                                                </TransformGroup>
138
                                            </Canvas.RenderTransform>
139
                                            
140
                                            <ItemsControl ItemsSource="{Binding MarkupControls, Source={x:Static common:ViewerDataModel.Instance}}"
133
                                                <Canvas.RenderTransform>
134
                                                    <TransformGroup>
135
                                                        <RotateTransform x:Name="rotate" Angle="0"/>
136
                                                        <TranslateTransform x:Name="translate" X="0" Y="0"/>
137
                                                    </TransformGroup>
138
                                                </Canvas.RenderTransform>
139

  
140
                                                <ItemsControl ItemsSource="{Binding MarkupControls, Source={x:Static common:ViewerDataModel.Instance}}"
141 141
                                          Panel.ZIndex="1">
142
                                                <ItemsControl.ItemsPanel>
143
                                                    <ItemsPanelTemplate>
144
                                                        <Canvas />
145
                                                    </ItemsPanelTemplate>
146
                                                </ItemsControl.ItemsPanel>
147
                                            </ItemsControl>
148
                                            <ItemsControl ItemsSource="{Binding MarkupControls_USER, Source={x:Static common:ViewerDataModel.Instance}}"
142
                                                    <ItemsControl.ItemsPanel>
143
                                                        <ItemsPanelTemplate>
144
                                                            <Canvas />
145
                                                        </ItemsPanelTemplate>
146
                                                    </ItemsControl.ItemsPanel>
147
                                                </ItemsControl>
148
                                                <ItemsControl ItemsSource="{Binding MarkupControls_USER, Source={x:Static common:ViewerDataModel.Instance}}"
149 149
                                          Panel.ZIndex="30">
150
                                                <ItemsControl.ItemsPanel>
151
                                                    <ItemsPanelTemplate>
152
                                                        <Canvas />
153
                                                    </ItemsPanelTemplate>
154
                                                </ItemsControl.ItemsPanel>
155
                                            </ItemsControl>
156
                                            <InkPresenter x:Name="inkBoard" HorizontalAlignment="Stretch" Panel.ZIndex="1" VerticalAlignment="Stretch"/>
157
                                            <InkCanvas x:Name="inkDrawingCanvas"
150
                                                    <ItemsControl.ItemsPanel>
151
                                                        <ItemsPanelTemplate>
152
                                                            <Canvas />
153
                                                        </ItemsPanelTemplate>
154
                                                    </ItemsControl.ItemsPanel>
155
                                                </ItemsControl>
156
                                                <InkPresenter x:Name="inkBoard" HorizontalAlignment="Stretch" Panel.ZIndex="1" VerticalAlignment="Stretch"/>
157
                                                <InkCanvas x:Name="inkDrawingCanvas"
158 158
                                               Background="Transparent"
159 159
                                               IsEnabled="False"
160 160
                                               Panel.ZIndex="1"
161 161
                                               Strokes="{Binding MarkupPens, Source={x:Static common:ViewerDataModel.Instance}}" Height="1" Width="1">
162
                                                <!--<Rectangle Height="41" HorizontalAlignment="Left"  Name="rectangle1" Stroke="Black" VerticalAlignment="Top" Width="69" Fill="#FFDB1111" />-->
163
                                                <!--<Ellipse Height="41" HorizontalAlignment="Left"  Name="rectangle1" Stroke="Black" VerticalAlignment="Top" Width="69" Fill="#FFDB1111" />-->
162
                                                    <!--<Rectangle Height="41" HorizontalAlignment="Left"  Name="rectangle1" Stroke="Black" VerticalAlignment="Top" Width="69" Fill="#FFDB1111" />-->
163
                                                    <!--<Ellipse Height="41" HorizontalAlignment="Left"  Name="rectangle1" Stroke="Black" VerticalAlignment="Top" Width="69" Fill="#FFDB1111" />-->
164 164

  
165
                                                <!--<MarkupToPDF:RectangleControl Height="200" HorizontalAlignment="Center" Name="rectangle2" StrokeColor="Black" VerticalAlignment="Top" Width="00" FillColor="Red"/>-->
166
                                            </InkCanvas>
167
                                            <!--강인구 추가-->
165
                                                    <!--<MarkupToPDF:RectangleControl Height="200" HorizontalAlignment="Center" Name="rectangle2" StrokeColor="Black" VerticalAlignment="Top" Width="00" FillColor="Red"/>-->
166
                                                </InkCanvas>
167
                                                <!--강인구 추가-->
168
                                                <!--<Border x:Name="dragZoomBorder"
169
                                                    BorderBrush="Black"
170
                                                    BorderThickness="1"
171
                                                    
172
                                                    Background="Transparent" 
173
                                                    CornerRadius="1"
174
                                                    Panel.ZIndex="1"
175
                                                    Opacity="0.5"/>-->
176

  
177

  
178
                                                <!--<Border Background="Red" Panel.ZIndex="1" Opacity="0.5" Visibility="Visible" Width="100" Height="100" />-->
168 179
                                                <!--<controls:ScaleDecodeImage Panel.ZIndex="0" x:Name="mainPanel"
169 180
                                                   Source="{Binding ImageViewPath,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" 
170 181
                                                    Width="{Binding ImageViewWidth,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
......
172 183
                                                </controls:ScaleDecodeImage>-->
173 184
                                                <Image Panel.ZIndex="0" x:Name="mainPanel" RenderOptions.BitmapScalingMode="HighQuality"
174 185
                                                       RenderOptions.EdgeMode="Unspecified" RenderOptions.ClearTypeHint="Enabled"
175
                                                        Source="{Binding ImageViewPath,Mode=OneWay, Source={x:Static common:ViewerDataModel.Instance}}" 
176
                                                         Width="{Binding ImageViewWidth,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
177
                                                        Height="{Binding ImageViewHeight,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
178
                                                           >
179
                                                    </Image>
186
                                                        Source="{Binding ImageViewPath, Mode=OneWay, Source={x:Static common:ViewerDataModel.Instance}}" 
187
                                                         Width="{Binding ImageViewWidth, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
188
                                                        Height="{Binding ImageViewHeight, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
189
                                                           />
180 190
                                                <Canvas x:Name="SelectLayer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="32766"/>
181 191
                                                <Border x:Name="dragSelectionBorder" Visibility="Collapsed"
182 192
                                                    BorderBrush="Blue"
......
192 202
                                                    CornerRadius="1"
193 203
                                                    Panel.ZIndex="1"
194 204
                                                    Opacity="0.5"/>
195
                                            <Border x:Name="dragZoomBorder" Visibility="Collapsed"
205
                                                <Border x:Name="dragZoomBorder" Visibility="Collapsed"
196 206
                                                    BorderThickness="3"
197 207
                                                    Background="Transparent" 
198 208
                                                    CornerRadius="1"
199 209
                                                    Panel.ZIndex="1"
200 210
                                                    Opacity="1">
201
                                                <Border.BorderBrush>
202
                                                    <VisualBrush>
203
                                                        <VisualBrush.Visual>
204
                                                            <Rectangle StrokeDashArray="4 2" Stroke="Gray" StrokeThickness="1"
205
                                                                  Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
206
                                                                  Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}"/>
207
                                                        </VisualBrush.Visual>
208
                                                    </VisualBrush>
209
                                                </Border.BorderBrush>
210
                                            </Border>
211
                                            <!--<Border x:Name="dragZoomBorder"
212
                                                    BorderBrush="Black"
213
                                                    BorderThickness="1"
214
                                                    
215
                                                    Background="Transparent" 
216
                                                    CornerRadius="1"
217
                                                    Panel.ZIndex="1"
218
                                                    Opacity="0.5"/>-->
211
                                                    <Border.BorderBrush>
212
                                                        <VisualBrush>
213
                                                            <VisualBrush.Visual>
214
                                                                <Rectangle StrokeDashArray="4 2" Stroke="Gray" StrokeThickness="1"
215
                                                                  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type Border}}}"
216
                                                                  Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Border}}}"/>
217
                                                            </VisualBrush.Visual>
218
                                                        </VisualBrush>
219
                                                    </Border.BorderBrush>
220
                                                </Border>
221
                                            </Canvas>
219 222

  
223
                                            <!--<Border Background="Red" Panel.ZIndex="1" Opacity="0.5" Visibility="Visible" Width="1000" Height="1000" IsHitTestVisible="False"/>-->
220 224

  
221
                                            <!--<Border Background="Red" Panel.ZIndex="1" Opacity="0.5" Visibility="Visible" Width="100" Height="100" />-->
225
                                            <!--<Leadtools_Windows_Controls:RasterImageViewer x:Name="_imageViewer" Grid.Row="1" BorderThickness="0"/>-->
222 226
                                        </Canvas>
223 227

  
224
                                        <!--<Border Background="Red" Panel.ZIndex="1" Opacity="0.5" Visibility="Visible" Width="1000" Height="1000" IsHitTestVisible="False"/>-->
225

  
226
                                        <!--<Leadtools_Windows_Controls:RasterImageViewer x:Name="_imageViewer" Grid.Row="1" BorderThickness="0"/>-->
227
                                    </Canvas>
228

  
229
                                </ZoomAndPan:ZoomAndPanControl>
228
                                    </ZoomAndPan:ZoomAndPanControl>
230 229
                                </telerik:RadBusyIndicator>
231 230
                                <!--캡쳐 화면을 위한 보더-->
232 231
                                <Border Background="LightGray" 
......
238 237
                                                        Grid.Column="1"
239 238
                                                        Grid.ColumnSpan="2"
240 239
                                                        Margin="10"
241
                                                        AngleValue="{Binding Angle, Mode=TwoWay, StringFormat=\{0:F0\}°, Source={x:Static common:ViewerDataModel.Instance}}"
240
                                                        AngleValue="{Binding Angle, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}, StringFormat=\{0:F0\}°}"
242 241
                                                        HorizontalAlignment="Right"
243 242
                                                        VerticalAlignment="Top"
244 243
                                                        IsHitTestVisible="False"
......
275 274
                                          Panel.ZIndex="1">
276 275
                                                <ItemsControl.ItemsPanel>
277 276
                                                    <ItemsPanelTemplate>
278
                                                        <Canvas >
279

  
280
                                                        </Canvas>
277
                                                        <Canvas />
281 278
                                                    </ItemsPanelTemplate>
282 279
                                                </ItemsControl.ItemsPanel>
283 280
                                            </ItemsControl>
284 281
                                            <Image x:Name="ComparePanel"
285 282
                                                   Source="{Binding ImageViewPath_C, Source={x:Static common:ViewerDataModel.Instance}}" 
286 283
                                                   Width="{Binding ImageViewWidth_C, Source={x:Static common:ViewerDataModel.Instance}}" 
287
                                                   Height="{Binding ImageViewHeight_C, Source={x:Static common:ViewerDataModel.Instance}}" >
288
                                            </Image>
289
                                            <Canvas x:Name="canvas_compareBorder" IsHitTestVisible="False" Width="{Binding ActualWidth, ElementName=zoomAndPanCanvas2, Mode=OneWay}" Height="{Binding ActualHeight, ElementName=zoomAndPanCanvas2, Mode=OneWay}" Panel.ZIndex="1">
284
                                                   Height="{Binding ImageViewHeight_C, Source={x:Static common:ViewerDataModel.Instance}}" />
285
                                            <Canvas x:Name="canvas_compareBorder" IsHitTestVisible="False" 
286
                                                    Width="0"
287
                                                    Height="0"
288
                                                    Panel.ZIndex="1">
290 289
                                                <!--<Canvas.RenderTransform>
291 290
                                                    -->
292 291
                                                <!--<RotateTransform Angle="{Binding Angle, Source={x:Static common:ViewerDataModel.Instance}}"/>-->
......
326 325
                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
327 326
                                        <!--<telerik:RadToggleButton x:Name="CompareMode" IsChecked="False" Content="Compare"  Margin="5" Checked="SyncCompare_Click" Unchecked="SyncCompare_Click" BorderThickness="0" telerik:StyleManager.Theme="Office2013"
328 327
                                                                       Style="{DynamicResource RadToggleSwtichButtonStyle}" Width="Auto" Padding="10,0"/>-->
328

  
329

  
330
                                        <!--<telerik:RadRibbonToggleButton x:Name="MArkupMode" Content="Markup Mode" Foreground="White"  Margin="5"  Click="SyncChange_Click" BorderThickness="0" telerik:StyleManager.Theme="Office2013"/>-->
329 331
                                        <!--<telerik:RadRibbonToggleButton x:Name="UserList" Content="User List" Foreground="white"  Margin="5" Click="SyncUserListExpender_Click" BorderThickness="0" telerik:StyleManager.Theme="Office2013" VerticalAlignment="Center"/>-->
330 332

  
331 333
                                        <toggle:HorizontalToggleSwitch x:Name="Sync" CheckedContent="Sync" UncheckedContent="Sync" Width="75" IsChecked="False" ThumbSize="25"
......
349 351
                                                                       Margin="5" Checked="SyncPageBalance_Click" Unchecked="SyncPageBalance_Click" BorderThickness="0" telerik:StyleManager.Theme="Office2013"/>
350 352

  
351 353

  
352
                                        <!--<telerik:RadRibbonToggleButton x:Name="MArkupMode" Content="Markup Mode" Foreground="White"  Margin="5"  Click="SyncChange_Click" BorderThickness="0" telerik:StyleManager.Theme="Office2013"/>-->
353 354
                                        <!--<telerik:RadRibbonToggleButton x:Name="BalanceMode" Content="Balance Mode" Foreground="White"  Margin="5" Click="SyncPageBalance_Click" BorderThickness="0" telerik:StyleManager.Theme="Office2013"/>-->
354 355
                                        <telerik:RadRibbonButton  Margin="5" Click="SyncPageChange_Click" Tag="-1" telerik:StyleManager.Theme="Office2013" VerticalAlignment="Center">
355 356
                                            <Image Height="20"
......
376 377
                                                      CanUserFreezeColumns ="False" Visibility="Collapsed"  GridLinesVisibility="None" 
377 378
                                             CanUserDeleteRows="True" CanUserInsertRows="False" IsFilteringAllowed="False" RowIndicatorVisibility="Collapsed" Grid.Row="1">
378 379
                                        <telerik:RadGridView.HeaderRowStyle>
379
                                            <Style TargetType="telerik:GridViewHeaderRow">
380
                                            <Style TargetType="{x:Type telerikGrid:GridViewHeaderRow}">
380 381
                                                <Setter Property="BorderThickness" Value="0"/>
381 382
                                                <Setter Property="Background" Value="Red"/>
382 383
                                                <Setter Property="Foreground" Value="White"/>
......
386 387
                                            </Style>
387 388
                                        </telerik:RadGridView.HeaderRowStyle>
388 389
                                        <telerik:RadGridView.RowStyle>
389
                                            <Style TargetType="telerik:GridViewRow">
390
                                            <Style TargetType="{x:Type telerikGrid:GridViewRow}">
390 391
                                                <Setter Property="HorizontalContentAlignment" Value="Center"/>
391
                                                <Setter Property="Background" Value="{Binding Path=Consolidate, Converter={StaticResource ConsolidationBackgroudConverter}}" />
392
                                                <Setter Property="Background" Value="{Binding Consolidate, Converter={StaticResource ConsolidationBackgroudConverter}}" />
392 393
                                                <Setter Property="Foreground" Value="White"/>
393 394
                                            </Style>
394 395
                                        </telerik:RadGridView.RowStyle>
......
397 398
                                                <telerik:GridViewSelectColumn.Header>
398 399
                                                    <telerik:RadRibbonToggleButton  telerik:StyleManager.Theme="Office2016"
399 400
                                                                           Visibility="Collapsed" Width="Auto">
400
                                                        <telerik:RadRibbonToggleButton.Content>
401
                                                            <Image HorizontalAlignment="Center"
401
                                                        <Image HorizontalAlignment="Center"
402 402
                                                           VerticalAlignment="Center"
403 403
                                                           Source="/KCOM;component/Resources/Images/MenuImage/check.png" />
404
                                                        </telerik:RadRibbonToggleButton.Content>
405 404
                                                    </telerik:RadRibbonToggleButton>
406 405
                                                </telerik:GridViewSelectColumn.Header>
407 406
                                            </telerik:GridViewSelectColumn>
......
452 451

  
453 452
                                                            <TextBlock Grid.Column="0"
454 453
                                                               Foreground="Red"
455
                                                               Text="{Binding AvoidConsolidate,
456
                                                                              Converter={StaticResource AvoidStringConverter}}" />
454
                                                               Text="{Binding AvoidConsolidate, Converter={StaticResource AvoidStringConverter}}" />
457 455
                                                            <TextBlock Grid.Column="1"
458 456
                                                               Foreground="Blue"
459
                                                               Text="{Binding PartConsolidate,
460
                                                                              Converter={StaticResource TeamConsoliStringConverter}}" />
457
                                                               Text="{Binding PartConsolidate, Converter={StaticResource TeamConsoliStringConverter}}" />
461 458
                                                            <TextBlock Grid.Column="2" Text="{Binding Consolidate, Converter={StaticResource ConsoliStringConverter}}" />
462 459
                                                            <!--
463 460
                                                        <TextBlock HorizontalAlignment="Center" Grid.Column="2">
......
480 477
                                                </telerik:GridViewDataColumn.CellTemplate>
481 478
                                            </telerik:GridViewDataColumn>
482 479

  
483
                                            <telerik:GridViewDataColumn Header=""  IsReadOnly="True" Width="*"  HeaderCellStyle="{StaticResource GridViewHeaderStyle}">
484
                                            </telerik:GridViewDataColumn>
480
                                            <telerik:GridViewDataColumn Header=""  IsReadOnly="True" Width="*"  HeaderCellStyle="{StaticResource GridViewHeaderStyle}"/>
485 481
                                        </telerik:RadGridView.Columns>
486 482
                                    </telerik:RadGridView>
487 483
                                </Grid>
......
552 548
                </telerik:RadPaneGroup>
553 549
                <telerik:RadPaneGroup Visibility="Visible" telerik:StyleManager.Theme="Office2016">
554 550
                    <telerik:RadPane Header="SYMBOL" Visibility="Visible" CanFloat="False" CanUserClose="False"  ContextMenuTemplate="{x:Null}" IsPinned="False" telerik:StyleManager.Theme="Office2016"  x:Name="SymbolPane">
551
                        <!--<telerik:RadButton Click="Create_Symbol">Create</telerik:RadButton>-->
555 552
                        <!--<controls:Symbol />-->
556 553
                        <controls:Symbol x:Name="symbolPanel_Instance"/>
557
                        <!--<telerik:RadButton Click="Create_Symbol">Create</telerik:RadButton>-->
558 554
                    </telerik:RadPane>
559 555
                </telerik:RadPaneGroup>
560 556
                <telerik:RadPaneGroup telerik:StyleManager.Theme="Office2016"  telerik:ProportionalStackPanel.RelativeSize="60, 100">
......
661 657
                                <ColumnDefinition Width="40*"/>
662 658
                            </Grid.ColumnDefinitions>
663 659
                            <Grid x:Name="infoListPane" >
664
                            <telerik:RadGridView telerik:StyleManager.Theme="Office2013" ShowGroupPanel="True" ShowGroupFooters="False" AutoExpandGroups="True"  x:Name="gridViewMarkup"
660
                                <telerik:RadGridView telerik:StyleManager.Theme="Office2013" ShowGroupPanel="True" ShowGroupFooters="False" AutoExpandGroups="True"  x:Name="gridViewMarkup"
665 661
                                             AutoGenerateColumns="False" HorizontalContentAlignment="Center" SelectionChanged="gridViewMarkup_SelectionChanged" SelectionMode="Multiple"
666 662
                                             CanUserDeleteRows="True" CanUserInsertRows="False" IsFilteringAllowed="False" RowIndicatorVisibility="Collapsed" 
667 663
                                             CanUserSortColumns ="True" >
668
                            <telerik:RadGridView.GroupDescriptors>
669
                                <telerik:GroupDescriptor Member="Depatment" SortDirection="Ascending" DisplayContent = "DEPT" x:Name="gDept">
670
                                    <telerik:GroupDescriptor.AggregateFunctions>
671
                                        <telerik:CountFunction Caption="Entries count : " />
672
                                    </telerik:GroupDescriptor.AggregateFunctions>
673
                                </telerik:GroupDescriptor>
674

  
675
                            </telerik:RadGridView.GroupDescriptors>
676
                            <telerik:RadGridView.RowStyle>
677
                                <Style TargetType="telerik:GridViewRow">
678
                                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
679
                                    <Setter Property="Background" Value="{Binding Path=Consolidate, Converter={StaticResource ConsolidationBackgroudConverter}}" />
680
                                    <Setter Property="Visibility" Value="{Binding Path=IsPreviewUser,Converter={StaticResource previewerVisibleConverter}}"/>
681
                                    <!--<Setter Property="Template" Value="{StaticResource GridViewRowTemplate}" />-->
682
                                </Style>
683
                            </telerik:RadGridView.RowStyle>
684
                            <telerik:RadGridView.Columns>
685
                                <telerik:GridViewSelectColumn Width="Auto">
686
                                    <telerik:GridViewSelectColumn.Header>
687
                                        <telerik:RadRibbonToggleButton  telerik:StyleManager.Theme="Office2016"
664
                                    <telerik:RadGridView.GroupDescriptors>
665
                                        <telerik:GroupDescriptor Member="Depatment" SortDirection="Ascending" DisplayContent = "DEPT" x:Name="gDept">
666
                                            <telerik:GroupDescriptor.AggregateFunctions>
667
                                                <telerik:CountFunction Caption="Entries count : " />
668
                                            </telerik:GroupDescriptor.AggregateFunctions>
669
                                        </telerik:GroupDescriptor>
670

  
671
                                    </telerik:RadGridView.GroupDescriptors>
672
                                    <telerik:RadGridView.RowStyle>
673
                                        <Style TargetType="{x:Type telerikGrid:GridViewRow}">
674
                                            <Setter Property="HorizontalContentAlignment" Value="Center"/>
675
                                            <Setter Property="Background" Value="{Binding Consolidate, Converter={StaticResource ConsolidationBackgroudConverter}}" />
676
                                            <Setter Property="Visibility" Value="{Binding IsPreviewUser, Converter={StaticResource previewerVisibleConverter}}"/>
677
                                            <!--<Setter Property="Template" Value="{StaticResource GridViewRowTemplate}" />-->
678
                                        </Style>
679
                                    </telerik:RadGridView.RowStyle>
680
                                    <telerik:RadGridView.Columns>
681
                                        <telerik:GridViewSelectColumn Width="Auto">
682
                                            <telerik:GridViewSelectColumn.Header>
683
                                                <telerik:RadRibbonToggleButton  telerik:StyleManager.Theme="Office2016"
688 684
                                                                           Visibility="Collapsed" Width="Auto">
689
                                            <telerik:RadRibbonToggleButton.Content>
690
                                                <Image HorizontalAlignment="Center"
685
                                                    <Image HorizontalAlignment="Center"
691 686
                                                           VerticalAlignment="Center"
692 687
                                                           Source="/KCOM;component/Resources/Images/MenuImage/check.png" />
693
                                            </telerik:RadRibbonToggleButton.Content>
694
                                        </telerik:RadRibbonToggleButton>
695
                                    </telerik:GridViewSelectColumn.Header>
696
                                </telerik:GridViewSelectColumn>
697
                                <telerik:GridViewDataColumn Width="Auto"
688
                                                </telerik:RadRibbonToggleButton>
689
                                            </telerik:GridViewSelectColumn.Header>
690
                                        </telerik:GridViewSelectColumn>
691
                                        <telerik:GridViewDataColumn Width="Auto"
698 692
                                                                Header="Color"
699 693
                                                                IsReadOnly="True">
700
                                    <telerik:GridViewDataColumn.CellTemplate>
701
                                        <DataTemplate>
702
                                            <Grid>
703
                                                <Grid>
704
                                                    <Rectangle Margin="0,2,2,2" Fill="{Binding DisplayColor, Converter={StaticResource StringToColorConverter}}" />
705
                                                    <TextBlock Foreground="#00000000" Text="Color" />
706
                                                </Grid>
707
                                                <Grid VerticalAlignment="Center" Visibility="{Binding AvoidConsolidate, Converter={StaticResource BoolToVisibleConverter}}">
708
                                                    <Image Height="15"
694
                                            <telerik:GridViewDataColumn.CellTemplate>
695
                                                <DataTemplate>
696
                                                    <Grid>
697
                                                        <Grid>
698
                                                            <Rectangle Margin="0,2,2,2" Fill="{Binding DisplayColor, Converter={StaticResource StringToColorConverter}}" />
699
                                                            <TextBlock Foreground="#00000000" Text="Color" />
700
                                                        </Grid>
701
                                                        <Grid VerticalAlignment="Center" Visibility="{Binding AvoidConsolidate, Converter={StaticResource BoolToVisibleConverter}}">
702
                                                            <Image Height="15"
709 703
                                                               Source="/KCOM;component/Resources/Images/MenuImage/lock_2.png"
710 704
                                                               Stretch="Uniform" />
711
                                                </Grid>
712
                                            </Grid>
713

  
714
                                        </DataTemplate>
715
                                    </telerik:GridViewDataColumn.CellTemplate>
716
                                </telerik:GridViewDataColumn>
717
                                <telerik:GridViewDataColumn Header="DEPT"  IsReadOnly="True"  Width="Auto" DataMemberBinding="{Binding Depatment}" >
718
                                    <telerik:GridViewDataColumn.CellTemplate>
719
                                        <DataTemplate>
720
                                            <TextBlock Text="{Binding Depatment}"/>
721
                                        </DataTemplate>
722
                                    </telerik:GridViewDataColumn.CellTemplate>
723
                                </telerik:GridViewDataColumn>
724
                                <telerik:GridViewDataColumn Header="NAME"  IsReadOnly="True" Width="Auto" DataMemberBinding="{Binding UserName}">
725
                                    <telerik:GridViewDataColumn.CellTemplate>
726
                                        <DataTemplate>
727
                                            <TextBlock Text="{Binding UserName, Mode=TwoWay}"/>
728
                                        </DataTemplate>
729
                                    </telerik:GridViewDataColumn.CellTemplate>
730
                                </telerik:GridViewDataColumn>
731
                                <telerik:GridViewDataColumn Header="UPDATETIME"  IsReadOnly="True" Width="Auto">
732
                                    <telerik:GridViewDataColumn.CellTemplate>
733
                                        <DataTemplate>
734
                                            <TextBlock Text="{Binding UpdateTime}"/>
735
                                        </DataTemplate>
736
                                    </telerik:GridViewDataColumn.CellTemplate>
737
                                </telerik:GridViewDataColumn>
738
                                <telerik:GridViewDataColumn Header="CONSOLIDATION"  IsReadOnly="True" Width="Auto">
739
                                    <telerik:GridViewDataColumn.CellTemplate>
740
                                        <DataTemplate>
741
                                            <!--<TextBlock Text="{Binding Consolidate}"/>-->
742
                                            <Grid>
743
                                                <Grid.ColumnDefinitions>
744
                                                    <ColumnDefinition Width="Auto" />
745
                                                    <ColumnDefinition Width="Auto" />
746
                                                    <ColumnDefinition Width="Auto" />
747
                                                </Grid.ColumnDefinitions>
748

  
749
                                                <TextBlock Grid.Column="0"
705
                                                        </Grid>
706
                                                    </Grid>
707

  
708
                                                </DataTemplate>
709
                                            </telerik:GridViewDataColumn.CellTemplate>
710
                                        </telerik:GridViewDataColumn>
711
                                        <telerik:GridViewDataColumn Header="DEPT"  IsReadOnly="True"  Width="Auto" DataMemberBinding="{Binding Depatment}" >
712
                                            <telerik:GridViewDataColumn.CellTemplate>
713
                                                <DataTemplate>
714
                                                    <TextBlock Text="{Binding Depatment}"/>
715
                                                </DataTemplate>
716
                                            </telerik:GridViewDataColumn.CellTemplate>
717
                                        </telerik:GridViewDataColumn>
718
                                        <telerik:GridViewDataColumn Header="NAME"  IsReadOnly="True" Width="Auto" DataMemberBinding="{Binding UserName}">
719
                                            <telerik:GridViewDataColumn.CellTemplate>
720
                                                <DataTemplate>
721
                                                    <TextBlock Text="{Binding UserName, Mode=TwoWay}"/>
722
                                                </DataTemplate>
723
                                            </telerik:GridViewDataColumn.CellTemplate>
724
                                        </telerik:GridViewDataColumn>
725
                                        <telerik:GridViewDataColumn Header="UPDATETIME"  IsReadOnly="True" Width="Auto">
726
                                            <telerik:GridViewDataColumn.CellTemplate>
727
                                                <DataTemplate>
728
                                                    <TextBlock Text="{Binding UpdateTime}"/>
729
                                                </DataTemplate>
730
                                            </telerik:GridViewDataColumn.CellTemplate>
731
                                        </telerik:GridViewDataColumn>
732
                                        <telerik:GridViewDataColumn Header="CONSOLIDATION"  IsReadOnly="True" Width="Auto">
733
                                            <telerik:GridViewDataColumn.CellTemplate>
734
                                                <DataTemplate>
735
                                                    <!--<TextBlock Text="{Binding Consolidate}"/>-->
736
                                                    <Grid>
737
                                                        <Grid.ColumnDefinitions>
738
                                                            <ColumnDefinition Width="Auto" />
739
                                                            <ColumnDefinition Width="Auto" />
740
                                                            <ColumnDefinition Width="Auto" />
741
                                                        </Grid.ColumnDefinitions>
742

  
743
                                                        <TextBlock Grid.Column="0"
750 744
                                                               Foreground="Red"
751
                                                               Text="{Binding AvoidConsolidate,
752
                                                                              Converter={StaticResource AvoidStringConverter}}" />
753
                                                <TextBlock Grid.Column="1"
745
                                                               Text="{Binding AvoidConsolidate, Converter={StaticResource AvoidStringConverter}}" />
746
                                                        <TextBlock Grid.Column="1"
754 747
                                                               Foreground="Blue"
755
                                                               Text="{Binding PartConsolidate,
756
                                                                              Converter={StaticResource TeamConsoliStringConverter}}" />
757
                                                <TextBlock Grid.Column="2" Text="{Binding Consolidate, Converter={StaticResource ConsoliStringConverter}}" />
758
                                                <!--
748
                                                               Text="{Binding PartConsolidate, Converter={StaticResource TeamConsoliStringConverter}}" />
749
                                                        <TextBlock Grid.Column="2" Text="{Binding Consolidate, Converter={StaticResource ConsoliStringConverter}}" />
750
                                                        <!--
759 751
                                                        <TextBlock HorizontalAlignment="Center" Grid.Column="2">
760 752
                                                        <TextBlock.Text>
761 753
                                                        <Binding Converter="{StaticResource ConsoliStringConverter}"/>
762 754
                                                        </TextBlock.Text>
763 755
                                                        </TextBlock>
764 756
                                                    -->
765
                                            </Grid>
766
                                        </DataTemplate>
767
                                    </telerik:GridViewDataColumn.CellTemplate>
768
                                </telerik:GridViewDataColumn>
769
                                <telerik:GridViewDataColumn Header="DELETE"  IsReadOnly="True" Width="Auto">
770
                                    <telerik:GridViewDataColumn.CellTemplate>
771
                                        <DataTemplate>
772
                                            <Button Content="DELETE" Visibility="{Binding userDelete, Converter={StaticResource BooleanToVisibilityConverter}}" Click="DeleteCommentEvent" CommandParameter="{Binding}"/>
773
                                        </DataTemplate>
774
                                    </telerik:GridViewDataColumn.CellTemplate>
775
                                </telerik:GridViewDataColumn>
776
                            </telerik:RadGridView.Columns>
777
                        </telerik:RadGridView>
757
                                                    </Grid>
758
                                                </DataTemplate>
759
                                            </telerik:GridViewDataColumn.CellTemplate>
760
                                        </telerik:GridViewDataColumn>
761
                                        <telerik:GridViewDataColumn Header="DELETE"  IsReadOnly="True" Width="Auto">
762
                                            <telerik:GridViewDataColumn.CellTemplate>
763
                                                <DataTemplate>
764
                                                    <Button Content="DELETE" Visibility="{Binding userDelete, Converter={StaticResource BooleanToVisibilityConverter}}" Click="DeleteCommentEvent" CommandParameter="{Binding}"/>
765
                                                </DataTemplate>
766
                                            </telerik:GridViewDataColumn.CellTemplate>
767
                                        </telerik:GridViewDataColumn>
768
                                    </telerik:RadGridView.Columns>
769
                                </telerik:RadGridView>
778 770
                            </Grid>
779 771
                            <GridSplitter Grid.Column="1" HorizontalAlignment="Center" Width="5"  telerik:StyleManager.Theme="Office2016" />
780 772
                            <Grid Grid.Column="2" x:Name="historyPane" >
......
784 776
                                        <telerik:GridViewDataColumn Header="Slip No"  IsReadOnly="True" Width="Auto">
785 777
                                            <telerik:GridViewDataColumn.CellTemplate>
786 778
                                                <DataTemplate>
787
                                                    <telerik:RadButton Content="{Binding GroupNo}" Tag="{Binding EnsembleLink}" Margin="5" BorderThickness="0" Click="EnsembleLink_Button_Click" Background="Transparent">
788
                                                    </telerik:RadButton>
779
                                                    <telerik:RadButton Content="{Binding GroupNo}" Tag="{Binding EnsembleLink}" Margin="5" BorderThickness="0" Click="EnsembleLink_Button_Click" Background="Transparent"/>
789 780
                                                </DataTemplate>
790 781
                                            </telerik:GridViewDataColumn.CellTemplate>
791 782
                                        </telerik:GridViewDataColumn>
......
864 855
                                                    </Border>-->
865 856
                                                    <telerik:RadButton  Margin="5" BorderThickness="0" Click="RadButton_Click" CommandParameter="{Binding}" Background="Transparent"
866 857
                                                                       Visibility="{Binding IsSyncPossible, Converter={StaticResource BoolToVisibleConverter}}">
867
                                                        <telerik:RadButton.Content>
868
                                                            <Image Source="/KCOM;component/Resources/Images/MenuImage_new/file.png" Stretch="Uniform" Width="20" Height="20"/>
869
                                                        </telerik:RadButton.Content>
858
                                                        <Image Source="/KCOM;component/Resources/Images/MenuImage_new/file.png" Stretch="Uniform" Width="20" Height="20"/>
870 859
                                                    </telerik:RadButton>
871 860

  
872 861
                                                    <!--<TextBlock Text="{Binding IsSyncPossible}" HorizontalAlignment="Center"/>-->
......
879 868
                                                                            HeaderTextAlignment="Center">
880 869
                                            <telerik:GridViewDataColumn.CellTemplate>
881 870
                                                <DataTemplate>
882
                                                    <telerik:RadButton Content="Link" Tag="{Binding EnsembleLink}" Margin="5" BorderThickness="0" Click="EnsembleLink_Button_Click" Background="Transparent">
883

  
884
                                                    </telerik:RadButton>
871
                                                    <telerik:RadButton Content="Link" Tag="{Binding EnsembleLink}" Margin="5" BorderThickness="0" Click="EnsembleLink_Button_Click" Background="Transparent"/>
885 872
                                                </DataTemplate>
886 873
                                            </telerik:GridViewDataColumn.CellTemplate>
887 874
                                        </telerik:GridViewDataColumn>
......
890 877
                                <telerik:RadBusyIndicator x:Name="gridViewHistory_Busy" IsBusy="False" telerik:StyleManager.Theme="Office2016"
891 878
                                                      BusyContent="Sync Data Loading"/>
892 879
                            </Grid>
893
                    </Grid>
880
                        </Grid>
894 881
                    </telerik:RadPane>
895 882
                    <telerik:RadPane Header="PEMSS(Requirement and Bidders)" CanUserClose="False" CanFloat="False">
896 883
                        <telerik:RadTabControl>
897
                            <telerik:RadTabControl.Items>
898
                                <telerik:RadTabItem Header="Requirement">
899
                                    <view:RequirementView/>
900
                                </telerik:RadTabItem>
901
                                <telerik:RadTabItem Header="Bidders">
902
                                    <view:BiddersView/>
903
                                </telerik:RadTabItem>
904
                            </telerik:RadTabControl.Items>
884
                            <telerik:RadTabItem Header="Requirement">
885
                                <view:RequirementView/>
886
                            </telerik:RadTabItem>
887
                            <telerik:RadTabItem Header="Bidders">
888
                                <view:BiddersView/>
889
                            </telerik:RadTabItem>
905 890
                        </telerik:RadTabControl>
906 891
                    </telerik:RadPane>
907 892
                </telerik:RadPaneGroup>
KCOM/Views/RequirementView.xaml
89 89
                <telerik:RadPathButton Width="100" HorizontalAlignment="Left" Content="연결 추가" FontSize="12" Grid.ColumnSpan="2" Margin="15,2,2,2"
90 90
                                                Command="{Binding AddVPCommentCommand, Source={StaticResource ViewModel}}"
91 91
                                                ContentPlacement="Left" telerik:StyleManager.Theme="Office2016"
92
                                                CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=telerik:GridViewRow}}"
93 92
                                                PathGeometry="m4,7l0,2l3,0l0,3l2,0l0,-3l3,0l0,-2l-3,0l0,-3l-2,0l0,3l-3,0zm4,9c-4.41828,0 -8,-3.58172 -8,-8c0,-4.41828 3.58172,-8 8,-8c4.41828,0 8,3.58172 8,8c0,4.41828 -3.58172,8 -8,8zm0,0" >
94 93
                    <telerik:RadPathButton.PathStyle>
95 94
                        <Style TargetType="Path">
......
140 139
                            <DataTemplate>
141 140
                                <telerik:RadPathButton ToolTip="Delete Comment" Height="22" Width="22"
142 141
                                                Command="{Binding DelVPCommentCommand, Source={StaticResource ViewModel}}"
143
                                                CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=telerik:GridViewRow}}" Background="{x:Null}" BorderBrush="{x:Null}"
142
                                                CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}" Background="{x:Null}" BorderBrush="{x:Null}"
144 143
                                                PathGeometry="M108.319,108.319c-2.106,2.107-5.523,2.106-7.632-0.001l-0.003-0.003L70.159,77.79L39.63,108.318   c-2.106,2.108-5.523,2.107-7.634,0c-2.104-2.106-2.105-5.523,0-7.633l30.528-30.528l-30.54-30.541   c-2.106-2.104-2.106-5.521,0-7.631c2.105-2.107,5.522-2.107,7.633-0.001l30.541,30.541l30.528-30.527   c2.105-2.105,5.523-2.105,7.633,0c2.109,2.106,2.107,5.524,0,7.633L77.791,70.157l30.527,30.528   C110.427,102.794,110.427,106.212,108.319,108.319 M119.767,119.767c27.396-27.397,27.396-71.818,0-99.217   C92.37-6.849,47.947-6.85,20.547,20.548c-27.397,27.398-27.396,71.819,0.001,99.22C47.947,147.166,92.368,147.165,119.767,119.767">
145 144
                                </telerik:RadPathButton>
146 145
                            </DataTemplate>

내보내기 Unified diff

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