WebSVN – SmartDukaan – Diff – /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java



 
    public String index() {
        try {
            SearchFilter searchFilter = new SearchFilter();
            
            if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
            	searchFilter.setNotShowPmTickets(true);
            }
            if (activityId != null && !activityId.isEmpty()) {
                searchFilter.setActivityId(Long.parseLong(activityId));
            } else if (userId != null && !userId.isEmpty()) {
                searchFilter.setCustomerId(Long.parseLong(userId));

        try {
            SearchFilter searchFilter = new SearchFilter();
            searchFilter.setIsActivityRead(false);
            searchFilter.setActivityCreatorIds(Collections.singletonList(CRMConstants.ADMIN_AGENT_ID));
 
            if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){
            	searchFilter.setNotShowPmTickets(true);
            }
            
            searchFilter.setTicketAssigneeIds(Collections
                    .singletonList(CRMAuthorizingRealm.getAgent(
                            currentAgentEmailId).getId()));

Subversion Repositories SmartDukaan

(root)/trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java – Rev 14904 → 14906

Rev 14904		Rev 14906
Line 50...		Line 50...
50		50
51	`public String index() {`	51	`public String index() {`
52	`try {`	52	`try {`
53	`SearchFilter searchFilter = new SearchFilter();`	53	`SearchFilter searchFilter = new SearchFilter();`
54		54
55	`if(notShowPmTickets!=null && !notShowPmTickets.isEmpty()){`	55	`if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){`
56	`searchFilter.setNotShowPmTickets(Boolean.parseBoolean(notShowPmTickets));`	56	`searchFilter.setNotShowPmTickets(true);`
57	`}`	57	`}`
58	`if (activityId != null && !activityId.isEmpty()) {`	58	`if (activityId != null && !activityId.isEmpty()) {`
59	`searchFilter.setActivityId(Long.parseLong(activityId));`	59	`searchFilter.setActivityId(Long.parseLong(activityId));`
60	`} else if (userId != null && !userId.isEmpty()) {`	60	`} else if (userId != null && !userId.isEmpty()) {`
61	`searchFilter.setCustomerId(Long.parseLong(userId));`	61	`searchFilter.setCustomerId(Long.parseLong(userId));`
Line 197...		Line 197...
197	`try {`	197	`try {`
198	`SearchFilter searchFilter = new SearchFilter();`	198	`SearchFilter searchFilter = new SearchFilter();`
199	`searchFilter.setIsActivityRead(false);`	199	`searchFilter.setIsActivityRead(false);`
200	`searchFilter.setActivityCreatorIds(Collections.singletonList(CRMConstants.ADMIN_AGENT_ID));`	200	`searchFilter.setActivityCreatorIds(Collections.singletonList(CRMConstants.ADMIN_AGENT_ID));`
201		201
202	`if(notShowPmTickets!=null && !notShowPmTickets.isEmpty()){`	202	`if(notShowPmTickets!=null && !notShowPmTickets.isEmpty() && "yes".equalsIgnoreCase(notShowPmTickets)){`
203	`searchFilter.setNotShowPmTickets(Boolean.parseBoolean(notShowPmTickets));`	203	`searchFilter.setNotShowPmTickets(true);`
204	`}`	204	`}`
205		205
206	`searchFilter.setTicketAssigneeIds(Collections`	206	`searchFilter.setTicketAssigneeIds(Collections`
207	`.singletonList(CRMAuthorizingRealm.getAgent(`	207	`.singletonList(CRMAuthorizingRealm.getAgent(`
208	`currentAgentEmailId).getId()));`	208	`currentAgentEmailId).getId()));`