Subversion Repositories SmartDukaan

Rev

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

Rev 34894 Rev 34963
Line 469... Line 469...
469
 
469
 
470
        if (leadStatus.contains(LeadStatus.All)) {
470
        if (leadStatus.contains(LeadStatus.All)) {
471
            leadStatus.add(LeadStatus.pending);
471
            leadStatus.add(LeadStatus.pending);
472
            leadStatus.add(LeadStatus.notInterested);
472
            leadStatus.add(LeadStatus.notInterested);
473
            leadStatus.add(LeadStatus.finalized);
473
            leadStatus.add(LeadStatus.finalized);
-
 
474
            leadStatus.add(LeadStatus.followUp);
474
        }
475
        }
475
        if (color.contains("All")) {
476
        if (color.contains("All")) {
476
            color.add("yellow");
477
            color.add("yellow");
477
            color.add("green");
478
            color.add("green");
478
        }
479
        }
Line 510... Line 511...
510
                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
511
                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
511
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
512
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
512
                    leads.addAll(leadFollowUp);
513
                    leads.addAll(leadFollowUp);
513
                }
514
                }
514
            } else {
515
            } else {
515
                if (!leadStatus.contains(LeadStatus.followUp)) {
516
                /*if (!leadStatus.contains(LeadStatus.followUp)) {
516
                    leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, localDateTime);
517
                    leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, localDateTime);
517
                }
518
                }
518
                if (leadStatus.contains(LeadStatus.followUp)) {
519
                if (leadStatus.contains(LeadStatus.followUp)) {
519
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
520
                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
520
                    leads.addAll(leadFollowUp);
521
                    leads.addAll(leadFollowUp);
521
                }
522
                }*/
-
 
523
 
-
 
524
                leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, localDateTime);
522
            }
525
            }
523
        }
526
        }
524
 
527
 
525
        // Build activity map and auth map (SAME AS VIEW ENDPOINT)
528
        // Build activity map and auth map (SAME AS VIEW ENDPOINT)
526
        if (!leads.isEmpty()) {
529
        if (!leads.isEmpty()) {