rupikad
|
614ff3bc20
|
Merge pull request #79 from danieldupriest/mega-bug-fix
Mega bug fix
|
2019-02-14 17:54:40 -08:00 |
|
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 |
|
hui2018
|
a4bf17ee71
|
Merge pull request #78 from danieldupriest/implement-rules
Implement rules for GET report
|
2019-02-14 16:35:26 -08:00 |
|
Preston Doman
|
03a3bf9ce4
|
Simplify section id assignment
|
2019-02-14 15:58:27 -08:00 |
|
Preston Doman
|
8706f998f5
|
Fix non-unique id bug on forms, inputs, etc
|
2019-02-14 15:36:31 -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 |
|
Preston Doman
|
5a4312305c
|
Fix modalLabel global variable bug
|
2019-02-14 14:21:43 -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 |
|
Daniel Dupriest
|
b052bfea3c
|
Merge pull request #76: Section Update implemented
Update section api
|
2019-02-14 12:20:28 -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 |
|
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 |
|