Subversion Repositories SmartDukaan

Rev

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

Rev 5936 Rev 7596
Line 142... Line 142...
142 
    }
 142 
    }
143 
 
 143 
 
144 
    public List<Activity> getActivities(SearchFilter searchFilter)
 144 
    public List<Activity> getActivities(SearchFilter searchFilter)
145 
            throws TException {
 145 
            throws TException {
146 
        List<Activity> tactivities = new ArrayList<Activity>();
 146 
        List<Activity> tactivities = new ArrayList<Activity>();
- 
 
 147 
        //Start:- Added By Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013
- 
 
 148 
        in.shop2020.crm.domain.SearchFilter filter_to_check  =in.shop2020.crm.domain.SearchFilter.create(searchFilter);
147 
        List<in.shop2020.crm.domain.Activity> activities = activityHandler
 149 
        List<in.shop2020.crm.domain.Activity> activities = activityHandler
148 
                .getActivities(in.shop2020.crm.domain.SearchFilter
 150 
                .getActivities(filter_to_check);
149 
                        .create(searchFilter));
 151 
        in.shop2020.crm.domain.SearchFilter new_searchFilter = new in.shop2020.crm.domain.SearchFilter();
- 
 
 152 
        //End:- Added By Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013
150 
 
 153
151 
        if (activities != null) {
 154 
        if (activities != null) {
152 
            for (in.shop2020.crm.domain.Activity ticket : activities) {
 155 
            for (in.shop2020.crm.domain.Activity ticket : activities) {
- 
 
 156 
            	//Start:- Added By Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013
- 
 
 157 
            	in.shop2020.crm.Activity activity = ticket.getThriftActivity();
- 
 
 158 
            	if(filter_to_check.getIsActivityRead()!=null && !filter_to_check.getIsActivityRead()){
- 
 
 159 
	            	if(activity.getTicketId() > 0){
- 
 
 160 
		            	new_searchFilter.setTicketId(activity.getTicketId());
- 
 
 161 
		            	List<in.shop2020.crm.domain.Ticket> tickets_as_per_activity= ticketHandler.getTickets(new_searchFilter);
- 
 
 162 
		            	activity.setTicketStatus(tickets_as_per_activity.get(0).getStatus());
- 
 
 163 
		            }
- 
 
 164 
            	}
153 
                tactivities.add(ticket.getThriftActivity());
 165 
                tactivities.add(activity);
- 
 
 166 
                //End:- Added By Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013
154 
            }
 167 
            }
155 
        }
 168 
        }
156 
 
 169 
 
157 
        return tactivities;
 170 
        return tactivities;
158 
    }
 171 
    }