Skip to content

Commit

Permalink
Slight picklist editor UI adjustement
Browse files Browse the repository at this point in the history
  • Loading branch information
ghuotvez committed Nov 21, 2024
1 parent bf92fcc commit 1c78e75
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions GSCFieldApp/Dictionaries/DatabaseLiterals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ public enum TableNames { meta, location, station, earthmat, sample, mineralizati
public const string KeywordColourGeneric = "COLOUR_GENERIC"; //Name of the generic colour picklist within M_DICTIONNARY_MANAGER
public const string KeywordColourIntensity = "COLOUR_INTENSITY"; //Name of the intensity colour picklist within M_DICTIONNARY_MANAGER
public const string KeywordColourQualifier = "COLOUR_QUALIFIER"; //Name of the qualifier colour picklist within M_DICTIONNARY_MANAGER
public const string KeywordLinework = "line"; //Used for picklist editor
#endregion

#region Database guids
Expand Down
5 changes: 4 additions & 1 deletion GSCFieldApp/ViewModel/PicklistViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,10 @@ private async Task<ComboBox> FillTablePicklist(SQLiteAsyncConnection inConnectio
{
voc.Description = LocalizationResourceManager["FielNotesStructureHeader"].ToString();
}

if (vcms.ThemeAssignTable.ToLower().Contains(KeywordLinework))
{
voc.Description = LocalizationResourceManager["FielNotesLineworkHeader"].ToString();
}
//Prevent bs from beind added.
if (voc.Code != null && voc.Code != string.Empty)
{
Expand Down
4 changes: 2 additions & 2 deletions GSCFieldApp/Views/PicklistPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
</Grid.RowDefinitions>

<ScrollView Orientation="Vertical" Grid.Row="0">
<VerticalStackLayout>
<VerticalStackLayout Margin="20">

<!--Picklist selection-->
<Border Stroke="Transparent">
<VerticalStackLayout>
<VerticalStackLayout >

<!--Text section-->
<Label Style="{StaticResource FieldAppTitle}" Text="{local:Localize PicklistPageHeading}"/>
Expand Down

0 comments on commit 1c78e75

Please sign in to comment.