| Line 696... |
Line 696... |
| 696 |
currentUserId = loginDetails.getFofoId();
|
696 |
currentUserId = loginDetails.getFofoId();
|
| 697 |
currentUserType = UserType.PARTNER;
|
697 |
currentUserType = UserType.PARTNER;
|
| 698 |
}
|
698 |
}
|
| 699 |
Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, currentUserId, currentUserType);
|
699 |
Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, currentUserId, currentUserType);
|
| 700 |
Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(ticketIds);
|
700 |
Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(ticketIds);
|
| - |
|
701 |
Map<Integer, Activity> lastMessageMap = csService.getLastMessageActivitiesForTickets(ticketIds);
|
| 701 |
model.addAttribute("unreadMap", unreadMap);
|
702 |
model.addAttribute("unreadMap", unreadMap);
|
| 702 |
model.addAttribute("lastActivityMap", lastActivityMap);
|
703 |
model.addAttribute("lastActivityMap", lastActivityMap);
|
| - |
|
704 |
model.addAttribute("lastMessageMap", lastMessageMap);
|
| 703 |
|
705 |
|
| 704 |
model.addAttribute("tickets", tickets);
|
706 |
model.addAttribute("tickets", tickets);
|
| 705 |
model.addAttribute("resolved", ActivityType.RESOLVED);
|
707 |
model.addAttribute("resolved", ActivityType.RESOLVED);
|
| 706 |
model.addAttribute("resolved-accepted", ActivityType.RESOLVED_ACCEPTED);
|
708 |
model.addAttribute("resolved-accepted", ActivityType.RESOLVED_ACCEPTED);
|
| 707 |
model.addAttribute("resolved-rejected", ActivityType.RESOLVED_REJECTED);
|
709 |
model.addAttribute("resolved-rejected", ActivityType.RESOLVED_REJECTED);
|
| Line 1027... |
Line 1029... |
| 1027 |
.stream().collect(Collectors.toMap(AuthUser::getId, x -> x));
|
1029 |
.stream().collect(Collectors.toMap(AuthUser::getId, x -> x));
|
| 1028 |
}
|
1030 |
}
|
| 1029 |
}
|
1031 |
}
|
| 1030 |
|
1032 |
|
| 1031 |
Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, authUser.getId(), UserType.AUTH_USER);
|
1033 |
Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, authUser.getId(), UserType.AUTH_USER);
|
| - |
|
1034 |
List<Integer> partnerTicketIds = tickets.stream().map(Ticket::getId).collect(Collectors.toList());
|
| 1032 |
Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(
|
1035 |
Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(partnerTicketIds);
|
| 1033 |
tickets.stream().map(Ticket::getId).collect(Collectors.toList()));
|
1036 |
Map<Integer, Activity> lastMessageMap = csService.getLastMessageActivitiesForTickets(partnerTicketIds);
|
| 1034 |
model.addAttribute("unreadMap", unreadMap);
|
1037 |
model.addAttribute("unreadMap", unreadMap);
|
| 1035 |
model.addAttribute("lastActivityMap", lastActivityMap);
|
1038 |
model.addAttribute("lastActivityMap", lastActivityMap);
|
| - |
|
1039 |
model.addAttribute("lastMessageMap", lastMessageMap);
|
| 1036 |
|
1040 |
|
| 1037 |
model.addAttribute("ticketStatusValues", TicketStatus.values());
|
1041 |
model.addAttribute("ticketStatusValues", TicketStatus.values());
|
| 1038 |
model.addAttribute("orderByValues", SortOrder.values());
|
1042 |
model.addAttribute("orderByValues", SortOrder.values());
|
| 1039 |
model.addAttribute("selectedticketStatus", ticketStatus);
|
1043 |
model.addAttribute("selectedticketStatus", ticketStatus);
|
| 1040 |
model.addAttribute("selectedorderby", sortOrder);
|
1044 |
model.addAttribute("selectedorderby", sortOrder);
|
| Line 1174... |
Line 1178... |
| 1174 |
.stream().collect(Collectors.toMap(AuthUser::getId, x -> x));
|
1178 |
.stream().collect(Collectors.toMap(AuthUser::getId, x -> x));
|
| 1175 |
}
|
1179 |
}
|
| 1176 |
}
|
1180 |
}
|
| 1177 |
|
1181 |
|
| 1178 |
Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, authUser.getId(), UserType.AUTH_USER);
|
1182 |
Map<Integer, Boolean> unreadMap = csService.getUnreadStatusForTickets(tickets, authUser.getId(), UserType.AUTH_USER);
|
| - |
|
1183 |
List<Integer> managerTicketIds = tickets.stream().map(Ticket::getId).collect(Collectors.toList());
|
| 1179 |
Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(
|
1184 |
Map<Integer, Activity> lastActivityMap = csService.getLastActivitiesForTickets(managerTicketIds);
|
| 1180 |
tickets.stream().map(Ticket::getId).collect(Collectors.toList()));
|
1185 |
Map<Integer, Activity> lastMessageMap = csService.getLastMessageActivitiesForTickets(managerTicketIds);
|
| 1181 |
model.addAttribute("unreadMap", unreadMap);
|
1186 |
model.addAttribute("unreadMap", unreadMap);
|
| 1182 |
model.addAttribute("lastActivityMap", lastActivityMap);
|
1187 |
model.addAttribute("lastActivityMap", lastActivityMap);
|
| - |
|
1188 |
model.addAttribute("lastMessageMap", lastMessageMap);
|
| 1183 |
|
1189 |
|
| 1184 |
model.addAttribute("ticketStatusValues", TicketStatus.values());
|
1190 |
model.addAttribute("ticketStatusValues", TicketStatus.values());
|
| 1185 |
model.addAttribute("orderByValues", SortOrder.values());
|
1191 |
model.addAttribute("orderByValues", SortOrder.values());
|
| 1186 |
model.addAttribute("selectedticketStatus", ticketStatus);
|
1192 |
model.addAttribute("selectedticketStatus", ticketStatus);
|
| 1187 |
model.addAttribute("selectedorderby", sortOrder);
|
1193 |
model.addAttribute("selectedorderby", sortOrder);
|