add hours to issue details (1.1.3)
This commit is contained in:
@@ -37,7 +37,8 @@ namespace Blueberry
|
||||
iUpdatedTextBox.Text = _issue.UpdatedOn.ToString("yyyy-MM-dd");
|
||||
iSpentTimeTextBox.Text = _issue.SpentHours.ToString();
|
||||
journalProgressRing.Visibility = Visibility.Visible;
|
||||
_journalDisplays.AddRange(await ProcessJournal(_issue.Journals));
|
||||
var hours = await _manager.GetTimeOnIssue(_issue.Id);
|
||||
_journalDisplays.AddRange(await ProcessJournal(_issue.Journals, hours));
|
||||
if(!_journalDisplays.Any(x=>!x.IsData))
|
||||
detailsToggleSwitch.IsChecked = true;
|
||||
await LoadJournal();
|
||||
@@ -75,7 +76,7 @@ namespace Blueberry
|
||||
|
||||
public partial class IssueWindow
|
||||
{
|
||||
public async Task<List<JournalDisplay>> ProcessJournal(IEnumerable<DetailedIssue.Journal> journals)
|
||||
public async Task<List<JournalDisplay>> ProcessJournal(IEnumerable<DetailedIssue.Journal> journals, List<TimeOnIssue.TimeEntry> hours)
|
||||
{
|
||||
var js = new List<JournalDisplay>();
|
||||
|
||||
@@ -187,6 +188,24 @@ namespace Blueberry
|
||||
} catch (Exception) { }
|
||||
}
|
||||
}
|
||||
|
||||
var totalHours = 0d;
|
||||
hours = [.. hours.OrderBy(x => x.CreatedOn)];
|
||||
foreach (var hour in hours)
|
||||
{
|
||||
totalHours += hour.Hours;
|
||||
var user = hour.User.Name;
|
||||
var date = hour.CreatedOn.ToString("yyyy-MM-dd HH:mm");
|
||||
var content = $"Idő: {hour.Hours}\nEddig összesen: {totalHours}\n{hour.Comments}";
|
||||
js.Add(new JournalDisplay
|
||||
{
|
||||
User = user,
|
||||
Date = date,
|
||||
Content = content,
|
||||
IsData = true
|
||||
});
|
||||
}
|
||||
js = [.. js.OrderBy(x => x.Date)];
|
||||
return js;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ namespace Blueberry
|
||||
public static class UpdateManager
|
||||
{
|
||||
private const string releaseUrl = "https://git.technopunk.space/api/v1/repos/tomi/Blueberry/releases/latest";
|
||||
public const string CurrentVersion = "0.1.2";
|
||||
public const string CurrentVersion = "0.1.3";
|
||||
private static readonly string AppDir = AppDomain.CurrentDomain.BaseDirectory;
|
||||
private static readonly HttpClient client = new();
|
||||
public delegate void DownloadCompletedEventArgs();
|
||||
|
||||
Reference in New Issue
Block a user