Commit Graph

200 Commits (999aa8fc42cfac989ecea46c911cbfbe7d98bc89)

Author SHA1 Message Date
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 ccf34c07e8 Fixed Bug when swapping pages 2023-03-03 13:13:33 +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
Kai Mannweiler efd38e78d5 Added ViewFormPage 2023-03-03 12:49:42 +01:00
Kai Mannweiler 6e9f213cdc Added PageProvider 2023-03-03 12:48:19 +01:00
Kai Mannweiler 1566f5c92a Added Getters for Models 2023-03-03 12:47:54 +01:00
Kai Mannweiler afe481305c Add TaskProvider to Workout 2023-03-02 20:35:20 +01:00
Kai Mannweiler 7689de73ac Refactor wrong method name 2023-03-02 20:33:44 +01:00
Kai Mannweiler c480f83f6d outsource todoicon 2023-03-02 20:20:17 +01:00
Kai Mannweiler 24c1f8e21d Merge branch '34-taskprovider-hinzufugen' of https://gitlab.com/Crondung/hsma_cpd into 34-taskprovider-hinzufugen 2023-03-02 20:16:53 +01:00
Kai Mannweiler e8a123413c Update when submiting form 2023-03-02 20:16:46 +01:00
Kai Mannweiler c3a74e50af Merge branch 'main' into '34-taskprovider-hinzufugen'
# Conflicts:
#   lib/models/workout.dart
2023-03-02 19:02:32 +00:00
Kai Mannweiler d18bf8f56d Update Tasks when Settings update 2023-03-02 19:57:24 +01:00
Julian Gegner 7bc9d4f35d add minimal errorcheck 2023-03-02 19:47:28 +01:00
Julian Gegner 0e49b9cd32 make date field of workout json encodable 2023-03-02 19:43:05 +01:00
Julian Gegner 0e070d73a2 sending data of records to api 2023-03-02 19:41:13 +01:00
Kai Mannweiler 1a7f98c538 Fixed wrong title 2023-03-02 19:32:13 +01:00
Kai Mannweiler c3fde53bec added TasksProvider to MainPage 2023-03-02 19:31:47 +01:00
Julian Gegner c8a140678d add workout get db function 2023-03-02 19:04:40 +01:00
Kai Mannweiler 175735f4b9 Added TaskProvider and Pages enum 2023-03-02 18:35:03 +01:00
Julian Gegner 5b3d615c8e fix flutter analyze problems 2023-03-02 16:12:54 +01:00
Julian Gegner da0bf43087 Merge branch 'main' into 29-provider-refactoring 2023-03-02 16:09:24 +01:00
Julian Gegner d1600b174e save workout when completed 2023-03-02 16:06:24 +01:00
Julian Gegner fa8d2f6314 fix onlisten stream error 2023-03-02 15:08:39 +01:00
Julian Gegner 5587f049e1 wip finishing workout and saving model 2023-03-02 13:19:08 +01:00
Kai Mannweiler 4fc602806c Fixed Visuals 2023-03-01 20:45:00 +01:00
Julian Gegner cd88b483cf return slider value after popup 2023-03-01 13:30:12 +01:00
Julian Gegner 556daa9e90 show phase colors in circularprogressindi 2023-03-01 13:07:01 +01:00
Julian Gegner da7c820dbd better positioning, fixed endless workout 2023-03-01 12:57:02 +01:00
Julian Gegner 9eff2ad177 add circular progress indicator 2023-03-01 12:34:35 +01:00
Julian Gegner c1cf3cce30 handle stop 2023-02-28 15:07:47 +01:00
Julian Gegner 4144bbaf69 wip trying to wrap timerprovider in prokoutprovider 2023-02-28 14:58:32 +01:00
Julian Gegner b01485f27a playing music and iterating throug workout 2023-02-28 13:05:51 +01:00
Kai Mannweiler 2d88553ee8 Remove unnessecary import 2023-02-27 20:37:39 +01:00
Kai Mannweiler 88ec309f55 Remove Errorhandling from scanner 2023-02-27 20:36:59 +01:00
Kai Mannweiler afb63adb5c Make sure to leave onDetect when successful 2023-02-27 20:34:14 +01:00
Kai Mannweiler bb96aaeef9 Added new alerts to scanner page 2023-02-27 20:30:24 +01:00
Kai Mannweiler f0e3a1ff6b Merge branch 'refactroring-ScannerPage' into 32-success-or-failure-alert-after-save 2023-02-27 20:21:11 +01:00
Kai Mannweiler 591317df26 Added Submitformbutton to sleep and relapse 2023-02-27 20:09:11 +01:00
Kai Mannweiler 5b411ef6bf Add AwesomeDialog 2023-02-27 20:02:15 +01:00
Kai Mannweiler d18d484932 Center every page 2023-02-27 19:34:11 +01:00
Kai Mannweiler 2c96f711b6 Add SingleChildScrollView 2023-02-27 19:29:22 +01:00
Kai Mannweiler 6a6b44a555 Moved pageservice to service folder 2023-02-27 17:27:01 +01:00
Kai Mannweiler b96604103d Added initating Settings from QR-Code 2023-02-27 17:15:34 +01:00
Kai Mannweiler 074ebb1871 finally instead of catch to secure if nothing is found an message is deplayed 2023-02-27 17:09:58 +01:00
Kai Mannweiler 3909bfd66c forgot to add handlesuccess 2023-02-27 17:01:44 +01:00
Kai Mannweiler d401882671 Refactoring ScannerPage 2023-02-27 17:00:28 +01:00
Kai Mannweiler 7a402e464c quickfix relapse model 2023-02-27 15:19:03 +01:00
Kai Mannweiler 01d62a291c refactoring mainpage 2023-02-27 14:57:56 +01:00
Kai Mannweiler 95915e759b Start Refactoring mainpage using Settingsprovider 2023-02-27 11:57:55 +01:00
Kai Mannweiler 395749618b quickfix 2023-02-27 11:40:24 +01:00
Kai Mannweiler 9c4a5e0fbb return null if settings cant be correctly loaded 2023-02-27 11:39:42 +01:00
Kai Mannweiler 21470da038 outsource loadsettings to settings_service 2023-02-27 11:27:45 +01:00
Kai Mannweiler d46dd3ff7b Make Settingsfields nullable part 2 2023-02-27 11:21:57 +01:00
Kai Mannweiler 28e46d1806 Settingsfields nullable 2023-02-27 11:19:56 +01:00
Kai Mannweiler b1c6288b2b Add initilized field for Settingsprovider 2023-02-27 11:08:38 +01:00
Kai Mannweiler ba558adecb Check for empty list 2023-02-27 11:07:46 +01:00
Kai Mannweiler cbf384f9e9 Refactoring: DropDown more modular 2023-02-27 02:35:17 +01:00
Kai Mannweiler 63fdda8195 Added DropDown for Relapse 2023-02-27 02:28:26 +01:00
Kai Mannweiler a2ed17fd5c Added SettingsProvider around MyApp 2023-02-27 02:27:42 +01:00
Julian Gegner ec5f23845d Merge branch '29-provider-refactoring' of https://gitlab.com/Crondung/hsma_cpd into 29-provider-refactoring 2023-02-27 01:20:06 +01:00
Julian Gegner b4c0015847 added workout widget and workout provider to handle different workout phases and durations 2023-02-27 01:20:00 +01:00
Kai Mannweiler a574e7f718 Add relapse form 2023-02-26 23:30:00 +01:00
Kai Mannweiler 0b57c14e05 Add relapse db part2 2023-02-26 23:29:47 +01:00
Kai Mannweiler a054906970 Add relapse model and database 2023-02-26 23:24:23 +01:00
Kai Mannweiler 72674a3552 deleted useless code 2023-02-26 22:49:01 +01:00
Julian Gegner 20f5c5e426 add timer widget, provider and util (format) 2023-02-26 19:52:45 +01:00
Julian Gegner 02ffb9b2f7 wip refactor timer 2023-02-26 17:33:32 +01:00
Julian Gegner 68033a64a5 layouting 2023-02-26 17:09:25 +01:00
Julian Gegner 646a97926d refactor timepicker and moodform 2023-02-26 17:07:38 +01:00
Julian Gegner b3f22b2c74 complete mood form provider setup, use mocked database 2023-02-26 16:17:57 +01:00
Julian Gegner c45b38a1df refactor slider to use provider 2023-02-26 14:59:37 +01:00
Julian Gegner 8230a66df1 refactor folder names pt2 2023-02-26 14:10:16 +01:00
Julian Gegner c87a59a0b6 refactor folder names 2023-02-26 14:10:06 +01:00
Julian Gegner 5f7b63d9b5 use getter 2023-02-26 14:08:05 +01:00
Julian Gegner 6895638814 Merge branch '12-benachrichtigung-aufs-handy-erstellen-2' into 'main'
Resolve "Benachrichtigung aufs Handy erstellen"

See merge request Crondung/hsma_cpd!13
2023-02-26 13:05:37 +00:00
Kai Mannweiler 33cecb4979 Merge branch 'main' into '8-datenbank-einbinden'
# Conflicts:
#   lib/widgets/mood_form.dart
#   lib/widgets/sleep_form.dart
2023-02-26 11:49:26 +00:00
Kai Mannweiler 60d8c6653a Merge branch 'prettier-slider' into 'main'
Prettier slider

Closes #28

See merge request Crondung/hsma_cpd!12
2023-02-26 11:48:10 +00:00
Kai Mannweiler df38c25bc4 Fixed Timezone Bug 2023-02-26 12:44:01 +01:00
Julian Gegner f89fb41397 add iconbuttons to change slider value 2023-02-26 11:30:24 +01:00
Julian Gegner 449230e8d9 fix slider bug 2023-02-26 10:44:16 +01:00
Parricc35 6ed9c23901 music is working on a android phone 2023-02-26 00:32:58 +01:00
Julian Gegner 9d08c15119 Merge branch 'main' into '8-datenbank-einbinden'
# Conflicts:
#   lib/main.dart
2023-02-25 18:00:30 +00:00
Julian Gegner e049aceb8f added export button for testing read operation on db 2023-02-25 18:56:07 +01:00
Julian Gegner be600f98c8 add missing tables, functionality for sleep save and read 2023-02-25 18:55:49 +01:00
Julian Gegner c6075848cf init database on appstart 2023-02-25 18:55:03 +01:00
Julian Gegner 265e174889 use int for slider value in form, save model on form complete 2023-02-25 18:54:54 +01:00
Julian Gegner abbbc4a8c4 changed models, added function from db to model 2023-02-25 18:54:23 +01:00
Parricc35 a975a44f4e wip 2023-02-25 15:52:07 +01:00
Julian Gegner 9a13cfb9f1 date to string 2023-02-25 15:30:04 +01:00
Kai Mannweiler 09d5e51377 Test Notification 2023-02-25 14:58:10 +01:00
Kai Mannweiler 36abb7da36 fixed dates before now 2023-02-25 14:39:05 +01:00
Kai Mannweiler d917387bb4 Fixed IOS bug 2023-02-25 14:19:55 +01:00
Kai Mannweiler 16731529a4 Fixed Timezones Bug 2023-02-25 08:35:46 +01:00
Kai Mannweiler 3f3cc26325 Convert Settings to Notificationdates 2023-02-24 20:30:51 +01:00
Kai Mannweiler de7361f9ad Added Notifications 2023-02-24 20:30:28 +01:00
Parricc35 aeeca1d2b7 Merge branch 'timer-fix' into 'Timer-popup'
enable timer to replay music

See merge request Crondung/hsma_cpd!8
2023-02-23 17:05:18 +00:00