kououken
|
d0fa8dbea8
|
Added error-checking when accessing policy file to catch changes.
|
2019-03-01 14:11:05 -08:00 |
|
kououken
|
4c5c3fed63
|
Subject line will omit RT formatting if no number is provided.
|
2019-03-01 13:11:41 -08:00 |
|
kououken
|
4dee825973
|
Updated frontend to send reference number when creating report.
|
2019-03-01 12:53:57 -08:00 |
|
kououken
|
c94bede4be
|
Added request tracker support as a 'reference_number' field in the report model.
|
2019-03-01 12:26:43 -08:00 |
|
kououken
|
b1b21c84c7
|
Added 'approved' field to sections. Added env to gitignore.
|
2019-03-01 11:38:12 -08:00 |
|
kououken
|
1d4d3912dc
|
Merged latest changes from master.
|
2019-02-23 13:55:22 -08:00 |
|
kououken
|
1c8eb17e85
|
Fixed 'lowest_fare' rule bug.
|
2019-02-23 12:59:27 -08:00 |
|
kououken
|
b19cd21b41
|
Repaired all the broken field references.
|
2019-02-22 19:22:32 -08:00 |
|
Daniel Dupriest
|
b28a73d97f
|
Create placeholder config file for server settings
|
2019-02-22 12:42:54 -08:00 |
|
Rupika
|
87a3074b16
|
removed number, id, and completed attributes from the JSON data section
|
2019-02-22 11:39:12 -08:00 |
|
kououken
|
b23fcaa4a2
|
Fixed bug in subject line formatting.
|
2019-02-21 19:41:26 -08:00 |
|
kououken
|
d876852e7e
|
Added rule violations to emails.
|
2019-02-21 16:43:39 -08:00 |
|
kououken
|
fbf89d4876
|
Implemented email sending code.
|
2019-02-21 16:18:39 -08:00 |
|
kououken
|
a07258c1f5
|
All sections added to policy file.
|
2019-02-20 17:38:57 -08:00 |
|
kououken
|
9ea335d68f
|
Fixed bugs in rules returning strings.
|
2019-02-20 17:05:36 -08:00 |
|
kououken
|
bc7fc340f5
|
Initial update of policy file.
|
2019-02-20 16:20:44 -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 |
|
kououken
|
deabfa8dd1
|
Reports can now be 'submitted', and you cannot modify submitted reports.
|
2019-02-19 12:45:39 -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 |
|
kououken
|
c864d4dd5a
|
Merged changes from master.
|
2019-02-16 12:21:29 -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 |
|
kououken
|
52fa39aa7a
|
Merge remote-tracking branch 'origin/master' into owner-check
|
2019-02-16 10:37:32 -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
|
80c9c0add6
|
Merge branch 'master' into in-order-fields
|
2019-02-15 22:27: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 |
|
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 |
|
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
|
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 |
|
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
|
93d99e13f6
|
added delete report SQL call in views.py
|
2019-02-10 12:13:22 -08:00 |
|
Rupika
|
c0768aaed3
|
added delete report SQL call
|
2019-02-09 15:39:48 -08:00 |
|
Rupika
|
e315355e81
|
fixing db
|
2019-02-09 15:32:15 -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
|
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 |
|
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 |
|
kououken
|
1ec02e1d22
|
Added report_pk to reports api endpoint>
|
2019-02-05 12:48:49 -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 |
|
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 |
|
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
|
c8ae149510
|
CSRF backend issue fixed. If cookies are maintained, it seems to work.
|
2019-02-03 18:30:42 -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 |
|
Logan Miller
|
9edf870a27
|
Merge pull request #49 from danieldupriest/database-merge-fields
Merged data fields into Field table, added 'required' and 'auto_submi…
|
2019-02-01 19:29:53 -08:00 |
|
kououken
|
b3ea00e135
|
Reordered apps and middleware in settings.py
|
2019-02-01 14:10:02 -08:00 |
|
kououken
|
0f12774c49
|
Fixed example data.
|
2019-02-01 12:09:52 -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 |
|
Logan Miller
|
0a930a21ed
|
Merge pull request #39 from danieldupriest/example_policy
Created example policy config file
|
2019-01-28 13:53:44 -08:00 |
|
Logan Miller
|
c665a83729
|
Merge pull request #37 from danieldupriest/model-string-representations
Gave all models string representations and set up file storage.
|
2019-01-28 13:49:52 -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 |
|
joe-arriaga
|
0f7d844dda
|
Update hasher.py
|
2019-01-26 12:05:07 -08:00 |
|
Joe Arriaga
|
368bc0964c
|
Replaced tabs with spaces in simple_poicy.py.
|
2019-01-25 21:29:38 -08:00 |
|
Daniel Dupriest
|
fbe95aac0b
|
Merge pull request #29 from danieldupriest/example_policy
Added example policy
|
2019-01-25 19:45:29 -08:00 |
|