Subversion Repositories SmartDukaan

Rev

Rev 34703 | Rev 34715 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34703 Rev 34704
Line 912... Line 912...
912
            row.addAll(Arrays.asList(
912
            row.addAll(Arrays.asList(
913
                    twoAgo.getSecondaryTarget(),
913
                    twoAgo.getSecondaryTarget(),
914
                    twoAgo.getSecondaryAchieved(),
914
                    twoAgo.getSecondaryAchieved(),
915
                    twoAgo.getSecondaryReturn(),
915
                    twoAgo.getSecondaryReturn(),
916
                    twoAgo.getNetSecondary(),
916
                    twoAgo.getNetSecondary(),
917
                    twoAgo.getSecondaryAchievedPercent(),
917
                    twoAgo.getSecondaryAchievedPercent()+"%",
918
                    twoAgo.getTertiary(),
918
                    twoAgo.getTertiary(),
919
                    twoAgo.getTertiaryUnBilled()
919
                    twoAgo.getTertiaryUnBilled()
920
            ));
920
            ));
921
 
921
 
922
            // Last Month
922
            // Last Month
923
            row.addAll(Arrays.asList(
923
            row.addAll(Arrays.asList(
924
                    last.getSecondaryTarget(),
924
                    last.getSecondaryTarget(),
925
                    last.getSecondaryAchieved(),
925
                    last.getSecondaryAchieved(),
926
                    last.getSecondaryReturn(),
926
                    last.getSecondaryReturn(),
927
                    last.getNetSecondary(),
927
                    last.getNetSecondary(),
928
                    last.getSecondaryAchievedPercent(),
928
                    last.getSecondaryAchievedPercent()+"%",
929
                    last.getTertiary(),
929
                    last.getTertiary(),
930
                    last.getTertiaryUnBilled()
930
                    last.getTertiaryUnBilled()
931
            ));
931
            ));
932
 
932
 
933
            // Current Month
933
            // Current Month
934
            row.addAll(Arrays.asList(
934
            row.addAll(Arrays.asList(
935
                    current.getSecondaryTarget(),
935
                    current.getSecondaryTarget(),
936
                    current.getSecondaryAchieved(),
936
                    current.getSecondaryAchieved(),
937
                    current.getSecondaryReturn(),
937
                    current.getSecondaryReturn(),
938
                    current.getNetSecondary(),
938
                    current.getNetSecondary(),
939
                    current.getSecondaryAchievedPercent(),
939
                    current.getSecondaryAchievedPercent()+"%",
940
                    current.getTertiary(),
940
                    current.getTertiary(),
941
                    current.getTertiaryUnBilled()
941
                    current.getTertiaryUnBilled()
942
            ));
942
            ));
943
 
943
 
944
 
944
 
Line 955... Line 955...
955
                        fofoInvestmentModelValue.getAgreedInvestment(),
955
                        fofoInvestmentModelValue.getAgreedInvestment(),
956
                        fofoInvestmentModelValue.getWallet(),
956
                        fofoInvestmentModelValue.getWallet(),
957
                        fofoInvestmentModelValue.getPoAndBilled(),
957
                        fofoInvestmentModelValue.getPoAndBilled(),
958
                        fofoInvestmentModelValue.getMonthBeginingDrr(),
958
                        fofoInvestmentModelValue.getMonthBeginingDrr(),
959
                        fofoInvestmentModelValue.getRequiredDrr(),
959
                        fofoInvestmentModelValue.getRequiredDrr(),
960
                        fofoInvestmentModelValue.getDrrPercent(),
960
                        fofoInvestmentModelValue.getDrrPercent()+"%",
961
                        fofoInvestmentModelValue.getLastBillingDone(),
961
                        fofoInvestmentModelValue.getLastBillingDone(),
962
                        fofoInvestmentModelValue.getSlab()
962
                        fofoInvestmentModelValue.getSlab()
963
                ));
963
                ));
964
            }else {
964
            }else {
965
                row.addAll(Arrays.asList(
965
                row.addAll(Arrays.asList(