remove expenses explantion and just show links #1175
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
struan
force-pushed
the
313-expenses-links
branch
from
18a00d0
to
e9c2319
Compare
dracos
requested changes
Sep 15, 2016
| // Set the expenses URL if we know it | ||
| if (isset($MEMBER->extra_info['expenses_url'])) { | ||
| $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url']; | ||
| if (strtotime($data['entry_date']) > strtotime('2010-05-05')) { |
There was a problem hiding this comment.
You don't need the strtotimes here, string comparison will be fine.
| @@ -335,11 +336,24 @@ | |||
| # XXX This is current behaviour, but should probably now just be any recent MP | |||
| $data['has_expenses'] = isset($MEMBER->extra_info['expenses2004_col1']) || isset($MEMBER->extra_info['expenses2006_col1']) || isset($MEMBER->extra_info['expenses2007_col1']) || isset($MEMBER->extra_info['expenses2008_col1']); | |||
There was a problem hiding this comment.
has_expenses is presumably out of date in that all new MPs it'll be false? As per comment, should probably be any MP with a leave date since 2004 sometime. That'll then simplify the new code as well I think.
| $data['pre_2010_expenses'] = True; | ||
| $data['expenses_url_2004'] = 'http://mpsallowances.parliament.uk/mpslordsandoffices/hocallowances/allowances%2Dby%2Dmp/'; | ||
| } | ||
| if (strtotime($data['leave_date']) > strtotime('2010-05-05')) { |
| $data['pre_2010_expenses'] = True; | ||
| $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url']; | ||
| } else { | ||
| $data['pre_2010_expenses'] = True; |
dracos
requested changes
Sep 15, 2016
| @@ -333,13 +334,19 @@ | |||
| # Everyone who is currently somewhere has email alert signup, apart from current Sinn Fein MPs who are not MLAs | |||
| $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'SF' && !$MEMBER->current_member(HOUSE_TYPE_NI))); | |||
| # XXX This is current behaviour, but should probably now just be any recent MP | |||
There was a problem hiding this comment.
Can remove the XXX comment now :)
dracos
approved these changes
Sep 15, 2016
Instead of explaining why we don't have expenses for an MP just link to the information. Also fix it so we only link to the relevant information. Fixes #313
struan
force-pushed
the
313-expenses-links
branch
from
4d7dd6e
to
f8ffbfb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of explaining why we don't have expenses for an MP just link to
the information. Also fix it so we only link to the relevant
information.
Fixes #313