update docs for new release

.gitignore

@@ -360,4 +360,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+/site

BGS/CombatZone.cs

@@ -6,6 +6,13 @@ namespace EliteBGS.BGS {
         public string Type { get; set; }
         public string Grade { get; set; }
         public int Amount { get; set; }
+        public DateTime Completed { get; set; } = DateTime.UtcNow;
+
+        public override string CompletedAt {
+            get {
+                return Completed.ToString("dd.MM.yyyy HH:mm UTC");
+            }
+        }
 
         public int CompareTo(object obj) {
             if (obj.GetType() != typeof(CombatZone)) {

BGS/DiscordLogGenerator.cs

@@ -33,7 +33,7 @@ namespace EliteBGS.BGS {
             StringBuilder log = new StringBuilder();
 
             log.AppendFormat("**Date:** {0}\n", DateTime.Now.ToString("dd/MM/yyyy"));
-            log.AppendFormat("**Location:** {0}\n", objective.ToShortString());
+            log.AppendFormat("**Location:** {0}\n", objective.ToLocationString());
             log.AppendFormat("**Faction:** {0}\n", objective.Faction);
             log.AppendLine("");
             log.AppendLine("```");

BGS/LogEntry.cs

@@ -22,7 +22,7 @@ namespace EliteBGS.BGS {
                 }
 
                 Entry last = items.Last();
-                return last.Timestamp.ToString("dd.MM.yyyy hh:mm UTC");
+                return last.Timestamp.ToString("dd.MM.yyyy HH:mm UTC");
             }
         }
 

BGS/NonaDiscordLog.cs

@@ -15,6 +15,8 @@ namespace EliteBGS.BGS {
                 suffix = "st";
             } else if (today.Day == 2 || today.Day == 22) {
                 suffix = "nd";
+            } else if (today.Day == 23) {
+                suffix = "rd";
             } else {
                 suffix = "th";
             }
@@ -31,7 +33,7 @@ namespace EliteBGS.BGS {
         protected override string GenerateObjectiveHeader(Objective objective) {
             StringBuilder log = new StringBuilder();
 
-            log.AppendFormat(":globe_with_meridians: `Location:` {0}\n", objective.ToShortString());
+            log.AppendFormat(":globe_with_meridians: `Location:` {0}\n", objective.ToLocationString());
             log.Append(":clipboard: `Conducted:`\n");
             log.Append("```");
 

BGS/Objective.cs

@@ -5,37 +5,30 @@ using Newtonsoft.Json;
 
 namespace EliteBGS.BGS {
     public class Objective : IComparable<Objective> {
-        private string system;
-        private string station;
-        private string faction;
-
-        private List<LogEntry> entries = new List<LogEntry>();
-
         [JsonIgnore]
         public bool IsEnabled { get; set; }
 
         [JsonIgnore]
-        public List<LogEntry> Children {
+        public List<LogEntry> Children { get; } = new List<LogEntry>();
-            get => entries;
-        }
 
         [JsonIgnore]
-        public string Name => this.ToString();
+        public string Name {
+            get { return this.ToString(); }
+        }
 
         [JsonIgnore]
         public bool IsExpanded { get; set; }
 
         [JsonIgnore]
         public List<LogEntry> LogEntries {
-            get => entries;
+            get => Children;
-            set => entries = value;
         }
 
         public void Clear() {
-            if (entries == null) {
+            if (LogEntries == null) {
                 return;
             }
-            entries.RemoveAll(x => !x.ManuallyAdded);
+            LogEntries.RemoveAll(x => !x.ManuallyAdded);
         }
 
         public bool ManuallyAdded { get; set; }
@@ -49,8 +42,8 @@ namespace EliteBGS.BGS {
                 }
             }
 
-            if (e.Faction != null && faction != null) {
+            if (e.Faction != null && Faction != null) {
-                if (string.Compare(e.Faction, faction, true) != 0) {
+                if (string.Compare(e.Faction, Faction, true) != 0) {
                     /* if we have a faction, and it doesn't match we don't care.
                      * faction is the most important comparision, so if it doesn't match
                      * it is not the right objective
@@ -62,18 +55,13 @@ namespace EliteBGS.BGS {
             }
 
             /* system and station only add to the match strength though */
-            if (e.System != null && system != null) {
+            if (e.System != null && System != null) {
-                if (string.Compare(e.System, system, true) == 0) {
+                if (string.Compare(e.System, System, true) == 0) {
                     ++match_count;
                 }
             }
 
-            /* if system and faction already match, station is not so important */
+            /* station does not matter */
-            if (e.Station != null && station != null) {
-                if (string.Compare(e.Station, station, true) == 0) {
-                    ++match_count;
-                }
-            }
 
             return match_count;
         }
@@ -86,51 +74,36 @@ namespace EliteBGS.BGS {
 
         public bool IsValid => System != null && Faction != null;
 
-        public string System {
+        public string System { get; set; }
-            get { return system; }
-            set { system = value; }
-        }
 
-        public string Station {
+        public string Station { get; set; }
-            get { return station; }
-            set { station = value; }
-        }
 
-        public string Faction {
+        public string Faction { get; set; }
-            get { return faction; }
-            set { faction = value; }
-        }
 
         public override string ToString() {
             StringBuilder str = new StringBuilder();
-            if (system != null && system.Length > 0) {
+            if (!string.IsNullOrEmpty(System)) {
-                str.AppendFormat("System: {0}", system);
+                str.AppendFormat("System: {0}", System);
             }
-            if (station != null && station.Length > 0) {
+            if (!string.IsNullOrEmpty(Faction)) {
                 if (str.Length > 0) {
                     str.Append(", ");
                 }
-                str.AppendFormat("Station: {0}", station);
+                str.AppendFormat("Faction: {0}", Faction);
-            }
-            if (faction != null && faction.Length > 0) {
-                if (str.Length > 0) {
-                    str.Append(", ");
-                }
-                str.AppendFormat("Faction: {0}", faction);
             }
             return str.ToString();
         }
 
-        public string ToShortString() {
+        public string ToLocationString() {
             StringBuilder str = new StringBuilder();
-            if (system != null && system.Length > 0) {
+            if (!string.IsNullOrEmpty(System)) {
-                str.AppendFormat("{0}", system);
+                str.AppendFormat("{0}", System);
             }
-            if (station != null && station.Length > 0) {
+            if (!string.IsNullOrEmpty(Station)) {
                 if (str.Length > 0) {
                     str.Append(", ");
                 }
-                str.AppendFormat("{0}", station);
+                str.AppendFormat("{0}", Station);
             }
             return str.ToString();
         }

BGS/Report.cs

@@ -49,7 +49,7 @@ namespace EliteBGS.BGS {
                 ;
         }
 
-        public void Scan(PlayerJournal journal, DateTime start, DateTime end) {
+        public void Scan(PlayerJournal journal, DateTime start, DateTime end, bool CollateEntries = true) {
             /* Log files only get rotated if you restart the game client. This means that there might
              * be - say - entries from the 4th of May in the file with a timestamp of 3rd of May. This
              * happens if you happen to play a session late into the night.
@@ -72,10 +72,10 @@ namespace EliteBGS.BGS {
                 .Where(e => e.Timestamp >= start && e.Timestamp < actualend)
                 .ToList()
                 ;
-            Scan(entries);
+            Scan(entries, CollateEntries);
         }
 
-        public void Scan(List<Entry> entries) {
+        public void Scan(List<Entry> entries, bool CollateEntries = true) {
             if (entries.Count <= 0) {
                 return;
             }
@@ -198,7 +198,7 @@ namespace EliteBGS.BGS {
                         System = current_system,
                         Faction = faction,
                     });
-                    collate = true;
+                    collate = CollateEntries;
                 } else if (e.Is(Events.MissionCompleted)) {
                     MissionCompletedEntry completed = e as MissionCompletedEntry;
                     MissionAcceptedEntry accepted = null;
@@ -411,7 +411,7 @@ namespace EliteBGS.BGS {
 
                     /* Mission failed should be collated if they are in the same system/station
                      */
-                    collate = true;
+                    collate = CollateEntries;
                 } else if (e.Is(Events.SellExplorationData)) {
                     results.Add(new Cartographics(e as SellExplorationDataEntry) {
                         System = current_system,
@@ -420,7 +420,7 @@ namespace EliteBGS.BGS {
                     });
 
                     /* colate single cartographic selling into one */
-                    collate = true;
+                    collate = CollateEntries;
                 } else if (e.Is(Events.SellOrganicData)) {
                     /* organic data sold to Vista Genomics */
                     results.Add(new OrganicData(e as SellOrganicDataEntry) {
@@ -429,7 +429,7 @@ namespace EliteBGS.BGS {
                         Faction = controlling_faction,
                     });
 
-                    collate = true;
+                    collate = CollateEntries;
                 } else if (e.Is(Events.MultiSellExplorationData)) {
                     /* For multi-sell-exploraton-data only the controlling faction of the station sold to matters.
                      */
@@ -439,7 +439,7 @@ namespace EliteBGS.BGS {
                         Faction = controlling_faction
                     });
 
-                    collate = true;
+                    collate = CollateEntries;
                 } else if (e.Is(Events.RedeemVoucher)) {
                     RedeemVoucherEntry voucher = e as RedeemVoucherEntry;
                     List<Faction> current_factions = new List<Faction>();
@@ -470,7 +470,7 @@ namespace EliteBGS.BGS {
                         });
                     }
 
-                    collate = true;
+                    collate = CollateEntries;
                 } else if (e.Is(Events.SellMicroResources)) {
                     results.Add(new SellMicroResources(e as SellMicroResourcesEntry) {
                         Faction = controlling_faction,
@@ -490,7 +490,7 @@ namespace EliteBGS.BGS {
                         System = current_system,
                     });
 
-                    collate = true;
+                    collate = CollateEntries;
                 } else if (e.Is(Events.SearchAndRescue)) {
                     results.Add(new SearchAndRescue(e as SearchAndRescueEntry) {
                         Faction = controlling_faction,
@@ -498,7 +498,7 @@ namespace EliteBGS.BGS {
                         System = current_system,
                     });
 
-                    collate = true;
+                    collate = CollateEntries;
                 } else if (e.Is(Events.MarketSell)) {
                     MarketSellEntry sell = e as MarketSellEntry;
                     long profit = 0;

EliteBGS.csproj

@@ -41,9 +41,6 @@
     <ApplicationIcon>EliteBGS.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoCompleteTextBox, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\AutoCompleteTextBox.1.1.1\lib\net472\AutoCompleteTextBox.dll</HintPath>
-    </Reference>
     <Reference Include="EDJournal, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\edjournal\bin\Debug\EDJournal.dll</HintPath>
@@ -51,8 +48,8 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Ookii.Dialogs.Wpf, Version=3.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
+    <Reference Include="Ookii.Dialogs.Wpf, Version=5.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
-      <HintPath>packages\Ookii.Dialogs.Wpf.3.1.0\lib\net45\Ookii.Dialogs.Wpf.dll</HintPath>
+      <HintPath>packages\Ookii.Dialogs.Wpf.5.0.1\lib\net462\Ookii.Dialogs.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -174,22 +171,26 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="docs\faq.md" />
+    <None Include="docs\index.md" />
+    <None Include="mkdocs.yml" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="README.md">
+    <None Include="docs\description.md" />
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="main-objectives.png">
+    <Resource Include="main-page.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </Resource>
+    <None Include="README.md">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="TestData\Mission-NoInfForSourceOrTarget.txt" />
     <None Include="TestData\NoFactionName-AndNoInfluence.txt" />
     <None Include="TestData\Mission-Failed.txt" />
@@ -200,19 +201,14 @@
     <None Include="TestData\Double-5-Inf.txt" />
     <None Include="TestData\SameInfTwice-Log.txt" />
     <None Include="TestData\SameInfTwice.txt" />
-    <None Include="CHANGELOG.md">
+    <None Include="docs\CHANGELOG.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="main-entries.png">
+    <Resource Include="docs\main-page.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </Resource>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="main-report.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="LICENCE.txt">
@@ -230,5 +226,6 @@
   <ItemGroup>
     <Resource Include="EliteBGS.ico" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

MainWindow.xaml

@@ -22,26 +22,14 @@
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
-                    <ToolBar VerticalAlignment="Top" Grid.Row="0" Width="Auto" Grid.ColumnSpan="3" Height="Auto" Margin="0,0,0,0" HorizontalAlignment="Left">
-                        <Label Content="System:" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                        <abc:AutoCompleteTextBox x:Name="system" VerticalAlignment="Center" MinWidth="120" MinHeight="22" KeyDown="Filter_KeyDown"/>
-                        <Label Content="Station:" Height="26.2857142857143" VerticalAlignment="Top"/>
-                        <abc:AutoCompleteTextBox x:Name="station" Margin="0" VerticalAlignment="Center" MinWidth="120" MinHeight="22" KeyDown="Filter_KeyDown" />
-                        <Label Content="Faction:" Height="26.2857142857143" VerticalAlignment="Top"/>
-                        <abc:AutoCompleteTextBox x:Name="faction" Margin="0" VerticalAlignment="Center" MinWidth="120" MinHeight="22" KeyDown="Filter_KeyDown"/>
-                        <Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
-                        <Button x:Name="AddFilter" Content="Add Objective" VerticalAlignment="Stretch" Click="AddFilter_Click" Margin="0,0,0,0.286" RenderTransformOrigin="0.5,0.505"/>
-                        <Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
-                        <Button x:Name="AddCombatZone" Content="Add Combat Zone Win" VerticalAlignment="Stretch" Margin="0,0,0,0.286" RenderTransformOrigin="0.5,0.505" Click="AddCombatZone_Click"/>
-                        <Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
-                        <Button x:Name="AdjustProfit" Content="Adjust Trade Profit" Margin="0" VerticalAlignment="Stretch" Click="AdjustProfit_Click" />
-                    </ToolBar>
                     <ToolBar VerticalAlignment="Top" Grid.Row="1" Width="Auto" Margin="0,0,0,0" Height="Auto" Grid.ColumnSpan="3" HorizontalAlignment="Left">
                         <Button x:Name="ParseJournal" Content="Parse Journal" VerticalAlignment="Center" Click="ParseJournal_Click" HorizontalAlignment="Center"/>
                         <Separator Margin="1" VerticalAlignment="Center" MinWidth="1" HorizontalAlignment="Center" MinHeight="22"/>
@@ -50,9 +38,15 @@
                         <Label Content="To:" Height="26.2857142857143" VerticalAlignment="Top"/>
                         <DatePicker x:Name="enddate" Height="26.2857142857143" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         <Separator Margin="1" VerticalAlignment="Center" MinWidth="1" HorizontalAlignment="Center" MinHeight="22"/>
+                        <CheckBox x:Name="collate" Margin="1" Content="Collate entries" IsChecked="True" IsThreeState="False"/>
+                        <Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
+                        <Button x:Name="AddCombatZone" Content="Add Combat Zone Win" VerticalAlignment="Stretch" Margin="0,0,0,0.286" RenderTransformOrigin="0.5,0.505" Click="AddCombatZone_Click"/>
+                        <Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
+                        <Button x:Name="AdjustProfit" Content="Adjust Trade Profit" Margin="0" VerticalAlignment="Stretch" Click="AdjustProfit_Click" />
+                        <Separator Margin="1" VerticalAlignment="Center" MinWidth="1" HorizontalAlignment="Center" MinHeight="22"/>
                         <Button x:Name="ManuallyParse" Content="Manually Parse JSON" Click="ManuallyParse_Click" />
                     </ToolBar>
-                    <TreeView x:Name="entries" Margin="0,0,0,0" Grid.ColumnSpan="3" Grid.Row="2" KeyUp="entries_KeyUp">
+                    <TreeView CheckBox.Checked="TreeView_CheckBox_Updated" CheckBox.Unchecked="TreeView_CheckBox_Updated"  x:Name="entries" Margin="0,0,0,0" Grid.ColumnSpan="3" Grid.Row="2" KeyUp="entries_KeyUp">
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate DataType="{x:Type BGS:Objective}" ItemsSource="{Binding Children}">
                                 <StackPanel Orientation="Horizontal">
@@ -76,25 +70,12 @@
                             </Style>
                         </TreeView.ItemContainerStyle>
                     </TreeView>
-                </Grid>
+                    <ToolBar HorizontalAlignment="Left" Height="36" VerticalAlignment="Top" Width="Auto" Grid.Row="3" Grid.ColumnSpan="2">
-            </TabItem>
-            <TabItem Header="Discord Report">
-                <Grid Background="#FFE5E5E5">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="53*"/>
-                        <ColumnDefinition Width="385*"/>
-                        <ColumnDefinition Width="438*"/>
-                    </Grid.ColumnDefinitions>
-                    <ToolBar HorizontalAlignment="Left" Height="36" VerticalAlignment="Top" Width="Auto" Grid.ColumnSpan="2">
                         <Button x:Name="GenerateDiscord" Content="Generate Discord Report" VerticalAlignment="Center" Margin="0,0,0,4.857" Click="GenerateDiscord_Click" Height="26"/>
                         <Separator />
                         <ComboBox x:Name="LogType" Height="36" Margin="0" VerticalAlignment="Center" Width="140" SelectionChanged="LogType_SelectionChanged" />
                     </ToolBar>
-                    <TextBox x:Name="DiscordLog" Height="Auto" TextWrapping="Wrap" FontFamily="Consolas" FontSize="14" Grid.Row="1" Grid.ColumnSpan="3" AcceptsReturn="True" AcceptsTab="True"/>
+                    <TextBox x:Name="DiscordLog" Height="Auto" TextWrapping="Wrap" FontFamily="Consolas" FontSize="14" Grid.Row="4" Grid.ColumnSpan="3" AcceptsReturn="True" AcceptsTab="True"/>
                 </Grid>
             </TabItem>
             <TabItem Header="Settings" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="53.7142857142857">

MainWindow.xaml.cs

@@ -68,6 +68,10 @@ namespace EliteBGS {
             }
         }
 
+        private void TreeView_CheckBox_Updated(object sender, RoutedEventArgs args) {
+            GenerateLog();
+        }
+
         private void Loadentries_EntriesLoaded(List<Entry> lines) {
             try {
                 report.Scan(lines);
@@ -110,11 +114,13 @@ namespace EliteBGS {
 
         private void ParseJournal_Click(object sender, RoutedEventArgs e) {
             try {
+                bool collate = (this.collate.IsChecked ?? true);
                 journal.Open(); // Load all files
                 var start = startdate.SelectedDate ?? DateTime.Now;
                 var end = enddate.SelectedDate ?? DateTime.Now;
-                report.Scan(journal, start, end);
+                report.Scan(journal, start, end, collate);
                 RefreshObjectives();
+                GenerateLog();
             } catch (Exception exception) {
                 Log("Something went terribly wrong while parsing the E:D player journal.");
                 Log("Please send this to CMDR Hekateh:");
@@ -122,29 +128,7 @@ namespace EliteBGS {
             }
         }
 
-        private void AddObjective() {
+        private void GenerateLog() {
-            Objective objective = new Objective {
-                System = system.Text,
-                Faction = faction.Text,
-                Station = station.Text,
-                ManuallyAdded = true,
-            };
-
-            if (!objective.IsValid) {
-                return;
-            }
-
-            if (report.AddObjective(objective)) {
-                RefreshObjectives();
-                config.SaveObjectives(Report);
-            }
-        }
-
-        private void AddFilter_Click(object sender, RoutedEventArgs e) {
-            AddObjective();
-        }
-
-        private void GenerateDiscord_Click(object sender, RoutedEventArgs e) {
             try {
                 DiscordLogGenerator discord = LogType.SelectedItem as DiscordLogGenerator;
                 string report = discord.GenerateDiscordLog(Report);
@@ -157,6 +141,10 @@ namespace EliteBGS {
             }
         }
 
+        private void GenerateDiscord_Click(object sender, RoutedEventArgs e) {
+            GenerateLog();
+        }
+
         private void RemoveCurrentObjective() {
             if (entries.SelectedItem == null) {
                 return;
@@ -178,7 +166,7 @@ namespace EliteBGS {
 
             if (removed) {
                 RefreshObjectives();
-                config.SaveObjectives(Report);
+                GenerateLog();
             }
         }
 
@@ -200,25 +188,43 @@ namespace EliteBGS {
             journal = new PlayerJournal(config.Global.JournalLocation);
         }
 
-        private void Filter_KeyDown(object sender, KeyEventArgs e) {
+        /// <summary>
-            if (e.Key == Key.Enter) {
+        /// Gets the currently selected objective, even if a log entry in said objective
-                AddObjective();
+        /// is selected instead. If nothing is selected, returns null.
+        /// </summary>
+        /// <returns></returns>
+        private Objective GetSelectedObjective() {
+            var obj = entries.SelectedItem;
+
+            if (obj == null) {
+                return null;
             }
+
+            if (obj.GetType() == typeof(Objective)) {
+                return obj as Objective;
+            }
+
+            // Some form of entry perhaps?
+            if (obj.GetType().IsSubclassOf(typeof(LogEntry))) {
+                LogEntry entry = obj as LogEntry;
+                Objective objective = entries.Items
+                    .OfType<Objective>()
+                    .First(x => x.LogEntries.Contains(entry))
+                    ;
+
+                return objective;
+            }
+
+            return null;
         }
 
         private void AddCombatZone_Click(object sender, RoutedEventArgs e) {
-            if (entries.SelectedItem == null) {
+            Objective objective = GetSelectedObjective();
+
+            if (objective == null) {
                 return;
             }
 
-            var obj = entries.SelectedItem;
-
-            if (obj.GetType() != typeof(Objective)) {
-                return;
-            }
-
-            Objective objective = obj as Objective;
-
             CombatZoneDialog dialog = new CombatZoneDialog() { Owner = this };
 
             if (!(dialog.ShowDialog() ?? false)) {
@@ -238,6 +244,7 @@ namespace EliteBGS {
 
             objective.LogEntries.Add(zone);
             RefreshObjectives();
+            GenerateLog();
         }
 
         private void AdjustProfit_Click(object sender, RoutedEventArgs e) {
@@ -257,6 +264,7 @@ namespace EliteBGS {
             if (int.TryParse(adjust.Profit.Text, out int newprofit)) {
                 sell.Profit = newprofit;
                 RefreshObjectives();
+                GenerateLog();
             }
         }
 
@@ -267,6 +275,7 @@ namespace EliteBGS {
 
             string template = LogType.SelectedItem.ToString();
             config.Global.LastUsedDiscordTemplate = template;
+            GenerateLog();
         }
 
         private void ManuallyParse_Click(object sender, RoutedEventArgs e) {

README.md

@@ -11,17 +11,8 @@ Binary downloads can be found here: [https://bgs.n0la.org/](https://bgs.n0la.org
 
 ## How To
 
-![Main Window Objectives](main-objectives.png)
+Press "Parse Journal", which will check your Elite Dangerous player journal for completed
-
+transactions. Currently the tool recognises the following transactions:
-Use the main tab to add objectives to the program. To do this, insert the system name,
-faction, and, optionally, a station. Then press "Add Objective". Objectives can be deleted
-by selecting them and pressing the "DEL" key. Manually added objectives like this are
-enabled by default. You can always enable, and disable an objective by checking the box
-next to its name. Disabled objectives are not included in the BGS discord log generation.
-
-Once you have your objectives have been configured, you can press "Parse Journal", which
-will check your Elite Dangerous player journal for completed missions. Currently the tool
-recognises the following completed tasks:
 
 * Buying of cargo from stations (new in Update 10)
 * Completed missions
@@ -72,7 +63,7 @@ you the bounty. And not the faction of the victim. The tool will look for an eve
 scanned your victim, and gleem the victim's faction from that. If you did not scan your victim, then
 sadly the tool cannot connect the victim's faction to the victim.
 
-![Main Window with entries](main-entries.png)
+![Main Window with entries](main-page.png)
 
 The window will then list all the journal entries it has found, and group them by objectives. You
 can select which objectives you wish to report, by using the checkmarks.
@@ -82,13 +73,10 @@ This way said entry will not appear in the final log. You can also remove indivi
 (if you think the tool detected something you thought was wrong), by selecting the entry,
 and pressing the "DEL" key. 
 
-Once you are satisfied with the result, move to "Discord Report" tab, select a template, and click
+Once you are satisfied with the result, the discord report should be displayed below, ready to be
-"Generate Report".
+copy and pasted. Before you copy/paste it into the discord of your squadron, you should check the log.
-
+You can of course edit it, if something is wrong or the tool itself missed something. If you want to
-![Generated Report](main-report.png)
+regenerate it, just click "Generate Log".
-
-Before you copy/paste it into the discord of your squadron, you should check the log. You can of
-course edit it, if something is wrong or the tool itself missed something.
 
 ## Known Issues and Bugs
 
@@ -126,12 +114,9 @@ Please upvote the issue to get it fixed. Until then, you have to add combat zone
 
 ### On-Foot NPC givers
 
-Also missions accepted from NPCs in Odyssey concourses do not get a player journal entry. This is
+Up until update 13 missions accepted from NPCs in Odyssey concourses do not get a player journal entry.
-also an ommission from FDev:
+This has been fixed in update 13. Any on foot missions from NPCs accepted before update 13, do not have
-
+an entry in the player journal.
-* [https://issues.frontierstore.net/issue-detail/43586](https://issues.frontierstore.net/issue-detail/43586)
-
-Until this is fixed, please edit the resulting BGS log text, and manually add such entries.
 
 ### Failed vs. Abandoned Missions
 
@@ -224,15 +209,6 @@ decide whether it was because of an election, or not.
 
 Future tool versions should probably take faction states into account in such matters.
 
-## Use EDDB information
-
-EliteBGS can download information from EDDB to auto complete system and station names. You can
-enable its use in the "Settings". Once enabled, you must also press "Download", to download and
-process the current version of the EDDB database.
-
-Please note that the database is rather large (>200 MB), and processing it takes some time. It is
-best if you don't use this feature if you are on a slow or metered internet connection. 
-
 ## Nothing's Perfect
 
 The tool itself is still a work in progress, and it might miss something. If you think the tool

docs/CHANGELOG.md

@@ -1,5 +1,28 @@
 # EliteBGS changelog
 
+## 0.1.7 on 09.11.2022
+
+* Fixed a bug related to total amount of credits gained by turning in organic data.
+* Changed UI to have report, and objectives on the same page.
+* Report now automatically updates when objectives and entries are selected, deselected or removed.
+* Removed manual adding of objectives.
+
+## 0.1.6 on 24.09.2022
+
+* Fixed datetime format.
+
+## 0.1.5 on 24.08.2022
+
+* Added some mission names.
+* Updated README regarding Update 13.
+
+## 0.1.4 on 24.07.2022
+
+* Fixed hour display with entires (now in 24 hour format).
+* Allow adding combat zones regardless of whether an objective is selected, or an
+  entry. If an entry is selected simply use its objective instead.
+* Add timestamp to combat zone wins.
+
 ## 0.1.3 on 07.06.2022
 
 * Fixed a bug where entries in non-rated journal files were not properly picked up.

docs/description.md

@@ -0,0 +1,232 @@
+# EliteBGS
+
+This tool is meant to help people contributing to the BGS effort to create BGS reports.
+The tool allows you to configure BGS objectives, and will then parse your player journal
+for tasks you completed relating to that BGS objective. Once the JSON player journal has
+been parsed, you may then generate a BGS report you can copy/paste into Discord.
+
+Source code is available [here](https://git.aror.org/florian/elitebgs).
+
+Binary downloads can be found here: [https://bgs.n0la.org/](https://bgs.n0la.org/).
+
+## How To
+
+Press "Parse Journal", which will check your Elite Dangerous player journal for completed
+missions. Currently the tool recognises the following completed tasks:
+
+* Buying of cargo from stations (new in Update 10)
+* Completed missions
+* Failed missions
+* Murders
+* Search and Rescue contributions
+* Selling cartography data
+* Selling of cargo to stations
+* Selling of micro resources (Odyssey only)
+* Selling of organic data (Odyssey only)
+* Vouchers, including bounty vouchers, combat bonds, and settlement vouchers (aka intel packages)
+
+Vouchers help the faction that is listed for them. If said faction is not present in the
+current system, then there is no BGS impact. So the tool looks for all system factions, and
+makes sure that your vouchers actually have a BGS impact, otherwise it won't list them.
+
+Selling cargo attempts to discern the profit and/or loss, which is helpful to gauge BGS
+impact. But the player journal does not tell the amount of profit in the sell message.
+So the tool looks for a buy a message related to the same commodity, and calculates loss
+and/or profit from that. If the buy of the commodity is not within the time and date range,
+or some other shenanigans happen that the tool does not yet support, the profit/loss could 
+be wrong. You can use the "Adjust Trade Profit" button to manually adjust the trade profit,
+or you could simply edit the discord log manually.
+
+Please note that cartography data, and micro resources only help the controlling faction
+of a station. The tool is clever enough to exclude these if the station you turn them in at, is not
+controlled by the faction you specified in the objective.
+
+Some missions may show up having zero influence for the given faction. This happens if you do
+missions for a faction which is currently in an election state. You do not gain influence for
+the faction so the influence reads as zero. But you contribute towards the election, so the
+missions are selected anyway.
+
+There is no entry in the journal if you win a combat zone. So you have to add those manually. Select
+an objective for which you wish to log a combat zone. The faction in the objective, must be the
+faction you fought for in the combat zone. Then click "Add Combat Zone Win". Select type,
+either "On Foot" for Odyssey, or "Ship" for regular ones. Then select the grade (low, medium or
+high), and how many you won. Then press "Accept". Select "Cancel" to abort. You can of course remove
+the combat zone entries by selecting them, and pressing "DEL".
+
+If you deliberately fail a mission (to log negative INF towards a faction), the tool cannot detect
+it, if the day you accepted the mission is outside of the given date range. It needs the journal
+entry where you accept the mission to connect the mission to a faction, system and station. The tool
+will warn you if this happens, with a message in the error log in the fourth tab.
+
+When committing murder, the journal entry contains the faction information of the faction that gave
+you the bounty. And not the faction of the victim. The tool will look for an event in which you
+scanned your victim, and gleem the victim's faction from that. If you did not scan your victim, then
+sadly the tool cannot connect the victim's faction to the victim.
+
+![Main Window with entries](main-page.png)
+
+The window will then list all the journal entries it has found, and group them by objectives. You
+can select which objectives you wish to report, by using the checkmarks.
+
+You can exclude a specific entry within an objective by deselecting the checkbox next to them.
+This way said entry will not appear in the final log. You can also remove individual entries
+(if you think the tool detected something you thought was wrong), by selecting the entry,
+and pressing the "DEL" key. 
+
+Once you are satisfied with the result, you can copy and paste the final report to the discord
+server of your choice. Before you copy/paste it into the discord of your squadron, you should
+check the log. You can of course also edit it, either if something is wrong because the tool
+missed something, or you just wish to add a note the report itself.
+
+If you wish to regenerate the discord log, simply click "Generate Log".
+
+## Known Issues and Bugs
+
+### Settlement Vouchers
+
+Settlement vouchers (aka Intel Packages) help every faction aligned with the given superpower.
+So if you turn in an Imperial intel package on an imperial station, all factions aligned with
+the Empire will gain a bit of INF boost. The tool currently cannot handle that. All intel packages
+are displayed instead.
+
+### Bugged bounty vouchers
+
+Sometimes bounty vouchers are not properly recognised. This is a bug in the player journal, where
+the faction information is not properly written out in the journal:
+
+```
+{ 
+  "timestamp":"2021-10-07T14:57:50Z", "event":"RedeemVoucher", 
+  "Type":"bounty", "Amount":20750, 
+  "Factions":[ { "Faction":"", "Amount":500 }, { "Faction":"", "Amount":20250 }]
+}
+```
+
+Since the tool does not know for which faction these bounties were redeemed for, it cannot assign
+it to an objective.
+
+### Combat Zones
+
+The player journal currently does not make an entry when you win or lose a combat zone. This is a
+an ommission from FDev:
+
+* [https://issues.frontierstore.net/issue-detail/43509](https://issues.frontierstore.net/issue-detail/43509)
+
+Please upvote the issue to get it fixed. Until then, you have to add combat zone wins manually.
+
+### On-Foot NPC givers
+
+Up until update 13 missions accepted from NPCs in Odyssey concourses do not get a player journal entry.
+This has been fixed in update 13. Any on foot missions from NPCs accepted before update 13, do not have
+an entry in the player journal.
+
+### Failed vs. Abandoned Missions
+
+The tool also currently cannot differentiate between missions you have abandoned in the transaction
+tab before it was completed, and those that you have failed - either delibaretly or by time-out. So
+it will find and add them all, and you simply can remove those that you have abandoned manually.
+
+### Influence given to empty/non-existent faction
+
+Sometimes the log will state that it gave positive or negative influence to a faction, but the
+faction name is empty:
+
+```
+ "FactionEffects": [
+    {
+      "Faction": "",
+      "Effects": [
+        {
+          "Effect": "$MISSIONUTIL_Interaction_Summary_EP_down;",
+          "Effect_Localised": "The economic status of $#MinorFaction; has declined in the $#System; system.",
+          "Trend": "DownBad"
+        }
+      ],
+      "Influence": [
+        {
+          "SystemAddress": 251012319587,
+          "Trend": "DownBad",
+          "Influence": "+"
+        }
+      ],
+      "ReputationTrend": "DownBad",
+      "Reputation": "+"
+    }
+]
+```
+This happens for example if you do a scan/heist mission from a surface POI, but no one owns said
+surface POI. Randomly generated surface POIs sometimes have no owner, and said non-existant owner
+then gets the negative influence.
+
+### Mission Completed but no one gains influence
+
+Sometimes missions are completed but no one gains any influence:
+
+```
+{
+  "timestamp": "2022-02-25T21:30:45Z",
+  "event": "MissionCompleted",
+  "Faction": "Social LHS 6103 Confederation",
+  "Name": "Mission_Courier_Elections_name",
+  "MissionID": 850025233,
+  "TargetFaction": "Delphin Blue Federal PLC",
+  "DestinationSystem": "Delphin",
+  "DestinationStation": "Aristotle Orbital",
+  "Reward": 122300,
+  "FactionEffects": [
+    {
+      "Faction": "Social LHS 6103 Confederation",
+      "Effects": [
+        {
+          "Effect": "$MISSIONUTIL_Interaction_Summary_EP_up;",
+          "Effect_Localised": "The economic status of $#MinorFaction; has improved in the $#System; system.",
+          "Trend": "UpGood"
+        }
+      ],
+      "Influence": [],
+      "ReputationTrend": "UpGood",
+      "Reputation": "+"
+    },
+    {
+      "Faction": "Delphin Blue Federal PLC",
+      "Effects": [],
+      "Influence": [],
+      "ReputationTrend": "UpGood",
+      "Reputation": "+"
+    }
+  ]
+}
+```
+
+Here the is known that at the time of completion the Confederation was in an Election and could not
+have gained any influence regardless. It is unclear whether this also holds true for Delphin Blue
+Federal PLC. So to be save, the tool assumes that if no influence was gained for the source faction,
+it still has to make an entry for the source system. The same applies for the target faction: if no
+influence is gained for the target faction, still add an entry for the target faction in the missions
+target system.
+
+Since it is not possible to differentiate between missions that give no influence no matter what, and
+no influence gained because of an election, we have to assume it *gave* influence and let the user
+decide whether it was because of an election, or not.
+
+Future tool versions should probably take faction states into account in such matters.
+
+## Nothing's Perfect
+
+The tool itself is still a work in progress, and it might miss something. If you think the tool
+missed a task you have done, please contact `Hekateh` on the Elite Dangerous community discord. 
+It would be helpful if you included the JSON player journal. This player journal can be found here:
+
+```
+%userprofile%\saved Games\Frontier Developments\Elite Dangerous\
+```
+
+## Build Dependencies
+
+Handling of Elite Dangerous player journals have been moved to a separate project called `EDJournal`.
+Its source can be found [here](https://git.aror.org/florian/edjournal). This project simply depends
+on the binary DLL that `EDJournal` builds.
+
+The project also requires `Ookii.Dialogs.WPF` controls, which contains the auto complete text box.
+
+And of course, `Newtonsoft.Json` as the JSON parser.

docs/faq.md

@@ -0,0 +1,94 @@
+## FAQ
+
+Most frequently asked questions:
+
+### Windows complains that it does not wish to run the application, what gives?
+
+The tool contains no viruses, but it is not seen as "trustworthy". You can however
+right-click EliteBGS.exe and "Unblock" the application.
+
+### Does this work for console players?
+
+Sorry, no. Console players don't have a player journal per se, and the tool does
+not support Frontier Commander API.
+
+### Why won't the tool start anymore?
+
+Open the file explorer, and go to the path `%AppData%`. Once there, delete the
+folder called `EliteBGS` to delete the tool's configuration and cache. If it
+still doesn't work, contact me directly.
+
+### I pressed 'Download Data' and it is hanging now and won't respond. Help?
+
+Go and delete the `EliteBGS` folder as described above to undo that action.
+Also please upgrade to version 0.1.3, where this feature was removed for
+exactly this reason.
+
+### Why is it unable to find my player journal?
+
+Usually your player journal lives in the Saved Games folder in your home
+directory. If, for some reason, this doesn't match up, you can point the
+tool towards your player journal in the third tab.
+
+###  Why do some of the objective not show up in the final discord log?
+
+Only objectives with the little checkbox enabled show up there. Those 
+that the tool generates by itself are not enabled per default.
+
+###  Can I delete an objective or an entry?
+
+Click on an objective or entry and press the Delete key.
+
+### I deleted something I didn't want to. What now?
+
+Just press "Parse Journal" again, and the tool will generate all
+the entries again.
+
+### What are micro resources?
+
+Odyssey cargo that you sell at the bartender. Just like normal cargo,
+they aid the controlling faction of the station where you sold them.
+
+### Why are missions accepted in a concourse or in a settlement from an NPC missing?
+
+Because up until Update 13, they did not show up in player journal. This should
+now be fixed.
+
+### Some mission names are weird. What gives?
+
+That's because the tool uses the game generated mission name, if it doesn't
+have a clean and nice mission name on file for the certain mission type. The
+fourth tab "Event Log" should have an entry about it, so please post those
+names into this channel.
+
+### Some missions say they have 0 influence?
+
+That happens for missions that aid an Election. The faction in question does
+not gain influence during an election, as influence is locked during conflicts.
+But since you are contributing towards the election win of that faction,
+the tool picks them anyway.
+
+### Why are some failed missions not showing up?
+
+The time span you specify must include the day where you accepted the mission,
+as well as the day where you failed the mission. Otherwise the tool cannot handle
+that failed mission.
+
+### The tool complains about missing factions for an NPC I murdered.
+
+The player journal only tells the faction that issued the bounty upon murder, and
+not the faction of the NPC killed. The tool has to fetch that from you scanning the
+hip. If you didn't fully scan the ship before murdering it, the tool won't know
+the faction of the NPC.
+
+### Why does cartography data, and sold cargo show up for the wrong faction, but for the right station/system?
+
+Because they only aid the controlling faction of the station.
+
+### Why are some of my bounty vouchers missing?
+
+Sometimes, due to a bug, the bounty vouchers in the journal have no faction information
+associated with them. Here the tool simply cannot associate the vouchers to a faction
+or station. If you are sure they aided in BGS, simply add them by editing the Discord
+report.
+

docs/index.md

@@ -0,0 +1,69 @@
+# EliteBGS
+
+EliteBGS is a Windows desktop application, that helps you sum up your BGS related actions.
+It then creates a report from your actions, so you can post it your Squadron's discord.
+
+## Origins
+
+The tool originated from the [Nova Navy](https://inara.cz/elite/squadron/5058/), which required
+BGS contributions to be posted to the Navy's discord, in a very specific format. Writing those
+logs manually was a lot of work, so CMDR Hekateh created a tool to automate this process.
+
+## Overview
+
+EliteBGS reads through your player journal for BGS relevant activity, and sorts them into
+"categories". These are based upon the star system, station and the faction for which the
+action was taken. So for example if you contributed bounty vouchers for Nova Paresa in
+Paresa, but also did some missions for Nova Paresa in Adachit, those actions will be
+split into two categories.
+
+You can then select which of the two actions goes into the final log.
+
+### What it detects:
+
+* Buying of cargo from stations (BGS relevant since Update 10)
+* Completed missions
+* Failed missions
+* Murders
+* Search and Rescue contributions
+* Selling cartography data
+* Selling of cargo to stations
+* Selling of micro resources (Odyssey only)
+* Selling of organic data (Odyssey only)
+* Vouchers, including bounty vouchers, combat bonds, and settlement vouchers (aka intel packages)
+
+### What it does not detect:
+
+* Combat zone wins, and its objectives
+* Megaship scenarios
+* On foot missions accepted by NPCs in stations (pre Update 13)
+* Murders of NPCs you haven't fully scanned
+
+## Open Source
+
+The tool itself is Open Source, licenced unter the GPLv3.
+
+The source code can be found here:
+
+* [https://git.aror.org/florian/EliteBGS](https://git.aror.org/florian/EliteBGS)
+
+It requires a separate library, called EDJournal, which is also open source:
+
+* [https://git.aror.org/florian/edjournal](https://git.aror.org/florian/edjournal)
+
+## Downloads
+
+The latest version of EliteBGS **0.1.7** is available for download here:
+
+* [https://bgs.n0la.org/elitebgs-0.1.7.zip](https://bgs.n0la.org/elitebgs-0.1.7.zip)
+
+Older versions are available in the archive:
+
+* [https://bgs.n0la.org/archive/](https://bgs.n0la.org/archive/)
+
+## Contact
+
+I can be reached over discord: `nola#2457`
+
+Or by joining either the [Salus Invicta](https://discord.com/invite/FeEtjqBRkg) or the
+[Nova Navy](https://discord.gg/WEJeFQw) discord.

mkdocs.yml

@@ -0,0 +1,14 @@
+site_name: EliteBGS
+
+markdown_extensions:
+    - pymdownx.snippets:
+          check_paths: true
+
+theme:
+    name: lumen
+
+nav:
+    - Overview: 'index.md'
+    - "Detailed Description": 'description.md'
+    - FAQ: 'faq.md'
+    - Changelog: 'CHANGELOG.md'

packages.config

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoCompleteTextBox" version="1.1.1" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-  <package id="Ookii.Dialogs.Wpf" version="3.1.0" targetFramework="net472" />
+  <package id="Ookii.Dialogs.Wpf" version="5.0.1" targetFramework="net472" />
 </packages>