Skip to content

Commit 2219ee3

Browse files
manas-droidmanas-droid
authored
Merge pull request #3750 from Ginger-Automation/Defect/OracleVerSerialization
[DefectID: 39391]Oracle Version Serialization and showed it in the Edit Database Page
2 parents 3a49aeb + daa6c50 commit 2219ee3

3 files changed

Lines changed: 32 additions & 11 deletions

File tree

‎Ginger/Ginger/Variables/EditDatabasePage.xaml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@
1414
<StackPanel Background="{StaticResource $BackgroundColor_White}" Margin="10,10,10,10" Orientation="Vertical">
1515

1616
<StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0" >
17-
<Label Style="{StaticResource $LabelStyle}" Width="150" FontSize="13" Content="Database:"/>
17+
<Label Style="{StaticResource $LabelStyle}" Width="180" FontSize="13" Content="Database:"/>
1818
<TextBox x:Name="xDatabaseType" IsReadOnly="True" Width="250" Style="{StaticResource $TextBoxStyle}" Background="#FFEFEFF2" Margin="0,0,50,0" />
1919
</StackPanel>
2020

2121
<StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
22-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="Database Name:" />
22+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="Database Name:" />
2323
<TextBox Style="{StaticResource $TextBoxStyle}" Height="25" LostKeyboardFocus="XDatabaseName_TextChanged" x:Name="xDatabaseName" Width="250" Margin="0,0,0,8" ></TextBox>
2424
</StackPanel>
2525

2626
<StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
27-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="Description:"/>
27+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="Description:"/>
2828
<TextBox Style="{StaticResource $TextBoxStyle}" x:Name="xDatabaseDescription" Width="250"></TextBox>
2929
</StackPanel>
3030
<StackPanel x:Name="xDatabaseDetailsPanel">
3131
<StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
32-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="Data Source" Name="xDatabaseTNSName"/>
32+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="Data Source" Name="xDatabaseTNSName"/>
3333
<businessflowwindows:UCValueExpression x:Name="xDatabaseTNS" Width="280"></businessflowwindows:UCValueExpression>
3434
</StackPanel>
3535

3636
<StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" Margin="0,10,0,0">
37-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="User Name:"/>
37+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="User Name:"/>
3838
<businessflowwindows:UCValueExpression x:Name="xDatabaseUserName" Width="280"></businessflowwindows:UCValueExpression>
3939
</StackPanel>
4040

4141
<StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0" >
42-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="User Password:"/>
42+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="User Password:"/>
4343
<businessflowwindows:UCValueExpression x:Name="xDatabasePassword" Width="280" LostKeyboardFocus="ChangeDatabasePass"></businessflowwindows:UCValueExpression>
4444
</StackPanel>
4545

@@ -48,17 +48,17 @@
4848
<StackPanel Name="xCosmosDetailsPanel" Visibility="Collapsed">
4949

5050
<StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
51-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="Account End Point:" />
51+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="Account End Point:" />
5252
<businessflowwindows:UCValueExpression x:Name="xDBAccEndPoint" Width="280" Height="25"></businessflowwindows:UCValueExpression>
5353
</StackPanel>
5454

5555
<StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
56-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="Account Key:" />
56+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="Account Key:" />
5757
<businessflowwindows:UCValueExpression x:Name="xDBAccKey" Width="280" Height="25"></businessflowwindows:UCValueExpression>
5858
</StackPanel>
5959
</StackPanel>
6060
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
61-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="Connection String:"/>
61+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="Connection String:"/>
6262
<StackPanel Orientation="Horizontal">
6363
<businessflowwindows:UCValueExpression x:Name="xDatabaseConnectionString" MinHeight="20" MaxHeight="40" Width="280"></businessflowwindows:UCValueExpression>
6464
<usercontrols:ImageMakerControl
@@ -68,9 +68,14 @@
6868
</StackPanel>
6969

7070
<StackPanel Orientation="Horizontal" Name="xKeepConnectOpenPanel" Margin="0,10,0,0" >
71-
<Label Style="{StaticResource $LabelStyle}" Width="150" Content="Keep Connection Open:"/>
71+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="Keep Connection Open:"/>
7272
<CheckBox VerticalAlignment="Center" Name="xKeepConnectOpen" ></CheckBox>
7373
</StackPanel>
74+
75+
<StackPanel Orientation="Horizontal" Name="xVersionStackPanel" Visibility="Collapsed" Margin="0,10,0,0">
76+
<Label Style="{StaticResource $LabelStyle}" Width="180" Content="Is DB Version lower than 10.2:"/>
77+
<CheckBox VerticalAlignment="Center" Name="xOracleVersion"></CheckBox>
78+
</StackPanel>
7479

7580
</StackPanel>
7681
</Border>

‎Ginger/Ginger/Variables/EditDatabasePage.xaml.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public EditDatabasePage(Database database, Context context)
3838
BindingHandler.ObjFieldBinding(xDatabaseName, TextBox.TextProperty, database, nameof(Database.Name));
3939
BindingHandler.ObjFieldBinding(xDatabaseDescription, TextBox.TextProperty, database, nameof(Database.Description));
4040
BindingHandler.ObjFieldBinding(xKeepConnectOpen, CheckBox.IsCheckedProperty, database, nameof(Database.KeepConnectionOpen));
41+
BindingHandler.ObjFieldBinding(xOracleVersion, CheckBox.IsCheckedProperty, database, nameof(Database.IsOracleVersionLow));
42+
4143
BindingHandler.ObjFieldBinding(xDatabaseType, TextBox.TextProperty, database, nameof(Database.DBType));
4244

4345
xDatabaseName.AddValidationRule(new DBNameValidationRule());
@@ -53,6 +55,10 @@ public EditDatabasePage(Database database, Context context)
5355
xDatabaseDetailsPanel.Visibility = System.Windows.Visibility.Visible;
5456
ChangeTheTNSName();
5557
ShowBrowseBtn();
58+
if (database.DBType.Equals(eDBTypes.Oracle))
59+
{
60+
xVersionStackPanel.Visibility = System.Windows.Visibility.Visible;
61+
}
5662
}
5763

5864
}

‎Ginger/GingerCoreCommon/Database/Database.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,17 @@ public eDBTypes DBType
178178
public string Pass { get { return mPass; } set { if (mPass != value) { mPass = value; OnPropertyChanged(nameof(Pass)); } } }
179179

180180
// checks if oracle version is lower than 10.2
181-
public bool IsOracleVersionLow { get; set; } = false;
181+
private bool mIsOracleVersionLow;
182+
[IsSerializedForLocalRepository]
183+
public bool IsOracleVersionLow
184+
{
185+
get { return mIsOracleVersionLow; }
186+
set
187+
{
188+
mIsOracleVersionLow = value;
189+
OnPropertyChanged(nameof(IsOracleVersionLow));
190+
}
191+
}
182192

183193
public static List<string> DbTypes
184194
{

0 commit comments

Comments
 (0)