Subversion Repositories SmartDukaan

Rev

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

Rev 9338 Rev 11890
Line 156... Line 156...
156
	}
156
	}
157
 
157
 
158
	public List<Activity> getActivities(SearchFilter searchFilter)
158
	public List<Activity> getActivities(SearchFilter searchFilter)
159
	throws TException {
159
	throws TException {
160
		List<Activity> tactivities = new ArrayList<Activity>();
160
		List<Activity> tactivities = new ArrayList<Activity>();
161
		//Start:- Added By Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013
-
 
162
		in.shop2020.crm.domain.SearchFilter filter_to_check  =in.shop2020.crm.domain.SearchFilter.create(searchFilter);
161
		in.shop2020.crm.domain.SearchFilter filter_to_check  =in.shop2020.crm.domain.SearchFilter.create(searchFilter);
163
		List<in.shop2020.crm.domain.Activity> activities = activityHandler
162
		List<in.shop2020.crm.domain.Activity> activities = activityHandler
164
		.getActivities(filter_to_check);
163
		.getActivities(filter_to_check);
165
		in.shop2020.crm.domain.SearchFilter new_searchFilter = new in.shop2020.crm.domain.SearchFilter();
164
		in.shop2020.crm.domain.SearchFilter new_searchFilter = new in.shop2020.crm.domain.SearchFilter();
166
		//End:- Added By Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013
-
 
167
 
165
 
168
		if (activities != null) {
166
		if (activities != null) {
169
			for (in.shop2020.crm.domain.Activity ticket : activities) {
167
			for (in.shop2020.crm.domain.Activity ticket : activities) {
170
				//Start:- Added By Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013
-
 
171
				in.shop2020.crm.Activity activity = ticket.getThriftActivity();
168
				in.shop2020.crm.Activity activity = ticket.getThriftActivity();
172
				if(filter_to_check.getIsActivityRead()!=null && !filter_to_check.getIsActivityRead()){
169
				if(filter_to_check.getIsActivityRead()!=null && !filter_to_check.getIsActivityRead()){
173
					if(activity.getTicketId() > 0){
170
					if(activity.getTicketId() > 0){
174
						new_searchFilter.setTicketId(activity.getTicketId());
171
						new_searchFilter.setTicketId(activity.getTicketId());
175
						List<in.shop2020.crm.domain.Ticket> tickets_as_per_activity= ticketHandler.getTickets(new_searchFilter);
172
						List<in.shop2020.crm.domain.Ticket> tickets_as_per_activity= ticketHandler.getTickets(new_searchFilter);
176
						activity.setTicketStatus(tickets_as_per_activity.get(0).getStatus());
173
						activity.setTicketStatus(tickets_as_per_activity.get(0).getStatus());
177
					}
174
					}
178
				}
175
				}
179
				tactivities.add(activity);
176
				tactivities.add(activity);
180
				//End:- Added By Manish Sharma for Displaying Current Ticket Status for Unread Customer Activities on 21-Jun-2013
-
 
181
			}
177
			}
182
		}
178
		}
183
 
179
 
184
		return tactivities;
180
		return tactivities;
185
	}
181
	}