프로젝트

일반

사용자정보

개정판 3d918d31

ID3d918d312f56504425437f790f7753155f2573bb
상위 b10671a4
하위 df2e7646

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

RequirementView layout 변경

Change-Id: Ia66696cbb15d4632fb8a0003702b04f1d6fce39a

차이점 보기:

KCOM/Converters/StringMultiLineConvert.cs
20 20

  
21 21
                //var array = str.Split(new char[] { '\\', 'n' }, StringSplitOptions.RemoveEmptyEntries);
22 22
                var array = System.Text.RegularExpressions.Regex.Split(str, "\n");
23
                array.ToList().ForEach(x => builder.AppendLine(x));
23

  
24
                int takeLineCount = array.Count();
25

  
26
                if (parameter != null)
27
                {
28
                    int.TryParse(parameter.ToString(), out takeLineCount);
29
                }
30

  
31
                array.Take(takeLineCount).ToList().ForEach(x => builder.AppendLine(x));
24 32
            }
25 33

  
26 34
            return builder.ToString();
KCOM/KCOM.csproj
291 291
    <Compile Include="Controls\addToFavoriteWindow_Internal.xaml.cs">
292 292
      <DependentUpon>addToFavoriteWindow_Internal.xaml</DependentUpon>
293 293
    </Compile>
294
    <Compile Include="Controls\DataNavigation.xaml.cs">
295
      <DependentUpon>DataNavigation.xaml</DependentUpon>
296
    </Compile>
294 297
    <Compile Include="Controls\ExtendTextBox.xaml.cs">
295 298
      <DependentUpon>ExtendTextBox.xaml</DependentUpon>
296 299
    </Compile>
300
    <Compile Include="Converters\IListToIListCountConverter.cs" />
297 301
    <Compile Include="Converters\StringMultiLineConvert.cs" />
298 302
    <Compile Include="Extensions\CollectionExtenstions.cs" />
299 303
    <Compile Include="Extensions\MatrixHelper.cs" />
......
395 399
      <Generator>MSBuild:Compile</Generator>
396 400
      <SubType>Designer</SubType>
397 401
    </Page>
402
    <Page Include="Controls\DataNavigation.xaml">
403
      <SubType>Designer</SubType>
404
      <Generator>MSBuild:Compile</Generator>
405
    </Page>
398 406
    <Page Include="Controls\ExtendTextBox.xaml">
399 407
      <SubType>Designer</SubType>
400 408
      <Generator>MSBuild:Compile</Generator>
KCOM/Views/MainMenu.xaml
570 570
            <telerik:RadSplitContainer Orientation="Horizontal" InitialPosition="DockedBottom">
571 571
                <telerik:RadPaneGroup telerik:StyleManager.Theme="Office2016" telerik:ProportionalStackPanel.RelativeSize="140, 100">
572 572
                    <telerik:RadPane Header="Document Information"  CloseButtonVisibility="Collapsed">
573
                    <telerik:RadLayoutControl ScrollViewer.HorizontalScrollBarVisibility="Disabled" SelectedItem="{x:Null}">
574
                        <telerik:LayoutControlExpanderGroup IsExpandable="False" x:Name="infoListPane"  Header="User information List" telerik:StyleManager.Theme="Office2016">
573
                        <telerik:RadLayoutControl ScrollViewer.HorizontalScrollBarVisibility="Disabled"   ScrollViewer.VerticalScrollBarVisibility="Disabled" SelectedItem="{x:Null}">
574
                            <telerik:LayoutControlExpanderGroup ScrollViewer.HorizontalScrollBarVisibility="Disabled"   ScrollViewer.VerticalScrollBarVisibility="Disabled"  IsExpandable="False" x:Name="infoListPane"  Header="User information List" telerik:StyleManager.Theme="Office2016">
575 575
                            <telerik:RadGridView telerik:StyleManager.Theme="Office2013" ShowGroupPanel="True" ShowGroupFooters="False" AutoExpandGroups="True"  x:Name="gridViewMarkup"
576 576
                                             AutoGenerateColumns="False" HorizontalContentAlignment="Center" SelectionChanged="gridViewMarkup_SelectionChanged" SelectionMode="Multiple"
577 577
                                             CanUserDeleteRows="True" CanUserInsertRows="False" IsFilteringAllowed="False" RowIndicatorVisibility="Collapsed" 
KCOM/Views/RequirementView.xaml
13 13
        xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
14 14
        mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="1000" DataContext="{DynamicResource ViewModel}">
15 15
    <UserControl.Resources>
16
        <convert:IListToIListCountConverter x:Key="IListToIListCountConverter"/>
16 17
        <viewmodel:RequirementViewModel x:Key="ViewModel"/>
17 18
        <convert:StringMultiLineConvert x:Key="StringMultiLineConvert"/>
18 19
    </UserControl.Resources>
......
24 25
            <i:InvokeCommandAction Command="{Binding ClosingCommand}"/>
25 26
        </i:EventTrigger>
26 27
    </i:Interaction.Triggers>
27
    <telerik:RadLayoutControl  ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" SelectedItem="{x:Null}">
28
        <telerik:LayoutControlExpanderGroup IsExpandable="False" telerik:StyleManager.Theme="Office2016">
29
            <telerik:RadGridView telerik:StyleManager.Theme="Office2016" AutoGenerateColumns="False" ItemsSource="{Binding RequirementList}" ShowGroupPanel="False"
28
    <telerik:RadLayoutControl ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" SelectedItem="{x:Null}">
29
        <Grid Background="White">
30
                <Grid.RowDefinitions>
31
                    <RowDefinition Height="Auto"/>
32
                    <RowDefinition/>
33
                </Grid.RowDefinitions>
34
                <!--<telerik:RadGridView telerik:StyleManager.Theme="Office2016" AutoGenerateColumns="False" ItemsSource="{Binding RequirementList}" ShowGroupPanel="False"
30 35
                              CanUserFreezeColumns="False" x:Name="Gridview" SelectedItem="{Binding SelectRequirement}"
31 36
                              RowIndicatorVisibility="Collapsed" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
32 37
                              IsExpandedBinding="{Binding IsExpanded,Mode=TwoWay}" IsExpandableBinding="{Binding IsExpandable, Mode=TwoWay}"
33 38
                             GridLinesVisibility="Horizontal" HorizontalGridLinesBrush="Orange">
34
                <i:Interaction.Behaviors>
35
                    <Behaviors:ColumnFilterBehavior DefaultOperator="Contains"/>
36
                </i:Interaction.Behaviors>
37
                <telerik:RadGridView.Columns>
38
                    <telerik:GridViewDataColumn Header="Commant" IsReadOnly="True" IsFilterable="True"
39
                    <i:Interaction.Behaviors>
40
                        <Behaviors:ColumnFilterBehavior DefaultOperator="Contains"/>
41
                    </i:Interaction.Behaviors>
42
                    <telerik:RadGridView.Columns>
43
                        <telerik:GridViewDataColumn Header="Commant" IsReadOnly="True" IsFilterable="True"
39 44
                                            TextAlignment="Left" TextWrapping="WrapWithOverflow"
40 45
                                            DataMemberBinding="{Binding mdText,Converter={StaticResource StringMultiLineConvert}}">
41
                    </telerik:GridViewDataColumn>
42
                </telerik:RadGridView.Columns>
43
            </telerik:RadGridView>
44
        </telerik:LayoutControlExpanderGroup>
45
        <telerik:LayoutControlSplitter/>
46
            <Grid >
46
                        </telerik:GridViewDataColumn>
47
                    </telerik:RadGridView.Columns>
48
                </telerik:RadGridView>-->
49
            <Grid>
50
                <Grid.ColumnDefinitions>
51
                    <ColumnDefinition Width="2*"/>
52
                    <ColumnDefinition Width="10"/>
53
                    <ColumnDefinition Width="6*"/>
54
                    <ColumnDefinition Width="10"/>
55
                    <ColumnDefinition Width="2*"/>
56
                </Grid.ColumnDefinitions>
47 57
                <Grid.RowDefinitions>
48 58
                    <RowDefinition Height="Auto"/>
49
                    <RowDefinition  Height="Auto"/>
59
                    <RowDefinition Height="Auto"/>
50 60
                </Grid.RowDefinitions>
51
                <StackPanel>
52
                    <telerik:RadPathButton Width="100" HorizontalAlignment="Left" Content="연결 추가" FontSize="12" Grid.ColumnSpan="2" Margin="15,2,2,2"
53
                                                    Command="{Binding AddVPCommentCommand, Source={StaticResource ViewModel}}"
54
                                                    ContentPlacement="Left" telerik:StyleManager.Theme="Office2016"
55
                                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=telerik:GridViewRow}}"
56
                                                   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" >
57
                        <telerik:RadPathButton.PathStyle>
58
                            <Style TargetType="Path">
59
                                <Setter Property="Width" Value="18"/>
60
                                <Setter Property="Height" Value="18"/>
61
                                <Setter Property="Fill" Value="#FF0A93E2" />
62
                                <Setter Property="Stretch" Value="Fill" />
63
                                <Setter Property="HorizontalAlignment" Value="Right" />
64
                                <Setter Property="VerticalAlignment" Value="Center" />
65
                            </Style>
66
                        </telerik:RadPathButton.PathStyle>
67
                    </telerik:RadPathButton>
68
                </StackPanel>
69
                <telerik:RadGridView x:Name="DetailGridView" GroupRenderMode="Flat" Grid.Row="1"
70
										 BorderThickness="0,1,0,1" Grid.Column="1" telerik:StyleManager.Theme="Office2016"
71
										 GridLinesVisibility="Both"
72
                                             ScrollViewer.HorizontalScrollBarVisibility="Disabled"  ColumnWidth="Auto"
73
										 CanUserFreezeColumns="False" HorizontalGridLinesBrush="#FFB0AFAF"
74
										 AutoGenerateColumns="False" behavior:GridViewAutoWidthBehavior.IsEnabled="True"
75
										 ItemsSource="{Binding SelectRequirement.VpComments}"
76
										 ShowGroupPanel="False" SelectedItem="{Binding SelectVPComment, Source={StaticResource ViewModel}}"
77
										 IsReadOnly="True" VerticalAlignment="Top">
78
                    <i:Interaction.Triggers>
79
                        <i:EventTrigger  EventName="SelectionChanged">
80
                            <i:InvokeCommandAction Command="{Binding SelectedVPCommentCommand, Source={StaticResource ViewModel}}"/>
81
                        </i:EventTrigger>
82
                    </i:Interaction.Triggers>
83
                    <telerik:RadGridView.Columns>
61
                <controls:DataNavigation HorizontalAlignment="Center" Grid.Column="2"
62
                                         ItemSource="{Binding RequirementList,Mode=TwoWay}"
63
                                         CurrentItem="{Binding SelectRequirement,Mode=TwoWay}"/>
64
                <telerik:RadToggleButton Content="검색" Width="60" Grid.Column="4" Margin="5"/>
65
                <Line Grid.Row="1" Grid.ColumnSpan="5" Fill="#FFB9B9B9" Margin="5,0" X1="0" X2="1" Y1="1" Stretch="Fill"  Y2="1" Stroke="#FFB0B0B0"/>
66
            </Grid>
67
            <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" BorderThickness="1" BorderBrush="Gray">
68
                    <TextBlock Margin="3" TextWrapping="WrapWithOverflow" Text="{Binding SelectRequirement.mdText,Converter={StaticResource StringMultiLineConvert}}"/>
69
                </ScrollViewer>
70
            </Grid>
71
        <telerik:LayoutControlSplitter/>
72
        <Grid >
73
            <Grid.RowDefinitions>
74
                <RowDefinition Height="Auto"/>
75
                <RowDefinition  Height="Auto"/>
76
            </Grid.RowDefinitions>
77
            <StackPanel>
78
                <telerik:RadPathButton Width="100" HorizontalAlignment="Left" Content="연결 추가" FontSize="12" Grid.ColumnSpan="2" Margin="15,2,2,2"
79
                                                Command="{Binding AddVPCommentCommand, Source={StaticResource ViewModel}}"
80
                                                ContentPlacement="Left" telerik:StyleManager.Theme="Office2016"
81
                                                CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=telerik:GridViewRow}}"
82
                                                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" >
83
                    <telerik:RadPathButton.PathStyle>
84
                        <Style TargetType="Path">
85
                            <Setter Property="Width" Value="18"/>
86
                            <Setter Property="Height" Value="18"/>
87
                            <Setter Property="Fill" Value="#FF0A93E2" />
88
                            <Setter Property="Stretch" Value="Fill" />
89
                            <Setter Property="HorizontalAlignment" Value="Right" />
90
                            <Setter Property="VerticalAlignment" Value="Center" />
91
                        </Style>
92
                    </telerik:RadPathButton.PathStyle>
93
                </telerik:RadPathButton>
94
            </StackPanel>
95
            <telerik:RadGridView x:Name="DetailGridView" GroupRenderMode="Flat" Grid.Row="1"
96
										BorderThickness="0,1,0,1" Grid.Column="1" telerik:StyleManager.Theme="Office2016"
97
										GridLinesVisibility="Both"
98
                                            ScrollViewer.HorizontalScrollBarVisibility="Disabled"  ColumnWidth="Auto"
99
										CanUserFreezeColumns="False" HorizontalGridLinesBrush="#FFB0AFAF"
100
										AutoGenerateColumns="False" behavior:GridViewAutoWidthBehavior.IsEnabled="True"
101
										ItemsSource="{Binding SelectRequirement.VpComments}"
102
										ShowGroupPanel="False" SelectedItem="{Binding SelectVPComment, Source={StaticResource ViewModel}}"
103
										IsReadOnly="True" VerticalAlignment="Top">
104
                <i:Interaction.Triggers>
105
                    <i:EventTrigger  EventName="SelectionChanged">
106
                        <i:InvokeCommandAction Command="{Binding SelectedVPCommentCommand, Source={StaticResource ViewModel}}"/>
107
                    </i:EventTrigger>
108
                </i:Interaction.Triggers>
109
                <telerik:RadGridView.Columns>
84 110
                    <telerik:GridViewDataColumn DataMemberBinding="{Binding createdByName}"  Width="120" IsFilterable="False" IsReadOnly="True"
85
														Header="Create User" />
111
													Header="Create User" />
86 112
                    <telerik:GridViewDataColumn DataMemberBinding="{Binding comment}" Width="200" TextAlignment="Left" IsReadOnly="True" TextTrimming="CharacterEllipsis" IsFilterable="False" 
87
														Header="Comment" />
113
													Header="Comment" />
88 114
                    <telerik:GridViewDataColumn DataMemberBinding="{Binding condition,Mode=TwoWay}" Header="Condition" Width="Auto"  IsReadOnly="True"/>
89
                        <telerik:GridViewDataColumn Width="Auto" Header="연결 제거" IsFilterable="False" IsReadOnly="True">
90
                            <telerik:GridViewDataColumn.CellTemplate>
91
                                <DataTemplate>
92
                                    <telerik:RadPathButton ToolTip="Delete Comment" Height="22" Width="22"
93
                                                    Command="{Binding DelVPCommentCommand, Source={StaticResource ViewModel}}"
94
                                                    CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=telerik:GridViewRow}}" Background="{x:Null}" BorderBrush="{x:Null}"
95
                                                    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">
96
                                    </telerik:RadPathButton>
97
                                </DataTemplate>
98
                            </telerik:GridViewDataColumn.CellTemplate>
99
                        </telerik:GridViewDataColumn>
100
                    </telerik:RadGridView.Columns>
101
                </telerik:RadGridView>
102
            </Grid>
115
                    <telerik:GridViewDataColumn Width="Auto" Header="연결 제거" IsFilterable="False" IsReadOnly="True">
116
                        <telerik:GridViewDataColumn.CellTemplate>
117
                            <DataTemplate>
118
                                <telerik:RadPathButton ToolTip="Delete Comment" Height="22" Width="22"
119
                                                Command="{Binding DelVPCommentCommand, Source={StaticResource ViewModel}}"
120
                                                CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=telerik:GridViewRow}}" Background="{x:Null}" BorderBrush="{x:Null}"
121
                                                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">
122
                                </telerik:RadPathButton>
123
                            </DataTemplate>
124
                        </telerik:GridViewDataColumn.CellTemplate>
125
                    </telerik:GridViewDataColumn>
126
                </telerik:RadGridView.Columns>
127
            </telerik:RadGridView>
128
        </Grid>
103 129
    </telerik:RadLayoutControl>
104 130
</UserControl>
KCOM/Views/RequirementView.xaml.cs
24 24
            InitializeComponent();
25 25
        }
26 26

  
27
        private void DataNavigation_GiveFeedback(object sender, GiveFeedbackEventArgs e)
28
        {
29

  
30
        }
27 31
    }
28 32
}

내보내기 Unified diff

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