Skip to content

Commit 55a4de9

Browse files
committed
Added values to json
I added the LinesOfCodeFiles array, FolderLocation string, DateCreated string, TasksMade long, and TasksCompleted long to the JSON data files. Also added statistic date creation.
1 parent 9268ccd commit 55a4de9

4 files changed

Lines changed: 213 additions & 38 deletions

File tree

app/Project Tracker/Project Tracker/MainTableManifest.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,25 @@ internal class MainTableManifest {
2222

2323

2424
public class Rootobject {
25-
public string Title { get; set; }
26-
public string[] Tasks { get; set; }
27-
public string[] TaskData { get; set; }
28-
public string[] TaskIdentifier { get; set; }
25+
// Leave these first ones, they're for when the user is using an old version and needs to migrate
2926
public string[] Errors { get; set; }
3027
public string[] ErrorsData { get; set; }
3128
public string[] Features { get; set; }
3229
public string[] FeaturesData { get; set; }
3330
public string[] Comments { get; set; }
3431
public string[] CommentsData { get; set; }
32+
33+
// The new data
34+
public string Title { get; set; }
35+
public string[] Tasks { get; set; }
36+
public string[] TaskData { get; set; }
37+
public string[] TaskIdentifier { get; set; }
38+
public string[] LinesOfCodeFiles { get; set; }
39+
public string FolderLocation { get; set; }
3540
public string Duration { get; set; }
41+
public string DateCreated { get; set; }
42+
public long TasksMade { get; set; }
43+
public long TasksCompleted { get; set; }
3644
public string Icon { get; set; }
3745
public string Percent { get; set; }
3846
}

app/Project Tracker/Project Tracker/MainWindow.xaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,22 +268,22 @@
268268
<!-- The view if there is projects made -->
269269
<Grid Margin="345,0,0,0">
270270
<Canvas HorizontalAlignment="Left" VerticalAlignment="Top" Height="45" Width="45" Margin="75,31,0,0">
271-
<Image x:Name="displayingImage" Source="{StaticResource javaIcon}" Height="45" Width="45" Visibility="Visible" PreviewMouseDown="displayingImage_PreviewMouseDown" Cursor="Hand" />
271+
<Image x:Name="displayingImage" Source="{StaticResource graphDrawingImage}" Height="45" Width="45" Visibility="Visible" PreviewMouseDown="displayingImage_PreviewMouseDown" Cursor="Hand" />
272272
</Canvas>
273273
<Canvas HorizontalAlignment="Right" VerticalAlignment="Top" Height="40" Width="40" Margin="0,45,45,0">
274-
<Image x:Name="settingsImage" Source="{StaticResource settingsDrawingImage}" Height="40" Width="40" Visibility="Visible" PreviewMouseDown="settingsImage_PreviewMouseDown" Cursor="Hand" />
274+
<Image x:Name="settingsImage" Source="{StaticResource settingsDrawingImage}" Height="40" Width="40" Visibility="Hidden" PreviewMouseDown="settingsImage_PreviewMouseDown" Cursor="Hand" />
275275
</Canvas>
276276
<Canvas HorizontalAlignment="Right" VerticalAlignment="Top" Height="40" Width="40" Margin="0,45,110,0">
277-
<Image x:Name="folderImage" Source="{StaticResource folderDrawingImage}" Height="40" Width="40" Visibility="Visible" PreviewMouseDown="folderImage_PreviewMouseDown" Cursor="Hand" />
277+
<Image x:Name="folderImage" Source="{StaticResource folderDrawingImage}" Height="40" Width="40" Visibility="Hidden" PreviewMouseDown="folderImage_PreviewMouseDown" Cursor="Hand" />
278278
</Canvas>
279279

280-
<Label x:Name="displayingTitle" VerticalContentAlignment="Top" HorizontalAlignment="Left" Content="Project Tracker" FontSize="40" Margin="135,21,0,7" FontWeight="Medium" Visibility="Visible" />
280+
<Label x:Name="displayingTitle" VerticalContentAlignment="Top" HorizontalAlignment="Left" Content="Project Tracker Statistics" FontSize="40" Margin="135,21,0,7" FontWeight="Medium" Visibility="Visible" />
281281
<Border x:Name="changeTitleBorder" BorderBrush="#FF919191" BorderThickness="2" HorizontalAlignment="Left" Height="64" Margin="135,21,0,0" VerticalAlignment="Top" Width="500" Visibility="Hidden">
282282
<TextBox x:Name="changeTitleTextBox" TextWrapping="Wrap" Text="Project Tracker" FontSize="40" LostFocus="changeTitleTextBox_LostFocus" />
283283
</Border>
284284

285285
<!-- Make sure this has equal padding on all sides -->
286-
<Border x:Name="addItemBorder" BorderBrush="Black" CornerRadius="10" BorderThickness="3" HorizontalAlignment="Center" Height="73" Margin="0,0,0,10" VerticalAlignment="Bottom" Width="750" Visibility="Visible">
286+
<Border x:Name="addItemBorder" BorderBrush="Black" CornerRadius="10" BorderThickness="3" HorizontalAlignment="Center" Height="73" Margin="0,0,0,10" VerticalAlignment="Bottom" Width="750" Visibility="Hidden">
287287
<Grid x:Name="addItemGrid" HorizontalAlignment="Stretch">
288288
<Grid.ColumnDefinitions>
289289
<ColumnDefinition />
@@ -317,6 +317,17 @@
317317
<Label x:Name="nextVersionUpdateThreeLabel" Visibility="Hidden" Content="3. " HorizontalAlignment="Left" Margin="20,594,0,0" VerticalAlignment="Top" FontSize="24" />
318318
</Grid>
319319

320+
<!-- The statistics menu -->
321+
<Grid x:Name="statisticsGrid" Margin="350,100,0,0">
322+
<Label x:Name="creationDateLabel" Content="Date created: 6/9/2020" HorizontalAlignment="Left" Margin="20,20,0,0" VerticalAlignment="Top" FontSize="28"/>
323+
<Label x:Name="tasksMadeLabel" Content="Tasks created: 0" HorizontalAlignment="Left" Margin="20,90,0,0" VerticalAlignment="Top" FontSize="24"/>
324+
<Label x:Name="tasksCompletedLabel" Content="Tasks completed: 0" HorizontalAlignment="Left" Margin="20,125,0,0" VerticalAlignment="Top" FontSize="24"/>
325+
<Label x:Name="statisticsDurationLabel" Content="Duration: coming soon..." HorizontalAlignment="Left" Margin="20,195,0,0" VerticalAlignment="Top" FontSize="24"/>
326+
<Label x:Name="linesOfCodeLabel" Content="Lines of code: 0" HorizontalAlignment="Left" Margin="20,265,0,0" VerticalAlignment="Top" FontSize="24"/>
327+
<Button x:Name="setCodeCountingButton" Content="Set up code counting" HorizontalAlignment="Left" Margin="20,312,0,0" VerticalAlignment="Top" Width="202" Height="52" FontSize="18" Cursor="Hand"/>
328+
329+
</Grid>
330+
320331
<!-- Incomplete vs complete grid -->
321332
<Grid x:Name="completeGrid" Margin="391,136,0,0" Visibility="Hidden">
322333
<Grid.ColumnDefinitions>

0 commit comments

Comments
 (0)