Preston Doman
|
9a20cf72a8
|
Fix merge conflict
|
2019-02-09 21:16:53 -08:00 |
|
ppdom
|
edb7339543
|
Merge pull request #64 from danieldupriest/print_file_name
Print file name
|
2019-02-09 15:35:41 -08:00 |
|
Rupika
|
e315355e81
|
fixing db
|
2019-02-09 15:32:15 -08:00 |
|
ppdom
|
0ac8e5419e
|
Merge pull request #62 from danieldupriest/CreateTitleBox
Create the title text area in new report page
|
2019-02-09 15:29:33 -08:00 |
|
Daniel Dupriest
|
7a52211ad2
|
Merge pull request #63: Added View Report functionality
CheckingViewReport
|
2019-02-09 15:07:02 -08:00 |
|
kououken
|
d26b79c725
|
Tweaked database so 'Super Report' is submitted with some complete sections, for testing.
|
2019-02-09 14:00:49 -08:00 |
|
Rupika
|
7c472bb917
|
moved the get_data_type and get_path_leaf to models.py from views.py to clean up
|
2019-02-09 13:41:39 -08:00 |
|
Rupika
|
f3d76adf3c
|
extracts just the file name from the file path
|
2019-02-09 13:23:01 -08:00 |
|
Jack
|
8416c041d0
|
Add a condition to check if section is completed. If its complete it will display the information of that section if not it won't display
|
2019-02-09 12:32:28 -08:00 |
|
sliang17
|
bfef35a378
|
Create the title textarea in new report page
|
2019-02-09 12:27:09 -08:00 |
|
Jack
|
4ed0b26811
|
Merge branch 'master' into ViewReport
|
2019-02-08 17:31:36 -08:00 |
|
Jack
|
af2d748536
|
Display completed report. Login and go to report history and click on "view" button and the report will display
|
2019-02-08 17:26:45 -08:00 |
|
joe-arriaga
|
4c560062c7
|
Merge pull request #60 from danieldupriest/field_to_json
Field to json
|
2019-02-07 18:33:45 -08:00 |
|
Rupika
|
f8b6d665c7
|
changed the data_values to display as just "value" in the JSON data dict
|
2019-02-07 18:21:57 -08:00 |
|
Rupika
|
f19781a682
|
added function that displays data values
|
2019-02-07 18:13:32 -08:00 |
|
Daniel Dupriest
|
21440bf3dc
|
Merge pull request #59: Implemented policy parsing
Implemented policy parsing!
|
2019-02-07 17:49:05 -08:00 |
|
Rupika
|
9552589e24
|
added filter by user_id -- now reports only display based on user id
|
2019-02-07 17:13:43 -08:00 |
|
Rupika
|
ae12403a9d
|
Merge branch 'policy-parser' of https://github.com/danieldupriest/reimbursinator
|
2019-02-07 16:10:45 -08:00 |
|
kououken
|
38a9464870
|
Implemented policy parsing, applied policy to report creation, added field_name to fields.
|
2019-02-07 15:32:21 -08:00 |
|
Logan Miller
|
ca333a6047
|
Merge pull request #58 from danieldupriest/frontend-registration
Frontend registration
|
2019-02-06 21:14:44 -08:00 |
|
Preston Doman
|
fc2d2e9e9d
|
Fix formatting mistakes
|
2019-02-06 15:44:15 -08:00 |
|
Preston Doman
|
10c2a3e150
|
Add frontend registration functionality
|
2019-02-06 15:31:15 -08:00 |
|
rupikad
|
830509e8d4
|
Merge pull request #57 from danieldupriest/user-registration
User registration
|
2019-02-06 15:09:49 -08:00 |
|
kououken
|
d683ea8839
|
Fixed user authentication backend to allow login with email.
|
2019-02-06 13:22:40 -08:00 |
|
kououken
|
bdddb3cc03
|
Changed username frank to frank@frank.com. Password is still frank12345
|
2019-02-05 15:49:03 -08:00 |
|
kououken
|
6e8478cf67
|
Changed to email instead of username, added first and last name.
|
2019-02-05 15:38:34 -08:00 |
|
Jack
|
d4c972e5d9
|
successfully getting the correct report. still to do print report to modal
|
2019-02-05 15:31:55 -08:00 |
|
kououken
|
72ab00dd50
|
User registration endpoint working.
|
2019-02-05 14:56:48 -08:00 |
|
kououken
|
229acc0d7e
|
Merge branch 'master' into user-registration
|
2019-02-05 14:50:01 -08:00 |
|
hui2018
|
eee1c11541
|
Merge pull request #56 from danieldupriest/fix-login-logout
Fix login logout
|
2019-02-05 14:46:25 -08:00 |
|
kououken
|
1ec02e1d22
|
Added report_pk to reports api endpoint>
|
2019-02-05 12:48:49 -08:00 |
|
Jack
|
15d50a7c50
|
Display error message when login fails
|
2019-02-05 11:28:58 -08:00 |
|
Preston Doman
|
5d12cb64e4
|
Remove error message display
|
2019-02-05 10:12:30 -08:00 |
|
Preston Doman
|
efa342dc7f
|
Fix token authentication
|
2019-02-05 01:05:04 -08:00 |
|
kououken
|
68e2e29c73
|
Merge branch 'master' of https://github.com/danieldupriest/reimbursinator into user-registration
|
2019-02-04 18:29:19 -08:00 |
|
kououken
|
99b5bd1ca9
|
Configure registration app
|
2019-02-04 18:29:05 -08:00 |
|
Logan Miller
|
1af7c357e9
|
Merge pull request #55 from danieldupriest/remove_serializer
Remove serializer
|
2019-02-04 18:20:20 -08:00 |
|
Rupika
|
84aa01e008
|
1) added a user in the admin to change the user_id in report -- updated database!
2) removed double dictionary for fields in view.py
|
2019-02-04 18:02:32 -08:00 |
|
Rupika
|
08033fc117
|
fixed merge conflicts FINALLYgit add .!
|
2019-02-04 17:17:48 -08:00 |
|
Rupika
|
ba1146f9fd
|
replaced old db.sqlite3 with updated one from master
|
2019-02-04 17:16:50 -08:00 |
|
Rupika
|
c2e3d3640c
|
removed extra comments from dummy api
|
2019-02-04 17:14:29 -08:00 |
|
rupikad
|
a81f637cf9
|
Merge pull request #53 from danieldupriest/token-authentication
Token authentication
|
2019-02-04 16:51:36 -08:00 |
|
rupikad
|
a16ff029e1
|
Merge pull request #54 from danieldupriest/modal-edit-report
Add modal popup to the edit report form
|
2019-02-04 14:27:26 -08:00 |
|
Rupika
|
ae86657fcd
|
Deleted serializer.py and committing final changes
|
2019-02-04 12:10:12 -08:00 |
|
Rupika
|
eeac88a3ed
|
Merge branch 'master' of https://github.com/danieldupriest/reimbursinator into remove_serializer
|
2019-02-04 09:53:57 -08:00 |
|
Rupika
|
ebed65f723
|
Committing my work from api-remove-endpoint to new branch
|
2019-02-04 09:51:36 -08:00 |
|
Preston Doman
|
b076eae02b
|
Add new report functionality
|
2019-02-04 01:39:42 -08:00 |
|
kououken
|
b423d23eb6
|
Deleted extraneous Pipfile
|
2019-02-03 19:40:26 -08:00 |
|
kououken
|
132ea38da3
|
Merge branch 'master' into token-authentication
|
2019-02-03 19:30:53 -08:00 |
|
Preston Doman
|
b5b65c3b9e
|
Add modal popup to the edit report form
|
2019-02-03 19:03:20 -08:00 |
|