Commit graph

305 commits

Author SHA1 Message Date
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
rupikad
781d64a4e2
Merge pull request #74 from danieldupriest/from-type-to-field-type
From type to field type
2019-02-13 22:57:37 -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
e68e95e89c commiting db changes 2019-02-13 17:43:23 -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
Daniel Dupriest
69b57ff45a
Merge pull request #72 from danieldupriest/save-section
Add frontend save section functionality
2019-02-13 17:07:19 -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
ppdom
60eddf7ca4
Merge pull request #70 from danieldupriest/delete_file_db
Delete file db
2019-02-11 13:59:07 -08:00
Rupika
e7161c7ff9 clean up code 2019-02-11 12:36:24 -08:00
Rupika
c860ae7000 Merge branch 'master' into delete_file_db 2019-02-11 12:32:45 -08:00
rupikad
9a9afb85c3
Merge pull request #69 from danieldupriest/delete-report-action
Delete report action
2019-02-11 12:30:51 -08:00
Preston Doman
a419316608 Move rid attribute setting from event listener to createReportForm 2019-02-10 22:51:19 -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
Preston Doman
6bafd5d115 Remove some more 2019-02-10 18:37:44 -08:00
Preston Doman
c3c1b65094 Remove unused text-centering 2019-02-10 18:36:10 -08:00
Preston Doman
74d503c244 Refactor AJAX request code 2019-02-10 18:15:32 -08:00
Preston Doman
ae743ffb1a Fix merge conflict 2019-02-10 15:57:05 -08:00
Preston Doman
3e058ac604 Add delete report functionality 2019-02-10 15:46:27 -08:00
hui2018
16dbd04ef4
Merge pull request #65 from danieldupriest/new-report-form
New report form
2019-02-10 15:43:54 -08:00
ppdom
639fdcec8b
Merge pull request #66 from danieldupriest/delete_report_api
Delete report api
2019-02-10 13:32:47 -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
b0f489bfeb Merge branch 'master' of https://github.com/danieldupriest/reimbursinator into delete_report_api 2019-02-10 12:14:17 -08:00
Rupika
93d99e13f6 added delete report SQL call in views.py 2019-02-10 12:13:22 -08:00
Preston Doman
57a22df879 Remove unused file 2019-02-09 23:04:43 -08:00
Preston Doman
5427c026cf Fix form event listener 2019-02-09 23:02:01 -08:00
Preston Doman
da50627f51 Add loading message and modal fade 2019-02-09 22:23:08 -08:00
Preston Doman
9a20cf72a8 Fix merge conflict 2019-02-09 21:16:53 -08:00
Rupika
c0768aaed3 added delete report SQL call 2019-02-09 15:39:48 -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