Implement OTP for multiple subunits #463
Open
Conversation
This file contains hidden or 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
mladjo2505
force-pushed
the
otp_multiple_subunits
branch
from
9f2309f to
4e569a2
Compare
mladjo2505
force-pushed
the
otp_multiple_subunits
branch
from
4e569a2 to
ad753e0
Compare
mladjo2505
commented
Apr 11, 2017
| virksomhet_otp_amounts[virksomhet_id] = 0; | ||
| } | ||
|
|
||
| function refreshSelectedWorkRelations() { |
Contributor
Author
There was a problem hiding this comment.
Instead of looping though all, pass an element and affect the object that keeps track of what is selected and call the function to render current subunits' OTP, same for salaries.
mladjo2505
commented
Apr 11, 2017
| } | ||
|
|
||
| function generateOTPInputsFromSelectedSalaries() { | ||
| refreshSelectedSalaries(); |
Contributor
Author
There was a problem hiding this comment.
Should be removed after the above change.
mladjo2505
commented
Apr 11, 2017
| var used_virksomhets = []; | ||
| for(var salary_id in salary_virksomhet_array) { | ||
| virksomhet_id = salary_virksomhet_array[salary_id]; | ||
| if (salary_selected[salary_id]) { |
Contributor
Author
There was a problem hiding this comment.
Update based on looping though selected salaries to set its subunit
mladjo2505
commented
Apr 11, 2017
| } | ||
| for(var work_relation_id in work_relation_virksomhet_array) { | ||
| virksomhet_id = work_relation_virksomhet_array[work_relation_id]; | ||
| if (work_relations_selected[work_relation_id]) { |
Contributor
Author
There was a problem hiding this comment.
same as for salaries
mladjo2505
commented
Apr 11, 2017
| } | ||
| } | ||
|
|
||
| $(document).ready(function() { |
mladjo2505
commented
Apr 11, 2017
| $query_altinn = "select * from $db_table order by AltinnReport1ID"; | ||
| $result = $_lib['db']->db_query($query_altinn); | ||
|
|
||
| $salary_workrelation_array = array(); |
Contributor
Author
There was a problem hiding this comment.
Try to move all js related stuff to one file and unify the php vars needed for it
mladjo2505
force-pushed
the
otp_multiple_subunits
branch
from
51af370 to
25b7794
Compare
mladjo2505
force-pushed
the
otp_multiple_subunits
branch
from
25b7794 to
8fe94e8
Compare
sls-lnluksa
added
1. round review
Testing in progress
and removed
Back to rework
1. round review
labels
sls-lnluksa
approved these changes
Apr 11, 2017
mladjo2505
commented
May 10, 2017
| } | ||
| foreach($this->pension as $zone_tax) { | ||
| $sumArbeidsgiveravgift += $zone_tax['avgiftsgrunnlagBeloep'] * $zone_tax['prosentsatsForAvgiftsberegning']/100.0; | ||
| if (!empty($this->pension[$key_subcompany])) { |
Contributor
Author
There was a problem hiding this comment.
check this part of the code
Contributor
Author
|
Fixed AGA calculation and tested it |
mladjo2505
force-pushed
the
otp_multiple_subunits
branch
from
02655ad to
b22795b
Compare
Contributor
Author
|
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.
Closes #350