Commit graph

110 commits

Author SHA1 Message Date
Preston Doman
e1b2259e85 Merge branch 'master' into mega-bug-fix 2019-02-14 17:48:20 -08:00
Rupika
04a742dec0 Merge branch 'master' into section_complete_boolean 2019-02-14 17:36:55 -08:00
Rupika
736f450013 extra changes for testing section complete 2019-02-14 17:36:33 -08:00
kououken
4704b86f2a Set section boolean values to default to False, and set field numerical values to default to 0. 2019-02-14 14:23:05 -08:00
kououken
f95bd9ecee Implemented rule_violations in json for GET report. 2019-02-14 14:19:15 -08:00
Preston Doman
f2f1a3399b Change checkbox to boolean select menu 2019-02-14 14:17:25 -08:00
Rupika
8164236513 added logic for section complete check 2019-02-14 13:26:26 -08:00
Rupika
a2deb2b1bd updated database with field_type 2019-02-13 23:36:29 -08:00
Rupika
c69ad9d9ad fix db conflict? 2019-02-13 23:09:57 -08:00
Rupika
91611a2fca commit 2019-02-13 22:52:24 -08:00
Rupika
614f7102ba altered data_date to accommodate null date values 2019-02-13 21:17:31 -08:00
Rupika
ff3923d367 successfully updates all fields given front end data. PENDING
1) need to tweak DB to accommodate NULL dates
2) insert file logic
2019-02-13 21:07:53 -08:00
kououken
9149abdacf Removed 'request.data' from section update api response due to file serialization bug. 2019-02-13 17:46:00 -08:00
Rupika
75932daef1 fix merge conflict 2019-02-13 17:45:39 -08:00
Rupika
11b1de72b3 revamped update logic -- updated dummy JSON to mirror a full report 2019-02-13 17:41:28 -08:00
kououken
70df4ec486 Changed 'type' references to 'field_type' in backend and a couple places in front end. 2019-02-13 17:38:27 -08:00
Rupika
b2088291df successfully updates section from the request.data -- dummy JSON in postman 2019-02-13 17:06:58 -08:00
Rupika
8d630bd351 hardcoded dummy json input and updated section 2019-02-13 16:24:17 -08:00
Preston Doman
74098cf80c Add frontend save section functionality 2019-02-13 00:48:35 -08:00
Rupika
e7161c7ff9 clean up code 2019-02-11 12:36:24 -08:00
Rupika
01e1d1ffee Fixed deleted report message 2019-02-10 19:59:28 -08:00
Rupika
7b2c58cb2d deleting the file in database if it exists in report 2019-02-10 19:23:12 -08:00
Rupika
26aa235612 section 4 per diem link 2019-02-10 12:44:26 -08:00
Rupika
7c1c41e828 made per diem link visible 2019-02-10 12:25:45 -08:00
Rupika
c0768aaed3 added delete report SQL call 2019-02-09 15:39:48 -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
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
Rupika
9552589e24 added filter by user_id -- now reports only display based on user id 2019-02-07 17:13:43 -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
kououken
1ec02e1d22 Added report_pk to reports api endpoint> 2019-02-05 12:48:49 -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
c2e3d3640c removed extra comments from dummy api 2019-02-04 17:14:29 -08:00
Rupika
ae86657fcd Deleted serializer.py and committing final changes 2019-02-04 12:10:12 -08:00
Rupika
ebed65f723 Committing my work from api-remove-endpoint to new branch 2019-02-04 09:51:36 -08:00
kououken
20d0c48839 Token authentication, api endpoints and 'BearerAuthentication' working. 2019-02-03 16:56:34 -08:00
Rupika
e0611793f6 Printing the data from the database - need to update the functionality to prevent overwriting 2019-02-03 00:47:04 -08:00
kououken
6ae79194d0 Merged data fields into Field table, added 'required' and 'auto_submit' fields to Section. 2019-01-31 16:55:11 -08:00
ppdom
c569993f75
Merge pull request #45 from danieldupriest/rework-policy-files
Moved policy files into 'backend/' and fixed (most) formatting issues.
2019-01-30 01:16:02 -08:00
rupikad
0b04057da2
Merge pull request #43 from danieldupriest/api-endpoint-rework
Reworked API endpoints with correct types and some sample JSON.
2019-01-29 17:03:12 -08:00
kououken
875641fbe4 Fixed policy file spacing. 2019-01-29 16:56:56 -08:00
kououken
a70d9aa6bc Moved policy files into 'backend/' and fixed (most) formatting issues. 2019-01-29 16:39:35 -08:00
kououken
1ff30226f9 Added 'report_pk' to report list json. 2019-01-28 13:23:49 -08:00
kououken
a4dbb3f644 Reworked API endpoints with correct types and some sample JSON. 2019-01-27 14:22:42 -08:00
kououken
1a68176f80 Gave all models string representations and set up file storage. 2019-01-25 14:37:03 -08:00
Rupika
c9fbe8d60e adding model = models.report 2019-01-25 12:45:34 -08:00
Rupika
496ec5626e fix errors 2019-01-23 18:18:19 -08:00
Rupika
fe516ec96b Got serializer code to work, need to fix submitting null "date submitted" fields in report 2019-01-23 13:40:37 -08:00
Rupika
4bc54d5dcc fixed merge conflict in settings.py? 2019-01-23 10:25:50 -08:00
Rupika
c2f1899e20 updating my code 2019-01-22 23:11:41 -08:00
Daniel Dupriest
63f3465ca4 Created initial user and some sample report objects. Initialized superuser to admin/admin 2019-01-22 17:03:07 -08:00
Daniel Dupriest
bd1bf44059 Created CustomUser and tweaked backend models. 2019-01-22 16:38:09 -08:00
Daniel Dupriest
36252079d7 Database models all implemented. Migrations made. 2019-01-20 14:39:11 -08:00
Rupika
f18d36e42d Removed database migration 2019-01-20 12:33:19 -08:00
Rupika
5d55d9d66f Fixed functionality and added JSON responses for corresponding views. 2019-01-20 11:58:30 -08:00
Rupika
c5e7fc879f Code is functional, but doesn't display corresponding JSON text for each view? 2019-01-20 00:24:39 -08:00
Rupika
be5c722eca Fixed merge conflict in reimbursinator/urls.py 2019-01-19 22:39:07 -08:00
Rupika
82c9a5fc46 Updating my code 2019-01-19 22:29:25 -08:00