Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Features #144

Merged
merged 28 commits into from
Oct 21, 2016
Merged

Features #144

merged 28 commits into from
Oct 21, 2016

Conversation

serge-gaia
Copy link
Contributor

@serge-gaia serge-gaia commented Oct 20, 2016 •
edited by dbca-asi
Loading

tony-gaia and others added 28 commits October 12, 2016 17:01
@tony-gaia
WIP Added fields from application appearing on licence
37cf0c7 
Extract fields from application schema / data

Show on issue licence page so they can be modified

Print on licence
@tony-gaia
W.I.P. Added various field types to extractable fields.
aebc4ee 
Preliminary work for label/checkbox case.
@serge-gaia
Set default table ordering of applications and licences to be the fir…
f525183 
…st col (lodegment/ licence number) to be descending
@serge-gaia
Rename application table column 'Lodge number' to 'Lodgement number'
73cb682
@serge-gaia
Merge branch 'master' into dash_order_by_date_desc
b18cd36
@serge-gaia
- Order applications by lodgement date
54b4f34 
- Licences table: replace start date by issue date and order by this column
@serge-gaia
Merge branch '1932_audit_trail' into dash_order_by_date_desc
31b39f7
@tony-gaia
Merge branch 'master' into 1933-extract-fields
8f431f6 
Conflicts:
	wildlifelicensing/apps/applications/views/issue.py
@serge-gaia
Merge branch 'master' into dash_order_by_date_desc
5e83931
@tony-gaia
Added ability to have checkbox licence fields.
79a7051
@serge-gaia
WIP: table settings in session. Basic done. Applied to officer/applic…
b759db8 
…ation
@serge-gaia
WIP: Implemented datatable session for officer/assessor
8372de0 
Missing: the onbehalf tables
@serge-gaia
Applied session to the onbehalf page
eb4f8ef
@serge-gaia
WIP: Substantial refactoring of the dashboard Table views.
4e0ef1c 
Applied to officer Applications and Licences.
TODO: officer returns, Assessor, and Customer.
@tony-gaia
Fixed up missing dates and handling of missing data (so as not to sho…
b8da9cc 
…w None)
@tony-gaia
Removed unnecessary import
66d80ef
@tony-gaia
Fixed up erronerous text insertion.
2b4e18e
@serge-gaia
Refactor table view complete.
8f9ee9c
@tony-gaia
Renamed licence_fields.html to extracted fields. Changed licence_fiel…
f807bfd 
…d to just field.
@serge-gaia
Update maths_helpers.py
2e67699
@tony-gaia
Changed maths_helpers to application_filters and changed divide_into …
90751f2 
…filter to derive_num_cols.
@tony-gaia
merged
8c4db41
@tony-gaia
Merge branch 'master' into 1933-extract-fields
c0f78a4
@tony-gaia
Merge branch '1933-extract-fields' of github.com:gaiaresources/ledger…
f52a3f4 
… into 1933-extract-fields

Created migration merge.

Conflicts:

wildlifelicensing/apps/applications/templatetags/maths_helpers.py
@serge-gaia
Update utils.py
009fb75
@serge-gaia
Merge pull request #119 from gaiaresources/1933-extract-fields
bdf0b23 
1933 extract fields
@tony-gaia
Update base.py
992a8ec
@tony-gaia
Merge pull request #120 from gaiaresources/dash_refactor
ac610d0 
Dash refactor
@coveralls
Copy link

coveralls commented Oct 20, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.3%) to 52.44% when pulling ac610d0 on gaiaresources:master into cb37761 on parksandwildlife:master.

@coveralls
Copy link

coveralls commented Oct 20, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.3%) to 52.44% when pulling ac610d0 on gaiaresources:master into cb37761 on parksandwildlife:master.

@wilsonc86
Copy link
Contributor

:lgtm:

Reviewed 25 of 25 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.

Comments from Reviewable

@dbca-asi dbca-asi merged commit 98f32ee into dbca-wa:master Oct 21, 2016
dbca-asi pushed a commit that referenced this pull request Mar 1, 2017
@tony-gaia
Merge pull request #144 from gaiaresources/2752_error_message_in_return
d374915 
2752 error message in return
sharpeez pushed a commit to sharpeez/ledger that referenced this pull request Mar 21, 2019
@wilsonc86
Merge pull request dbca-wa#144 from dbca-dragon/wildlifecompliance
7848aed 
Wildlifecompliance merge latest from dbca-dragon
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@serge-gaia @coveralls @wilsonc86 @dbca-asi @tony-gaia