Subversion Repositories SmartDukaan

Rev

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

Rev 33778 Rev 33864
Line 480... Line 480...
480
        Map<Integer, TicketCategory> subCategoryIdAndCategoryMap = csService.getSubCategoryIdAndCategoryMap(subCategoryIds);
480
        Map<Integer, TicketCategory> subCategoryIdAndCategoryMap = csService.getSubCategoryIdAndCategoryMap(subCategoryIds);
481
 
481
 
482
        List<Integer> ticketIds = tickets.stream().map(x -> x.getId()).collect(Collectors.toList());
482
        List<Integer> ticketIds = tickets.stream().map(x -> x.getId()).collect(Collectors.toList());
483
 
483
 
484
        Map<Integer, List<Activity>> activityMap = new HashMap<Integer, List<Activity>>();
484
        Map<Integer, List<Activity>> activityMap = new HashMap<Integer, List<Activity>>();
-
 
485
        Map<Integer, List<Activity>> activityMapWithActivityId = new HashMap<>();
485
 
486
 
486
        if (!ticketIds.isEmpty()) {
487
        if (!ticketIds.isEmpty()) {
487
            activityMap = activityRepository.selectAll(ticketIds).stream().collect(Collectors.groupingBy(x -> x.getTicketId()));
488
            activityMap = activityRepository.selectAll(ticketIds).stream().collect(Collectors.groupingBy(x -> x.getTicketId()));
-
 
489
            activityMapWithActivityId = activityRepository.selectAll(ticketIds).stream().collect(Collectors.groupingBy(x -> x.getId()));
488
 
490
 
489
        }
491
        }
490
 
492
 
-
 
493
        List<AuthUser> authUsersList = authRepository.selectAll();
-
 
494
        Map<Integer, AuthUser> authUserMap = authUsersList.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
491
 
495
 
492
        model.addAttribute("tickets", tickets);
496
        model.addAttribute("tickets", tickets);
493
        model.addAttribute("resolved", ActivityType.RESOLVED);
497
        model.addAttribute("resolved", ActivityType.RESOLVED);
494
        model.addAttribute("resolved-accepted", ActivityType.RESOLVED_ACCEPTED);
498
        model.addAttribute("resolved-accepted", ActivityType.RESOLVED_ACCEPTED);
495
        model.addAttribute("resolved-rejected", ActivityType.RESOLVED_REJECTED);
499
        model.addAttribute("resolved-rejected", ActivityType.RESOLVED_REJECTED);
496
        model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
500
        model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
497
        model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
501
        model.addAttribute("subCategoryIdAndSubCategoryMap", subCategoryIdAndSubCategoryMap);
498
 
502
 
499
        model.addAttribute("subCategoryIdAndCategoryMap", subCategoryIdAndCategoryMap);
503
        model.addAttribute("subCategoryIdAndCategoryMap", subCategoryIdAndCategoryMap);
500
        model.addAttribute("activityMap", activityMap);
504
        model.addAttribute("activityMap", activityMap);
-
 
505
        model.addAttribute("authUserMap", authUserMap);
-
 
506
        model.addAttribute("activityMapWithActivityId", activityMapWithActivityId);
501
 
507
 
502
        model.addAttribute("ticketStatusValues", TicketStatus.values());
508
        model.addAttribute("ticketStatusValues", TicketStatus.values());
503
        model.addAttribute("orderByValues", SortOrder.values());
509
        model.addAttribute("orderByValues", SortOrder.values());
504
        model.addAttribute("selectedticketStatus", ticketStatus);
510
        model.addAttribute("selectedticketStatus", ticketStatus);
505
        model.addAttribute("selectedorderby", sortOrder);
511
        model.addAttribute("selectedorderby", sortOrder);