Commit Graph

124 Commits (cd0e44ab307e2e1f7c03bccda2d0e9b077387b32)

Author SHA1 Message Date
Julian Gegner 748c1cc585 Merge branch 'testing_branch' into 'main'
Testing branch

See merge request Crondung/hsma_cpd!37
2023-03-06 23:08:41 +00:00
Kai Mannweiler 52ec92b566 Added Integrationtests 2023-03-06 23:46:49 +01:00
Kai Mannweiler 95d055d316 Merge branch 'fixes' into 'main'
Fixes

See merge request Crondung/hsma_cpd!36
2023-03-06 18:09:07 +00:00
Julian Gegner 597fe9224c remove prints 2023-03-06 19:04:49 +01:00
Julian Gegner d18231966c fix scanner, try catch export 2023-03-06 18:39:36 +01:00
Kai Mannweiler 07a6f0a46a done 2023-03-06 18:12:54 +01:00
Kai Mannweiler 411614f61f Merge branch 'main' into '43-ausklappbares-listitem'
# Conflicts:
#   lib/widgets/buttons/round_button_widget.dart
#   lib/widgets/view_form/view_form_page.dart
2023-03-06 15:10:20 +00:00
Kai Mannweiler af628a8fab Corrected Testing code 2023-03-06 16:07:15 +01:00
Julian Gegner 80bc5985e7 remove unused imports 2023-03-06 16:05:20 +01:00
Kai Mannweiler c66ee1468c Padding to ListView pt2 2023-03-06 15:59:28 +01:00
Kai Mannweiler 5cce527518 Padding to ListView 2023-03-06 15:59:06 +01:00
Julian Gegner 6d53158b64 use texticonbutton for scan and export, use global bool to enable local json config 2023-03-06 15:54:13 +01:00
Kai Mannweiler 56acb1e84c Fixed Paddings 2023-03-06 15:46:40 +01:00
Julian Gegner a99fed7fa2 add scanfield 2023-03-06 15:22:02 +01:00
Kai Mannweiler 30c798c15f White Icon 2023-03-06 14:58:15 +01:00
Kai Mannweiler 5177d38b36 Added Expansiontile for comments 2023-03-06 14:55:56 +01:00
Julian Gegner d910e3780f use provider for scanner 2023-03-06 14:25:38 +01:00
Kai Mannweiler 5ab6e598f9 Merge branch 'awesome-task-done-popup' into 'main'
use awesome dialog for taskdone popup

See merge request Crondung/hsma_cpd!32
2023-03-06 12:51:19 +00:00
Julian Gegner 721d76dac0 use awesome dialog for taskdone popup 2023-03-06 13:48:15 +01:00
Kai Mannweiler c12053c2fa Fixed Layout for small screens 2023-03-06 13:14:42 +01:00
Julian Gegner b8d3bc7048 redo testing button add functinality 2023-03-06 11:34:01 +01:00
Julian Gegner 5795b0a4e8 add Workout historylist 2023-03-06 00:39:50 +01:00
Julian Gegner e91caaa5ba display correct icons in historyview, mood icon dependant on moodvalue 2023-03-06 00:34:45 +01:00
Julian Gegner 43723f4ef2 use historylist to display entries 2023-03-06 00:05:11 +01:00
Julian Gegner 54ec18d1fe use linechart widget in views 2023-03-05 20:54:08 +01:00
Julian Gegner b23f9ccdc1 widget for line graph 2023-03-05 20:43:14 +01:00
Julian Gegner 00ae7ae860 structure widget folder 2023-03-05 18:17:08 +01:00
Julian Gegner 669e7032c1 icon size relative to screensize 2023-03-05 17:49:12 +01:00
Julian Gegner aaab126ec8 button size relative to screen size 2023-03-05 17:44:10 +01:00
Julian Gegner 40f03ec177 wip layout add button 2023-03-05 17:33:27 +01:00
Julian Gegner d674051c57 Merge branch 'main' into beautify 2023-03-05 16:55:18 +01:00
Kai Mannweiler c14e881558 Deleted print 2023-03-04 17:10:07 +00:00
Kai Mannweiler 4e6f5e2d8c Enums instead of Strings 2023-03-04 18:02:27 +01:00
Julian Gegner 8143a91020 back button to appbar, added round add button to add entries 2023-03-04 17:58:04 +01:00
Julian Gegner 3038efcd27 changed circular progress indicator framerate 2023-03-04 15:30:21 +01:00
Julian Gegner fd362e8531 use dedicated audioprovider 2023-03-04 12:14:29 +01:00
Julian Gegner 782dc86644 use relative imports 2023-03-04 10:32:35 +01:00
Julian Gegner cd07acc3b5 fixed flutter analyze issues introduced with new flutter version 2023-03-04 10:29:35 +01:00
Julian Gegner 42f4fcd05d Merge branch '24-timer-darf-nur-ein-mal-pro-tag-gedruckt-werden' into 'main'
Tasks können nur ausgeführt werden, wenn gefordert.

See merge request Crondung/hsma_cpd!25
2023-03-04 09:06:38 +00:00
Kai Mannweiler c56222660d Added try catch with errorhandling 2023-03-03 18:34:24 +01:00
Kai Mannweiler 4279e7961c Add Timer to Popup 2023-03-03 18:26:44 +01:00
Kai Mannweiler e22d918a92 use dispose function of workout_provider to cleanup instead of high level provider 2023-03-03 17:19:58 +01:00
Kai Mannweiler 9d26bdee60 Added Timer to popup if task isnt due 2023-03-03 16:38:08 +01:00
Kai Mannweiler 0596194ad0 removed unused import 2023-03-03 15:04:02 +01:00
Kai Mannweiler 3b25e12d08 Fixed Bug: workout is interruptable now 2023-03-03 15:02:27 +01:00
Kai Mannweiler 7dd1a748f2 Moved Provider to the top level 2023-03-03 15:00:48 +01:00
Kai Mannweiler 4b1eb20ca1 extracted workoutform 2023-03-03 13:44:17 +01:00
Kai Mannweiler f62cdd2543 On successful submit go back to view page 2023-03-03 12:51:48 +01:00
Kai Mannweiler 606e8c3f19 Fixed DropDown Bug 2023-03-03 12:51:25 +01:00
Kai Mannweiler c9ea73b9b2 Added Views for Models 2023-03-03 12:50:50 +01:00