Ignore:
Timestamp:
Nov 15, 2010, 12:04:41 PM (14 years ago)
Author:
gav
Message:

Return error message on immediate callouts report submit when endDate < startDate.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/services/TaskReportService.groovy

    r708 r709  
    169169        def result = [:]
    170170
     171        def fail = { Map m ->
     172            result.error = [ code: m.code, args: [] ]
     173            return result
     174        }
     175
    171176        def namedParams = [:]
    172177        namedParams.startDate = params.startDate ?: dateUtilService.today
    173         namedParams.endDatePlusOne = (params.endDate ?: dateUtilService.today)+1
     178        namedParams.endDate = params.endDate ?: dateUtilService.today
     179
     180        if(namedParams.endDate < namedParams.startDate)
     181            return fail(code: "default.end.date.before.start.date")
     182
     183        namedParams.endDate++ // Start of next day required.
     184
    174185        namedParams.immediateCallout = TaskType.read(1)
    175186
    176187        result.taskQuery = "from Task as task \
    177188                                            where (task.trash = false \
    178                                                         and task.targetStartDate < :endDatePlusOne \
     189                                                        and task.targetStartDate < :endDate \
    179190                                                        and task.targetStartDate >= :startDate \
    180191                                                        and task.taskType = :immediateCallout \
Note: See TracChangeset for help on using the changeset viewer.