Commit graph

311 commits

Author SHA1 Message Date
sliang17
89d16cbefd modified spelling mistakes and remove p tags 2019-02-20 16:06:46 -08:00
sliang17
5e7972bed9 Add text content at home page 2019-02-20 11:21:15 -08:00
Logan Miller
161555b20f
Merge pull request #92 from danieldupriest/implement-submit-report
Reports can now be 'submitted', and you cannot modify submitted reports.
2019-02-19 15:40:12 -08:00
kououken
c899263f0c Changed error status to 409, which makes more sense. 2019-02-19 15:33:01 -08:00
rupikad
38b71d33d0
Merge pull request #90 from danieldupriest/fix-admin-css
Added 3rd 'admin' server on port 8445 to serve admin css/js.
2019-02-19 14:36:24 -08:00
kououken
deabfa8dd1 Reports can now be 'submitted', and you cannot modify submitted reports. 2019-02-19 12:45:39 -08:00
ppdom
744505346f
Merge pull request #91 from danieldupriest/newSubmitButton
Update the submit report button
2019-02-18 20:21:37 -08:00
sliang17
440f54db85 Update the submit report button 2019-02-18 20:14:48 -08:00
kououken
12e9b2a8be Updated django to 2.1.6 2019-02-18 18:17:45 -08:00
kououken
8586077a84 Added 3rd 'admin' server on port 8445 to serve admin css/js. 2019-02-18 17:48:51 -08:00
Logan Miller
adc3b5863f
Merge pull request #88 from danieldupriest/add-spinners
Add spinners
2019-02-17 21:43:02 -08:00
hui2018
a18ead6f7f
Merge pull request #87 from danieldupriest/add-rules-to-section
Added rules to section and comment backend code
2019-02-16 20:19:22 -08:00
Preston Doman
48ea8d59b9 Remove console logs 2019-02-16 20:05:32 -08:00
Preston Doman
20d3b08653 Add spinner to the save button 2019-02-16 19:58:55 -08:00
Preston Doman
8f98dc06ec Remove logging statements 2019-02-16 18:56:16 -08:00
Preston Doman
30676d35ab Add function to refresh page on new report close 2019-02-16 18:42:19 -08:00
Preston Doman
e1873fe4ae Add loading spinner to report table 2019-02-16 16:41:11 -08:00
Preston Doman
13ba704824 Fix empty report table message 2019-02-16 16:07:43 -08:00
kououken
c864d4dd5a Merged changes from master. 2019-02-16 12:21:29 -08:00
Logan Miller
8da8e55279
Merge pull request #86 from danieldupriest/fix-input-fields
Fix input fields
2019-02-16 12:11:47 -08:00
kououken
d1bdab0701 Added docstring comments to all functions and classes. Renamed 'get_reports' to 'get_report'. 2019-02-16 12:11:37 -08:00
Logan Miller
04f36014a3
Merge pull request #81 from danieldupriest/owner-check
Implemented owner-checking and Unauthorized error messages.
2019-02-16 11:57:17 -08:00
kououken
52fa39aa7a Merge remote-tracking branch 'origin/master' into owner-check 2019-02-16 10:37:32 -08:00
Daniel Dupriest
c5b50715d3
Merge pull request #85: Return section json when section updated
prints out JSON with section & field details
2019-02-16 10:33:48 -08:00
kououken
915c470904 Remerged changes from master. 2019-02-16 08:31:45 -08:00
kououken
6babc7ac86 Minor README.md change to force commit. 2019-02-16 08:26:21 -08:00
kououken
76974eb5c8 Implemented owner-checking and Unauthorized error messages. 2019-02-16 08:22:05 -08:00
Rupika
f987897ef7 prints out JSON with section & field details 2019-02-15 22:41:54 -08:00
rupikad
14a77c95ea
Merge pull request #82 from danieldupriest/in-order-fields
Added 'number' attribute to fields in the policy file, so they actually sort
2019-02-15 22:28:07 -08:00
rupikad
80c9c0add6
Merge branch 'master' into in-order-fields 2019-02-15 22:27:45 -08:00
Preston Doman
abf1f26c74 Merge branch 'master' into fix-input-fields 2019-02-15 21:04:14 -08:00
ppdom
490dc444a2
Merge pull request #83 from danieldupriest/file_upload_api
File upload api
2019-02-15 20:47:43 -08:00
Preston Doman
0f53c69e2d Fix input field formatting 2019-02-15 20:15:39 -08:00
Rupika
c49544c80d Merge branch 'master' into file_upload_api 2019-02-15 15:30:45 -08:00
Rupika
6bc9171e7e optimized "check_section" function to invoke field.completed boolean 2019-02-15 15:28:39 -08:00
kououken
dccc35b794 Fixed stupid single vs. double quote error. 2019-02-15 15:18:02 -08:00
kououken
98f39d242d Patched policy link bug where links were opening in the same tab, navigating away from the page. 2019-02-15 15:12:59 -08:00
kououken
f7bee92fcd Added 'number' attribute to fields in the policy file, then sorted by this number when displaying. 2019-02-15 14:59:42 -08:00
Rupika
e48a67b988 tweaked section completed boolean and got file functionality working 2019-02-15 14:45:49 -08:00
kououken
142beff183 Implemented owner-checking and Unauthorized error messages. 2019-02-15 14:21:48 -08:00
Daniel Dupriest
4077bd1d0b
Merge pull request #80: Section complete/incomplete implemented
Section complete boolean
2019-02-15 13:01:22 -08:00
Rupika
1f4cf8a43c changed per diem trip duration to integer from decimal 2019-02-14 19:28:21 -08:00
Rupika
38e29903fe Merge branch 'master' into section_complete_boolean 2019-02-14 17:55:57 -08:00
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