Subversion Repositories SmartDukaan

Rev

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

Rev 34275 Rev 34297
Line 52... Line 52...
52 
                "<th style='border:1px solid black;padding: 5px'>No.</th>" +
 52 
                "<th style='border:1px solid black;padding: 5px'>No.</th>" +
53 
                "<th style='border:1px solid black;padding: 5px'>Brand</th>" +
 53 
                "<th style='border:1px solid black;padding: 5px'>Brand</th>" +
54 
                "<th style='border:1px solid black;padding: 5px'>Vendor</th>" +
 54 
                "<th style='border:1px solid black;padding: 5px'>Vendor</th>" +
55 
                "<th style='border:1px solid black;padding: 5px'>Category</th>" +
 55 
                "<th style='border:1px solid black;padding: 5px'>Category</th>" +
56 
                "<th style='border:1px solid black;padding: 5px'>Model</th>" +
 56 
                "<th style='border:1px solid black;padding: 5px'>Model</th>" +
- 
 
 57 
                "<th style='border:1px solid black;padding: 5px'>Colour</th>" +
57 
                "<th style='border:1px solid black;padding: 5px'>Purchase</th>" +
 58 
                "<th style='border:1px solid black;padding: 5px'>Purchase</th>" +
58 
                "<th style='border:1px solid black;padding: 5px'>Sold</th>" +
 59 
                "<th style='border:1px solid black;padding: 5px'>Sold</th>" +
59 
                "<th style='border:1px solid black;padding: 5px'>Unsold</th>" +
 60 
                "<th style='border:1px solid black;padding: 5px'>Unsold</th>" +
60 
                "<th style='border:1px solid black;padding: 5px'>Age</th>" +
 61 
                "<th style='border:1px solid black;padding: 5px'>Age</th>" +
61 
 
 62 
 
Line 71... Line 72...
71 
            if (catalogAgedModel.getBrand().equals("Samsung")) {
 72 
            if (catalogAgedModel.getBrand().equals("Samsung")) {
72 
                sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getModel() + "</td>");
 73 
                sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getModel() + "</td>");
73 
            } else {
 74 
            } else {
74 
                sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getModelName() + "</td>");
 75 
                sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getModelName() + "</td>");
75 
            }
 76 
            }
- 
 
 77 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getColor().replaceFirst("f_", "") + "</td>");
76 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getPurchase() + "</td>");
 78 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getPurchase() + "</td>");
77 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getSold() + "</td>");
 79 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getSold() + "</td>");
78 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getUnsold() + "</td>");
 80 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getUnsold() + "</td>");
79 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getAge() + "</td>");
 81 
            sb.append("<td style='border:1px solid black;padding: 5px'>" + catalogAgedModel.getAge() + "</td>");
80 
            sb.append("</tr>");
 82 
            sb.append("</tr>");
Line 93... Line 95...
93 
                "niranjan.kala@smartdukaan.com",
 95 
                "niranjan.kala@smartdukaan.com",
94 
                "mohit.gulati@smartdukaan.com"
 96 
                "mohit.gulati@smartdukaan.com"
95 
//                "tejus.lohani@smartdukaan.com"
 97 
//                "tejus.lohani@smartdukaan.com"
96 
                ));
 98 
                ));
97 
 
 99 
 
98 
        // niranjan kala(authId -54) Team Emails,
 100 
//         niranjan kala(authId -54) Team Emails,
99 
        List<Integer> allReportees = authService.getAllReportees(54);
 101 
        List<Integer> allReportees = authService.getAllReportees(54);
100 
        List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(allReportees);
 102 
        List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(allReportees);
101 
        List<String> categotyTeamEmails = authUsers.stream().map(x -> x.getEmailId()).collect(Collectors.toList());
 103 
        List<String> categotyTeamEmails = authUsers.stream().map(x -> x.getEmailId()).collect(Collectors.toList());
102 
 
 104 
 
103 
        allEmails.addAll(categotyTeamEmails);
 105 
        allEmails.addAll(categotyTeamEmails);