Skip to content

Commit 90ef545

Browse files
yagasoftyagasoft
committed
Added: Filter Details window row filtering.
Fixed: generated code 'labels' syntax error.
1 parent 1ae2b0a commit 90ef545

8 files changed

Lines changed: 392 additions & 186 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Join the chat at https://gitter.im/yagasoft/DynamicsCrm-TemplateBasedCodeGeneratorPlugin](https://badges.gitter.im/yagasoft/DynamicsCrm-TemplateBasedCodeGeneratorPlugin.svg)](https://gitter.im/yagasoft/DynamicsCrm-TemplateBasedCodeGeneratorPlugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
44

5-
### Version: 2.1.0.1
5+
### Version: 2.2.1.1
66
---
77

88
An XrmToolBox plugin that can be used to generate Early-bound code from a CRM Schema using a customisable T4 Template.
@@ -50,6 +50,9 @@ You can read a quick overview of the tool and its functionality [here](http://bl
5050

5151
## Changes
5252

53+
#### _v2.2.1.1 (2020-10-01)_
54+
+ Added: Filter Details window row filtering
55+
+ Fixed: generated code 'labels' syntax error
5356
#### _v2.1.0.1 (2020-09-28)_
5457
+ Added: recent settings list (load history)
5558
+ Added: reset option for the template text

‎TemplateCodeGeneratorPlugin/Dialogues/FilterDetails.xaml‎

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
</Grid.ColumnDefinitions>
6969
<Grid>
7070
<Grid.RowDefinitions>
71+
<RowDefinition Height="Auto" />
7172
<RowDefinition Height="Auto" />
7273
<RowDefinition Height="Auto" />
7374
<RowDefinition Height="*" />
@@ -86,7 +87,21 @@
8687
<Separator Margin="0, 5, 5, 0" />
8788
</StackPanel>
8889
<Label Grid.Row="1" Content="Attributes" FontWeight="Bold" />
89-
<DataGrid x:Name="FieldsGrid" Grid.Row="2" AutoGenerateColumns="False" SelectionMode="Extended"
90+
<Grid Grid.Row="2" Grid.ColumnSpan="3">
91+
<Grid.ColumnDefinitions>
92+
<ColumnDefinition Width="Auto" />
93+
<ColumnDefinition Width="*" />
94+
<ColumnDefinition MaxWidth="50" />
95+
<ColumnDefinition MaxWidth="50" />
96+
</Grid.ColumnDefinitions>
97+
<TextBox x:Name="TextBoxFilterAttributes" Margin="0" Grid.Column="1"
98+
KeyDown="TextBoxFilter_OnKeyDown" />
99+
<Button x:Name="ButtonFilterAttributes" Grid.Column="2" Margin="2,2,0,2" Content="Filter"
100+
Click="ButtonFilter_Click" />
101+
<Button x:Name="ButtonFilterClearAttributes" Grid.Column="3" Margin="2,2,5,2" Content="Clear"
102+
Click="ButtonFilterClear_Click" />
103+
</Grid>
104+
<DataGrid x:Name="FieldsGrid" Grid.Row="3" AutoGenerateColumns="False" SelectionMode="Extended"
90105
CanUserAddRows="False" ScrollViewer.CanContentScroll="True"
91106
ScrollViewer.VerticalScrollBarVisibility="Auto"
92107
ScrollViewer.HorizontalScrollBarVisibility="Hidden" Margin="0,0,5,0"
@@ -157,15 +172,31 @@
157172
</Grid>
158173
<Grid Grid.Column="1">
159174
<Grid.RowDefinitions>
175+
<RowDefinition Height="Auto" />
160176
<RowDefinition Height="Auto" />
161177
<RowDefinition Height="1.5*" />
162178
<RowDefinition Height="Auto" />
179+
<RowDefinition Height="Auto" />
163180
<RowDefinition Height="1.5*" />
164181
<RowDefinition Height="Auto" />
165182
<RowDefinition Height="*" />
166183
</Grid.RowDefinitions>
167184
<Label Content="One to Many Relations" FontWeight="Bold" />
168-
<DataGrid x:Name="Relations1NGrid" Grid.Row="1" AutoGenerateColumns="False" SelectionMode="Extended"
185+
<Grid Grid.Row="1" Grid.ColumnSpan="3">
186+
<Grid.ColumnDefinitions>
187+
<ColumnDefinition Width="Auto" />
188+
<ColumnDefinition Width="*" />
189+
<ColumnDefinition MaxWidth="50" />
190+
<ColumnDefinition MaxWidth="50" />
191+
</Grid.ColumnDefinitions>
192+
<TextBox x:Name="TextBoxFilter1N" Margin="0" Grid.Column="1"
193+
KeyDown="TextBoxFilter_OnKeyDown" />
194+
<Button x:Name="ButtonFilter1N" Grid.Column="2" Margin="2,2,0,2" Content="Filter"
195+
Click="ButtonFilter_Click" />
196+
<Button x:Name="ButtonFilterClear1N" Grid.Column="3" Margin="2,2,0,2" Content="Clear"
197+
Click="ButtonFilterClear_Click" />
198+
</Grid>
199+
<DataGrid x:Name="Relations1NGrid" Grid.Row="2" AutoGenerateColumns="False" SelectionMode="Extended"
169200
CanUserAddRows="False" ScrollViewer.CanContentScroll="True"
170201
ScrollViewer.VerticalScrollBarVisibility="Auto"
171202
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
@@ -208,8 +239,22 @@
208239
</DataGridTemplateColumn>
209240
</DataGrid.Columns>
210241
</DataGrid>
211-
<Label Content="Many to One Relations" Grid.Row="2" FontWeight="Bold" />
212-
<DataGrid x:Name="RelationsN1Grid" Grid.Row="3" AutoGenerateColumns="False" SelectionMode="Extended"
242+
<Label Content="Many to One Relations" Grid.Row="3" FontWeight="Bold" />
243+
<Grid Grid.Row="4" Grid.ColumnSpan="3">
244+
<Grid.ColumnDefinitions>
245+
<ColumnDefinition Width="Auto" />
246+
<ColumnDefinition Width="*" />
247+
<ColumnDefinition MaxWidth="50" />
248+
<ColumnDefinition MaxWidth="50" />
249+
</Grid.ColumnDefinitions>
250+
<TextBox x:Name="TextBoxFilterN1" Margin="0" Grid.Column="1"
251+
KeyDown="TextBoxFilter_OnKeyDown" />
252+
<Button x:Name="ButtonFilterN1" Grid.Column="2" Margin="2,2,0,2" Content="Filter"
253+
Click="ButtonFilter_Click" />
254+
<Button x:Name="ButtonFilterClearN1" Grid.Column="3" Margin="2,2,0,2" Content="Clear"
255+
Click="ButtonFilterClear_Click" />
256+
</Grid>
257+
<DataGrid x:Name="RelationsN1Grid" Grid.Row="5" AutoGenerateColumns="False" SelectionMode="Extended"
213258
CanUserAddRows="False" ScrollViewer.CanContentScroll="True"
214259
ScrollViewer.VerticalScrollBarVisibility="Auto"
215260
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
@@ -268,8 +313,8 @@
268313
</DataGridTemplateColumn>
269314
</DataGrid.Columns>
270315
</DataGrid>
271-
<Label Content="Many to Many Relations" Grid.Row="4" FontWeight="Bold" />
272-
<DataGrid x:Name="RelationsNnGrid" Grid.Row="5" AutoGenerateColumns="False" SelectionMode="Extended"
316+
<Label Content="Many to Many Relations" Grid.Row="6" FontWeight="Bold" />
317+
<DataGrid x:Name="RelationsNnGrid" Grid.Row="7" AutoGenerateColumns="False" SelectionMode="Extended"
273318
CanUserAddRows="False" ScrollViewer.CanContentScroll="True"
274319
ScrollViewer.VerticalScrollBarVisibility="Auto"
275320
ScrollViewer.HorizontalScrollBarVisibility="Hidden"

0 commit comments

Comments
 (0)