Subversion Repositories SmartDukaan

Rev

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

Rev 14882 Rev 14898
Line 46... Line 46...
46 
 */
 46 
 */
47 
@SuppressWarnings("serial")
 47 
@SuppressWarnings("serial")
48 
public class HomeController extends BaseController {
 48 
public class HomeController extends BaseController {
49 
//    private static final Logger log        = Logger.getLogger(HomeController.class);
 49 
//    private static final Logger log        = Logger.getLogger(HomeController.class);
50 
    private static final Log log                   = LogFactory.getLog(HomeController.class);
 50 
    private static final Log log                   = LogFactory.getLog(HomeController.class);
- 
 
 51
- 
 
 52 
    public static final List<TicketCategory> profitMandiTicketCategoryList = new ArrayList<TicketCategory>() {
- 
 
 53 
        {
- 
 
 54 
            add(TicketCategory.PROFITMANDI_CASHBACK);
- 
 
 55 
            add(TicketCategory.PROFITMANDI_FEEDBACK);
- 
 
 56 
            add(TicketCategory.PROFITMANDI_ORDER_NOT_SEEN);
- 
 
 57 
            add(TicketCategory.PROFITMANDI_RECHARGE_ISSUE);
- 
 
 58 
            add(TicketCategory.PROFITMANDI_OTHER);
- 
 
 59 
        }
- 
 
 60 
    };
51 
 
 61 
 
52 
    private String              rechargeOrderId;
 62 
    private String              rechargeOrderId;
53 
    private String              deviceNumber;
 63 
    private String              deviceNumber;
54 
    private String              email;
 64 
    private String              email;
55 
    private String              orderId;
 65 
    private String              orderId;
Line 218... Line 228...
218 
                .singletonList(CRMConstants.ADMIN_AGENT_ID));
 228 
                .singletonList(CRMConstants.ADMIN_AGENT_ID));
219 
        searchFilter.setIsActivityRead(false);
 229 
        searchFilter.setIsActivityRead(false);
220 
 
 230 
 
221 
        agentUnreadActivityCount = 0;
 231 
        agentUnreadActivityCount = 0;
222 
        customerActivityCount = 0;
 232 
        customerActivityCount = 0;
- 
 
 233
- 
 
 234 
        long activityCount = 0;
223 
 
 235 
 
224 
        crmServiceClient = new CRMClient().getClient();
 236 
        crmServiceClient = new CRMClient().getClient();
225 
        List<Activity> activities = crmServiceClient.getActivities(searchFilter);
 237 
        List<Activity> activities = crmServiceClient.getActivities(searchFilter);
226 
 
 238 
 
227 
        if (activities != null) {
 239 
        if (activities != null) {
228 
            for (Activity activity : activities) {
 240 
            for (Activity activity : activities) {
229 
                if (CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId() == activity.getTicketAssigneeId()) {
 241 
                if (CRMAuthorizingRealm.getAgent(currentAgentEmailId).getId() == activity.getTicketAssigneeId() && !profitMandiTicketCategoryList.contains(activity.getTicketCategory())) {
230 
                    agentUnreadActivityCount++;
 242 
                    agentUnreadActivityCount++;
- 
 
 243 
                    activityCount++;
231 
                }
 244 
                }
232 
            }
 245 
            }
233 
 
 246 
 
234 
            customerActivityCount = activities.size();
 247 
            customerActivityCount = activityCount;
235 
        }
 248 
        }
236 
    }
 249 
    }
237 
 
 250 
 
238 
    private void loadActivityDetails() throws TException {
 251 
    private void loadActivityDetails() throws TException {
239 
        SearchFilter searchFilter = new SearchFilter();
 252 
        SearchFilter searchFilter = new SearchFilter();