Commit d57f89d0 authored by Azkee's avatar Azkee
Browse files

fix: fix so hard it makes the maidens weep

parent 336bb3d2

Models/ExerciseEntry.cs

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ namespace JuanLog.Models 
        public string ExerciseName { get; set; }



        [ForeignKey("ExerciseCategories")]

        public int CategoryId { get; set; }

        public int ExerciseCategory { get; set; }

        public DateTime When { get; set; }

        public int Weight { get; set; }

ViewModels/AddExerciseViewModel.cs

+3 −2
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ namespace JuanLog.ViewModels 
        {

            ExerciseEntry addedEntry = await ExerciseEntry.AddEntry(new ExerciseEntry {

                UserId = ActiveUser.Id,

                ExerciseCategory = 1,

                ExerciseName = SelectedExercise.ExerciseName,

                Weight = Weight,

                When = DateTime.Now,

ViewModels/ImportDataViewModel.cs

+4 −8
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ namespace JuanLog.ViewModels 
                {

                    allExercises.TryAdd(e.ExerciseName, e);

                }

            try

            {



                foreach (string line in lines)

                {

                    string[] data = line.Split(';');
@@ -105,7 +104,7 @@ namespace JuanLog.ViewModels 
                            }

                        }

                    

                        ExerciseEntry entry = new ExerciseEntry { UserId = ActiveUser.Id, ExerciseName = exerciseName, Weight = weight, When = date, CategoryId = 0 };

                        ExerciseEntry entry = new ExerciseEntry { UserId = ActiveUser.Id, ExerciseName = exerciseName, Weight = weight, When = date, ExerciseCategory = 1 };

                        var addedEntry = await db.ExerciseEntries.AddAsync(entry);

                        await db.SaveChangesAsync();
@@ -134,11 +133,8 @@ namespace JuanLog.ViewModels 
                        await db.SaveChangesAsync();

                    }

                }

            }

            catch (Exception)

            {

                MessageBox.Show("Načítání z csv souboru selhalo. Zkontroluj prosím formát souboru.");

            }

            



        }

    }

}

ViewModels/ProgressViewModel.cs

+1 −8
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ namespace JuanLog.ViewModels 
            {

                ActiveUser = m.Value;

                UpdateEntries();

                

                UpdateShownExercises();

            });



            WeakReferenceMessenger.Default.Register<ExerciseEntryChangedMessage>(this, (r, m) =>
@@ -173,7 +173,6 @@ namespace JuanLog.ViewModels 
        public void ChangeEntry(ExerciseEntry exerciseEntry)

        {

            var popUp = new ChangeEntryPopupWindow(exerciseEntry);

            MessageBox.Show(exerciseEntry.EntryId.ToString());

            popUp.Show();

        }
@@ -188,11 +187,5 @@ namespace JuanLog.ViewModels 
            UpdateEntries();

        }



        public int GetRepCount(ExerciseEntry exerciseEntry)

        {

            return ExerciseEntry.GetEntrySets(exerciseEntry).Result.Count();

        }



        

    }

}

Views/ProgressView.xaml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
                        <DataGridTextColumn Header="Cvičení"  Binding="{Binding ExerciseName}" Width="2*"/>

                        <DataGridTextColumn Header="Kdy?" Binding="{Binding When.Date, Converter={StaticResource dateConverter}}" Width="2*"/>

                        <DataGridTextColumn Header="Přidaná váha" Binding="{Binding Weight}" Width="2*"/>

                        <DataGridTextColumn Header="Počet setů" Binding="{}" Width="2*"/>

                        <DataGridTextColumn Header="Počet setů" Binding="{Binding Sets}" Width="2*"/>

                        <DataGridTemplateColumn Header="Editovat" Width="*" >

                            <DataGridTemplateColumn.CellTemplate>

                                <DataTemplate>