Commit Graph

367 Commits

Author SHA1 Message Date
8a5904d513 Merge branch '118-donut-diagram-for-time-balance-over-all-accounts' into 'master'
Resolve "Donut diagram for time balance over all accounts"

Closes #118

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!101
2020-06-06 16:46:50 +00:00
edd03c5a7e Add donut diagram for time by type paid for accounts with revenue calc display in tooltip 2020-06-06 18:39:30 +02:00
Tim Zieger
5e13d103d0 Merge branch '124-fill-about-page-with-content' into 'master'
Resolve "Fill about page with content"

Closes #124

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!100
2020-06-05 09:34:03 +00:00
Tim Zieger
d235c8ddc0 Fill about page with contend 2020-06-05 11:25:39 +02:00
Tobias Wieck
23aa33209a Merge branch '101-get-todays-entries' into 'master'
Resolve "Get todays entries"

Closes #101

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!98
2020-06-04 19:10:53 +00:00
wiecktobi
8e73cc6e2c Fix problems and finish app 2020-06-04 18:45:10 +02:00
wiecktobi
c304632d6e Query /today endpoint an display response 2020-06-03 23:49:00 +02:00
Tim Zieger
aab586a4c8 Merge branch '120-frontend-code-cleanup' into 'master'
Resolve "Frontend code cleanup"

Closes #120

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!99
2020-06-03 14:44:54 +00:00
Tim Zieger
6a42650c40 Cleanup frontend code 2020-06-03 16:32:36 +02:00
wiecktobi
08ffe71433 Add recycler view with hardcoded values 2020-06-03 01:22:09 +02:00
wiecktobi
2ed09692f8 Small changes for user with no data 2020-06-02 23:09:15 +02:00
wiecktobi
20ab2931f2 Change button text 2020-06-02 22:47:23 +02:00
wiecktobi
c11d57de2e Update version and fix issue to show only accounts belonging to the user 2020-06-02 22:04:38 +02:00
Tim Zieger
b0759a64b7 Merge branch '126-remove-create-buttons-if-logged-out' into 'master'
Resolve "Remove create buttons if logged out"

Closes #126

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!97
2020-06-02 10:26:23 +00:00
Tim Zieger
a80acb0797 Remove crate Butttons if logged out 2020-06-02 12:16:30 +02:00
Tim Zieger
b379a750dc Merge branch '127-query-all-users' into 'master'
Resolve "Query all users"

Closes #127

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!96
2020-06-02 09:43:43 +00:00
Tim Zieger
8c75cf414f Implement pages for admin view 2020-06-02 11:34:30 +02:00
Tim Zieger
5597afb4b0 Merge branch '123-query-all-pages-when-more-than-20-entries-are-present' into 'master'
Resolve "Query all pages when more than 20 entries are present"

Closes #123

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!95
2020-06-02 09:15:42 +00:00
Tim Zieger
e30aa5798a Remove sort funktion and Add pagin 2020-06-02 11:06:07 +02:00
Tim Zieger
3e772d989e Merge branch '119-change-fontsize-for-edit-views' into 'master'
Resolve "Change fontsize for edit views"

Closes #119

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!94
2020-06-01 10:11:26 +00:00
Tim Zieger
7954bf7c04 Change h tags to p with pt 2020-06-01 11:58:22 +02:00
Tim Zieger
e2c698fd08 Merge branch '122-fix-date-and-time-pickers' into 'master'
Resolve "Fix date and time pickers"

Closes #122

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!93
2020-06-01 09:25:12 +00:00
Tim Zieger
8e54997b87 Fix pickers 2020-06-01 11:15:29 +02:00
Tim Zieger
f2397c6c92 Merge branch '107-sort-timerecords-by-date' into 'master'
Resolve "Sort timerecords by date"

Closes #107

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!92
2020-06-01 08:53:21 +00:00
Tim Zieger
04c9b7b55f Implemented sort for records 2020-06-01 10:44:45 +02:00
daf542c527 Merge branch '117-change-date-calculation-of-the-today-endpoint' into 'master'
Resolve "Change date calculation of the /today endpoint"

Closes #117

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!91
2020-05-31 21:36:03 +00:00
0a0bc34e38 Fix today endpoint to only show entries for today
Add more sample data
2020-05-31 23:29:13 +02:00
207b22afa1 Merge branch '95-fill-diagrams-with-data' into 'master'
Resolve "Fill diagrams with data"

Closes #95

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!82
2020-05-31 19:17:36 +00:00
Tim Zieger
09d206c279 Merge branch '58-fill-home-with-content' into 'master'
Resolve "Fill Home with content"

Closes #58

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!84
2020-05-31 19:16:55 +00:00
Tim Zieger
b07e5cd357 Implemented fill home with contend 2020-05-31 20:55:25 +02:00
918cf67b1f Implement diagrams with backend data 2020-05-31 20:48:51 +02:00
9a8faa3f0d Fix bug in documentation build script 2020-05-30 22:25:26 +02:00
8f2b697f05 Merge branch 'documentation-pipeline' into 'master'
Add documentation build step to CI

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!89
2020-05-30 19:59:25 +00:00
179af69564 Add documentation build step to CI 2020-05-30 21:57:05 +02:00
ca4da8c993 Merge branch 'improve-mr-build-times' into 'master'
Change builds to only build the specific module

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!87
2020-05-30 19:29:17 +00:00
5060da28ca Change builds to only build the specific module 2020-05-30 21:23:24 +02:00
61fccccd33 Merge branch '93-table-of-contents' into 'master'
Resolve "Table of contents"

Closes #93

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!86
2020-05-30 19:15:12 +00:00
0c1550c7a7 Extract large sections into separate files 2020-05-30 20:50:22 +02:00
b602db1bd9 Split project into main sections 2020-05-30 20:39:33 +02:00
cf00b314d3 Remove old structure 2020-05-30 19:49:35 +02:00
bd1795fb7e Add samples for the documentation 2020-05-30 19:44:45 +02:00
f3952c1ea8 Merge branch '106-fix-record-endpoint-allbetweenanduser' into 'master'
Resolve "Fix Record Endpoint allBetweenAndUser"

Closes #106

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!85
2020-05-30 17:05:16 +00:00
17a759ce1e bugfix for allBetweenAndUser Endpoint of records 2020-05-30 18:46:39 +02:00
Tim Zieger
ea4493f955 Merge branch '105-dropdown-edit-create-timetrack' into 'master'
Resolve "Dropdown edit create timetrack"

Closes #105

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!83
2020-05-30 09:11:06 +00:00
Tim Zieger
ea53de257e dropdown and projection for account 2020-05-30 10:54:00 +02:00
Tim Zieger
f3b9a0879b Merge branch '96-date-and-time-picker-for-timetracks' into 'master'
Resolve "date and time picker for timetracks"

Closes #96

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!81
2020-05-30 07:54:30 +00:00
Tim Zieger
3c4cbaf126 pickers 2020-05-29 17:34:23 +02:00
Tim Zieger
f509ad0d9a Merge branch '103-frontend-crashes-if-something-is-null' into 'master'
Resolve "Frontend crashes if something is null"

Closes #103

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!80
2020-05-29 08:23:06 +00:00
Tim Zieger
04abba8c1c bug fixed chrash if null 2020-05-29 10:05:18 +02:00
Tobias Wieck
d1910ea10d Merge branch '100-change-timetrack-account' into 'master'
Resolve "Change timetrack account"

Closes #100

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!76
2020-05-28 19:16:22 +00:00