Subversion Repositories SmartDukaan

Rev

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

Rev 4241 Rev 5203
Line 12... Line 12...
12 
import in.shop2020.model.v1.user.UserContextException;
 12 
import in.shop2020.model.v1.user.UserContextException;
13 
import in.shop2020.serving.auth.CRMAuthorizingRealm;
 13 
import in.shop2020.serving.auth.CRMAuthorizingRealm;
14 
import in.shop2020.thrift.clients.CRMClient;
 14 
import in.shop2020.thrift.clients.CRMClient;
15 
import in.shop2020.thrift.clients.UserClient;
 15 
import in.shop2020.thrift.clients.UserClient;
16 
import in.shop2020.util.CRMConstants;
 16 
import in.shop2020.util.CRMConstants;
- 
 
 17 
import in.shop2020.util.CRMConstants.ActivityCommonDescriptionMatrix;
17 
 
 18 
 
18 
import java.text.ParseException;
 19 
import java.text.ParseException;
19 
import java.util.ArrayList;
 20 
import java.util.ArrayList;
20 
import java.util.Collections;
 21 
import java.util.Collections;
21 
import java.util.List;
 22 
import java.util.List;
Line 32... Line 33...
32 
     */
 33 
     */
33 
    private static final long serialVersionUID = 1L;
 34 
    private static final long serialVersionUID = 1L;
34 
    private List<Activity>    activities;
 35 
    private List<Activity>    activities;
35 
    private String            activityId;
 36 
    private String            activityId;
36 
    private String            description;
 37 
    private String            description;
- 
 
 38 
    private String			  commonDescription;
37 
    private String            type;
 39 
    private String            type;
38 
    private String            category;
 40 
    private String            category;
39 
    private String            customerMobileNumber;
 41 
    private String            customerMobileNumber;
40 
    private String            creatorId;
 42 
    private String            creatorId;
41 
    private String[]          agentIds;
 43 
    private String[]          agentIds;
Line 107... Line 109...
107 
        return EDIT_NEW;
 109 
        return EDIT_NEW;
108 
    }
 110 
    }
109 
 
 111 
 
110 
    public String create() throws Exception {
 112 
    public String create() throws Exception {
111 
        Activity activity = new Activity();
 113 
        Activity activity = new Activity();
- 
 
 114 
        if(commonDescription!=null && !commonDescription.isEmpty()){
- 
 
 115 
        	if(description!=null) {
- 
 
 116 
        		description = commonDescription + "  " +description;
- 
 
 117 
        	} else {
- 
 
 118 
        		description = commonDescription;
- 
 
 119 
        	}
- 
 
 120 
        }
112 
        activity.setDescription(description);
 121 
        activity.setDescription(description);
113 
        activity.setType(ActivityType.valueOf(type));
 122 
        activity.setType(ActivityType.valueOf(type));
114 
        activity.setCreatorId(CRMAuthorizingRealm.getAgent(currentAgentEmailId)
 123 
        activity.setCreatorId(CRMAuthorizingRealm.getAgent(currentAgentEmailId)
115 
                .getId());
 124 
                .getId());
116 
 
 125 
 
Line 194... Line 203...
194 
 
 203 
 
195 
    public Agent getAgent(long agentId) throws TException {
 204 
    public Agent getAgent(long agentId) throws TException {
196 
        return CRMAuthorizingRealm.getAgent(agentId);
 205 
        return CRMAuthorizingRealm.getAgent(agentId);
197 
    }
 206 
    }
198 
 
 207 
 
- 
 
 208 
    public ActivityCommonDescriptionMatrix[] getActivityCommonDescriptionMatrix () {
- 
 
 209 
        return CRMConstants.ActivityCommonDescriptionMatrix.values();
- 
 
 210 
    }
- 
 
 211
199 
    public String getDescription() {
 212 
    public String getDescription() {
200 
        return description;
 213 
        return description;
201 
    }
 214 
    }
202 
 
 215 
 
203 
    public void setDescription(String description) {
 216 
    public void setDescription(String description) {
204 
        this.description = description;
 217 
        this.description = description;
205 
    }
 218 
    }
206 
 
 219 
 
- 
 
 220 
    public String getCommonDescription() {
- 
 
 221 
		return commonDescription;
- 
 
 222 
	}
- 
 
 223 
 
- 
 
 224 
	public void setCommonDescription(String commonDescription) {
- 
 
 225 
		this.commonDescription = commonDescription;
- 
 
 226 
	}
- 
 
 227 
 
207 
    public String getType() {
 228 
	public String getType() {
208 
        return type;
 229 
        return type;
209 
    }
 230 
    }
210 
 
 231 
 
211 
    public void setType(String type) {
 232 
    public void setType(String type) {
212 
        this.type = type;
 233 
        this.type = type;