Index: /trunk/grails-app/i18n/messages.properties
===================================================================
--- /trunk/grails-app/i18n/messages.properties (revision 502)
+++ /trunk/grails-app/i18n/messages.properties (revision 503)
@@ -265,31 +265,38 @@
# TaskSearch Service
-task.search.text.my.todays=Today''s tasks for {0}.
-task.search.text.my.todays.none.found=No tasks found for {0} today.
-task.search.text.my.yesterdays=Yesterday''s tasks for {0}.
-task.search.text.my.yesterdays.none.found=No tasks found for {0} yesterday.
-task.search.text.my.tomorrows=Tomorrow''s tasks for {0}.
-task.search.text.my.tomorrows.none.found=No tasks found for {0} tomorrow.
-task.search.text.todays=Today's tasks.
-task.search.text.todays.none.found=No tasks found for today.
-task.search.text.yesterdays=Yesterday's tasks.
-task.search.text.yesterdays.none.found=No tasks found for yesterday.
-task.search.text.tomorrows=Tomorrow's tasks.
-task.search.text.tomorrows.none.found=No tasks found for tomorrow.
-task.search.text.past.week=Tasks in the past week.
-task.search.text.past.week.none.found=No tasks found in the past week.
-task.search.text.my.past.week=Tasks in the past week for {0}.
-task.search.text.my.past.week.none.found=No tasks found in the past week for {0}.
-task.search.text.budget.unplanned=Tasks with budget status of 'Unplanned', in the past week.
-task.search.text.budget.unplanned.none.found=No tasks found with budget status of 'Unplanned', in the past week.
-task.search.text.budget.planned=Tasks with budget status of 'Planned', in the past week.
-task.search.text.budget.planned.none.found=No tasks found with budget status of 'Planned', in the past week.
-task.search.text.planners.range=Planners Range - Tasks in the past week and two weeks ahead.
-task.search.text.planners.range.none.found=No tasks found in the past week or two weeks ahead.
+task.search.text.all.tasks.message=All tasks for {0}.
+task.search.text.all.tasks.none.found=No tasks found for {0}.
+task.search.text.all.tasks.between.message=All tasks between {0} and {1}.
+task.search.text.all.tasks.between.none.found=No tasks found between {0} and {1}.
+
+task.search.text.persons.tasks.message=Tasks for {0} on {1}.
+task.search.text.persons.tasks.none.found=No tasks found for {0} on {1}.
+task.search.text.persons.tasks.between.message=Tasks for {0} between {1} and {2}.
+task.search.text.persons.tasks.between.none.found=No tasks found for {0} between {1} and {2}.
+
+task.search.text.my.todays=Today
+task.search.text.my.todays.description=My tasks and approved tasks that I am assigned to.
+task.search.text.my.yesterdays=Yesterday
+task.search.text.my.tomorrows=Tomorrow
+task.search.text.my.past.week=Past Week
+task.search.text.todays=Today
+task.search.text.todays.description=All tasks that are not in the trash bin.
+task.search.text.yesterdays=Yesterday
+task.search.text.tomorrows=Tomorrow
+task.search.text.past.week=Past Week
+task.search.text.budget.unplanned=Unplanned Tasks
+task.search.text.budget.unplanned.message=Tasks with budget status of 'Unplanned' between {0} and {1}.
+task.search.text.budget.unplanned.none.found=No tasks found with budget status of 'Unplanned' between {0} and {1}.
+task.search.text.budget.planned=Planned Tasks
+task.search.text.budget.planned.description=Task with budget status of Planned, in the past week.
+task.search.text.budget.planned.message=Tasks with budget status of 'Planned' between {0} and {1}.
+task.search.text.budget.planned.none.found=No tasks found with budget status of 'Planned' between {0} and {1}.
+task.search.text.planners.range=Planners Range
+task.search.text.planners.range.description=Tasks in the past week and two weeks ahead.
task.search.calendar.text.too.many.results=Too many results, only {0} are shown.
task.search.text.work.done=Work Done
-task.search.text.work.done.none.found=No entries found for {0} on {1}.
task.search.text.work.done.description=Work done by person and date.
task.search.text.work.done.message=Work done by {0} on {1}.
+task.search.text.work.done.none.found=No entries found for {0} on {1}.
# InventoryItemSearch
Index: /trunk/grails-app/services/TaskSearchService.groovy
===================================================================
--- /trunk/grails-app/services/TaskSearchService.groovy (revision 502)
+++ /trunk/grails-app/services/TaskSearchService.groovy (revision 503)
@@ -23,6 +23,16 @@
def getQuickSearch(params, locale) {
def result = [:]
+ result.quickSearch = params.quickSearch ?: "plannersRange"
+
def currentUser = authService.currentUser
- result.quickSearch = params.quickSearch ?: "searchPlannersRange"
+ def startOfToday = dateUtilService.today
+ def startOfYesterday = dateUtilService.yesterday
+ def startOfTomorrow = dateUtilService.tomorrow
+ def oneWeekAgo = dateUtilService.oneWeekAgo
+
+ def formattedStartOfToday = g.formatDate(format: "EEE, dd-MMM-yyyy", date: startOfToday)
+ def formattedStartOfYesterday = g.formatDate(format: "EEE, dd-MMM-yyyy", date: startOfYesterday)
+ def formattedStartOfTomorrow = g.formatDate(format: "EEE, dd-MMM-yyyy", date: startOfTomorrow)
+ def formattedOneWeekAgo = g.formatDate(format: "EEE, dd-MMM-yyyy", date: oneWeekAgo)
def getMessage = { Map m ->
@@ -32,79 +42,104 @@
switch (result.quickSearch) {
case "myTodays":
- result.taskInstanceList = getMyTodays(params)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.my.todays", args:[currentUser])
- else
- result.message = getMessage(code:"task.search.text.my.todays.none.found", args:[currentUser])
+ result.taskInstanceList = getPersonsTasks(params)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.persons.tasks.message",
+ args:[currentUser, formattedStartOfToday])
+ else
+ result.message = getMessage(code:"task.search.text.persons.tasks.none.found",
+ args:[currentUser, formattedStartOfToday])
break
case "myYesterdays":
- result.taskInstanceList = getMyTodays(params, -1)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.my.yesterdays", args:[currentUser])
- else
- result.message = getMessage(code:"task.search.text.my.yesterdays.none.found", args:[currentUser])
+ result.taskInstanceList = getPersonsTasks(params, currentUser, startOfYesterday, startOfToday)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.persons.tasks.message",
+ args:[currentUser, formattedStartOfYesterday])
+ else
+ result.message = getMessage(code:"task.search.text.persons.tasks.none.found",
+ args:[currentUser, formattedStartOfYesterday])
break
case "myTomorrows":
- result.taskInstanceList = getMyTodays(params, 1)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.my.tomorrows", args:[currentUser])
- else
- result.message = getMessage(code:"task.search.text.my.tomorrows.none.found", args:[currentUser])
+ result.taskInstanceList = getPersonsTasks(params, currentUser, startOfTomorrow, startOfTomorrow+1)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.persons.tasks.message",
+ args:[currentUser, formattedStartOfTomorrow])
+ else
+ result.message = getMessage(code:"task.search.text.persons.tasks.none.found",
+ args:[currentUser, formattedStartOfTomorrow])
break
case "myPastWeek":
- result.taskInstanceList = getMyPastWeek(params)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.my.past.week", args:[currentUser])
- else
- result.message = getMessage(code:"task.search.text.my.past.week.none.found", args:[currentUser])
+ result.taskInstanceList = getPersonsTasks(params, currentUser, oneWeekAgo, startOfTomorrow)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.persons.tasks.between.message",
+ args:[currentUser, formattedOneWeekAgo, formattedStartOfToday])
+ else
+ result.message = getMessage(code:"task.search.text.persons.tasks.between.none.found",
+ args:[currentUser, formattedOneWeekAgo, formattedStartOfToday])
break
case "todays":
- result.taskInstanceList = getTodays(params)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.todays")
- else
- result.message = getMessage(code:"task.search.text.todays.none.found")
+ result.taskInstanceList = getTasks(params)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.all.tasks.message",
+ args:[formattedStartOfToday])
+ else
+ result.message = getMessage(code:"task.search.text.all.tasks.none.found",
+ args:[formattedStartOfToday])
break
case "yesterdays":
- result.taskInstanceList = getTodays(params, -1)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.yesterdays")
- else
- result.message = getMessage(code:"task.search.text.yesterdays.none.found")
+ result.taskInstanceList = getTasks(params, startOfYesterday, startOfToday)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.all.tasks.message",
+ args:[formattedStartOfYesterday])
+ else
+ result.message = getMessage(code:"task.search.text.all.tasks.none.found",
+ args:[formattedStartOfYesterday])
break
case "tomorrows":
- result.taskInstanceList = getTodays(params, 1)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.tomorrows")
- else
- result.message = getMessage(code:"task.search.text.tomorrows.none.found")
+ result.taskInstanceList = getTasks(params, startOfTomorrow, startOfTomorrow+1)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.all.tasks.message",
+ args:[formattedStartOfTomorrow])
+ else
+ result.message = getMessage(code:"task.search.text.all.tasks.none.found",
+ args:[formattedStartOfTomorrow])
break
case "pastWeek":
- result.taskInstanceList = getPastWeek(params)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.past.week")
- else
- result.message = getMessage(code:"task.search.text.past.week.none.found")
+ result.taskInstanceList = getTasks(params, oneWeekAgo, startOfTomorrow)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.all.tasks.between.message",
+ args:[formattedOneWeekAgo, formattedStartOfToday])
+ else
+ result.message = getMessage(code:"task.search.text.all.tasks.between.none.found",
+ args:[formattedOneWeekAgo, formattedStartOfToday])
break
case "budgetUnplanned":
- result.taskInstanceList = getBudgetUnplanned(params)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.budget.unplanned")
- else
- result.message = getMessage(code:"task.search.text.budget.unplanned.none.found")
+ result.taskInstanceList = getBudgetTasks(params, TaskBudgetStatus.read(1), oneWeekAgo, startOfTomorrow)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.budget.unplanned.message",
+ args:[formattedOneWeekAgo, formattedStartOfToday])
+ else
+ result.message = getMessage(code:"task.search.text.budget.unplanned.none.found",
+ args:[formattedOneWeekAgo, formattedStartOfToday])
break
case "budgetPlanned":
- result.taskInstanceList = getBudgetPlanned(params)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.budget.planned")
- else
- result.message = getMessage(code:"task.search.text.budget.planned.none.found")
+ result.taskInstanceList = getBudgetTasks(params, TaskBudgetStatus.read(2), oneWeekAgo, startOfTomorrow)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.budget.planned.message",
+ args:[formattedOneWeekAgo, formattedStartOfToday])
+ else
+ result.message = getMessage(code:"task.search.text.budget.planned.none.found",
+ args:[formattedOneWeekAgo, formattedStartOfToday])
break
default:
- result.taskInstanceList = getPlannersRange(params)
- if(result.taskInstanceList.totalCount > 0)
- result.message = getMessage(code:"task.search.text.planners.range")
- else
- result.message = getMessage(code:"task.search.text.planners.range.none.found")
+ //case "plannersRange":
+ result.taskInstanceList = getTasks(params, oneWeekAgo, startOfToday+15)
+ if(result.taskInstanceList.totalCount > 0)
+ result.message = getMessage(code:"task.search.text.all.tasks.between.message",
+ args:[formattedOneWeekAgo,
+ g.formatDate(format: "EEE, dd-MMM-yyyy", date: startOfToday+14)])
+ else
+ result.message = getMessage(code:"task.search.text.all.tasks.between.none.found",
+ args:[formattedOneWeekAgo,
+ g.formatDate(format: "EEE, dd-MMM-yyyy", date: startOfToday+14)])
break
} // switch.
@@ -116,13 +151,17 @@
/**
- * Get all tasks that are not in the trash, by default today's tasks.
+ * Get all tasks that are not in the trash bin, by default today's tasks.
* @param params The request params.
- * @param dayAdjustment The number of days to adjust from today, defaults to 0.
- */
- def getTodays(params, dayAdjustment=0) {
+ * @param startDate The start date to get tasks for, defaults to the start of today and is inclusive (greater than or equal to).
+ * @param endDate The end date to get tasks for, defaults to the start of tomorrow and is exclusive (less than).
+ */
+ def getTasks(params, startDate=null, endDate=null) {
params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
params.offset = params?.offset?.toInteger() ?: 0
params.sort = params?.sort ?: "attentionFlag"
params.order = params?.order ?: "desc"
+
+ startDate = startDate ?: dateUtilService.today
+ endDate = endDate ?: dateUtilService.tomorrow
def taskInstanceList = Task.createCriteria().list(
@@ -131,17 +170,19 @@
sort: params.sort,
order: params.order) {
- lt("targetStartDate", dateUtilService.tomorrow+dayAdjustment)
- ge("targetCompletionDate", dateUtilService.today+dayAdjustment)
+ lt("targetStartDate", endDate)
+ ge("targetCompletionDate", startDate)
eq("trash", false)
} // createCriteria
- }
-
- /**
- * Get current user's tasks, by default today's tasks.
- * "Approved tasks where I am the lead or have been assigned"
+ } // getTasks()
+
+ /**
+ * Get a person's tasks, by default current user and today's tasks.
+ * "My tasks and approved tasks that I am assigned to"
* @param params The request params.
- * @param dayAdjustment The number of days to adjust from today, defaults to 0.
- */
- def getMyTodays(params, dayAdjustment=0) {
+ * @param person The person to get tasks for, defaults to current user.
+ * @param startDate The start date to get tasks for, defaults to the start of today and is inclusive (greater than or equal to).
+ * @param endDate The end date to get tasks for, defaults to the start of tomorrow and is exclusive (less than).
+ */
+ def getPersonsTasks(params, person=null, startDate=null, endDate=null) {
def paginateParams = [:]
paginateParams.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
@@ -153,7 +194,7 @@
def namedParams = [:]
- namedParams.currentUser = authService.currentUser
- namedParams.startOfDay = dateUtilService.today+dayAdjustment
- namedParams.startOfNextDay = dateUtilService.tomorrow+dayAdjustment
+ namedParams.person = person ?: authService.currentUser
+ namedParams.startDate = startDate ?: dateUtilService.today
+ namedParams.endDate = endDate ?: dateUtilService.tomorrow
def baseQuery = "from Task as task \
@@ -166,11 +207,11 @@
and task.approved = true \
and ( \
- task.targetStartDate < :startOfNextDay \
- and task.targetCompletionDate >= :startOfDay \
+ task.targetStartDate < :endDate \
+ and task.targetCompletionDate >= :startDate \
) \
and ( \
- task.leadPerson = :currentUser \
- or assignedPerson = :currentUser \
- or assignedPersonViaGroup = :currentUser \
+ task.leadPerson = :person \
+ or assignedPerson = :person \
+ or assignedPersonViaGroup = :person \
) \
)"
@@ -184,84 +225,22 @@
def taskInstanceList = new PagedResultList(list, totalCount)
return taskInstanceList
- } // getMyTodays
-
- /**
- * Get all tasks that are not in the trash, during the past week.
+ } // getPersonsTasks()
+
+ /**
+ * Get tasks by budget status, by default planned in the last week.
* @param params The request params.
- */
- def getPastWeek(params) {
- params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
- params.offset = params?.offset?.toInteger() ?: 0
- params.sort = params?.sort ?: "attentionFlag"
- params.order = params?.order ?: "desc"
-
- def taskInstanceList = Task.createCriteria().list(
- max: params.max,
- offset: params.offset,
- sort: params.sort,
- order: params.order) {
- lt("targetStartDate", dateUtilService.tomorrow)
- ge("targetCompletionDate", dateUtilService.oneWeekAgo)
- eq("trash", false)
- } // createCriteria
- }
-
- /**
- * Get current user's tasks in the past week.
- * "Approved tasks where I am the lead or have been assigned"
- * @param params The request params.
- */
- def getMyPastWeek(params) {
- def paginateParams = [:]
- paginateParams.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
- paginateParams.offset = params?.offset?.toInteger() ?: 0
-
- def sort = "task." + (params?.sort ?: "attentionFlag")
- def order = params?.order == "asc" ? "asc" : "desc"
- def orderBy = " order by " + sort + ' ' + order
-
- def namedParams = [:]
- namedParams.currentUser = authService.currentUser
- namedParams.startOfDay = dateUtilService.oneWeekAgo
- namedParams.startOfNextDay = dateUtilService.tomorrow
-
- def baseQuery = "from Task as task \
- left join task.assignedPersons as assignedPersonOfTask \
- left join assignedPersonOfTask.person as assignedPerson \
- left join task.assignedGroups as assignedGroupOfTask \
- left join assignedGroupOfTask.personGroup as personGroup \
- left join personGroup.persons as assignedPersonViaGroup \
- where (task.trash = false \
- and task.approved = true \
- and ( \
- task.targetStartDate < :startOfNextDay \
- and task.targetCompletionDate >= :startOfDay \
- ) \
- and ( \
- task.leadPerson = :currentUser \
- or assignedPerson = :currentUser \
- or assignedPersonViaGroup = :currentUser \
- ) \
- )"
-
- def searchQuery = "select distinct task " + baseQuery + orderBy
- def list = Task.executeQuery(searchQuery, namedParams, paginateParams)
-
- def countQuery = "select count(distinct task) as taskCount " + baseQuery
- def totalCount = Task.executeQuery(countQuery, namedParams)[0].toInteger()
-
- def taskInstanceList = new PagedResultList(list, totalCount)
- return taskInstanceList
- } // getMyTodays
-
- /**
- * "Tasks with budget status of Planned, in the past week."
- * @param params The request params.
- */
- def getBudgetPlanned(params) {
+ * @param budgetStatus Defaults to planned.
+ * @param startDate The start date to get tasks for, defaults to the start of today and is inclusive (greater than or equal to).
+ * @param endDate The end date to get tasks for, defaults to the start of tomorrow and is exclusive (less than).
+ */
+ def getBudgetTasks(params, budgetStatus=null, startDate=null, endDate=null) {
params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
params.offset = params?.offset?.toInteger() ?: 0
params.sort = params?.sort ?: "targetStartDate"
params.order = params?.order ?: "asc"
+
+ budgetStatus = budgetStatus ?: TaskBudgetStatus.read(2) // Planned.
+ startDate = startDate ?: dateUtilService.today
+ endDate = endDate ?: dateUtilService.tomorrow
def taskInstanceList = Task.createCriteria().list(
@@ -270,57 +249,14 @@
sort: params.sort,
order: params.order) {
- eq("taskBudgetStatus", TaskBudgetStatus.read(2))
+ eq("taskBudgetStatus", budgetStatus)
lt("targetStartDate", dateUtilService.tomorrow)
ge("targetCompletionDate", dateUtilService.oneWeekAgo)
eq("trash", false)
} // createCriteria
- }
-
- /**
- * "Tasks with budget status of Unplanned, in the past week."
- * @param params The request params.
- */
- def getBudgetUnplanned(params) {
- params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
- params.offset = params?.offset?.toInteger() ?: 0
- params.sort = params?.sort ?: "targetStartDate"
- params.order = params?.order ?: "asc"
-
- def taskInstanceList = Task.createCriteria().list(
- max: params.max,
- offset: params.offset,
- sort: params.sort,
- order: params.order) {
- eq("taskBudgetStatus", TaskBudgetStatus.read(1))
- lt("targetStartDate", dateUtilService.tomorrow)
- ge("targetCompletionDate", dateUtilService.oneWeekAgo)
- eq("trash", false)
- } // createCriteria
- }
-
- /**
- * "Tasks in the past week and two weeks ahead."
- * @param params The request params.
- */
- def getPlannersRange(params) {
- params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
- params.offset = params?.offset?.toInteger() ?: 0
- params.sort = params?.sort ?: "targetStartDate"
- params.order = params?.order ?: "asc"
-
- def taskInstanceList = Task.createCriteria().list(
- max: params.max,
- offset: params.offset,
- sort: params.sort,
- order: params.order) {
- ge("targetStartDate", dateUtilService.oneWeekAgo)
- lt("targetStartDate", dateUtilService.today + 15)
- eq("trash", false)
- } // createCriteria
- }
+ } // getBudgetTasks()
/**
* Get work done by person and date.
- * A person ID and date may be specified in params otherwise the currentUser and today are used.
+ * A person ID and date may be specified in params otherwise the current user and today are used.
* @param params The request params.
* @returns A map containing entries, totalEntries, startOfDay, person, totalHours, totalMinutes.
@@ -370,5 +306,5 @@
return result
- }
+ } // getWorkDone()
} // end class
Index: /trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp (revision 502)
+++ /trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp (revision 503)
@@ -14,11 +14,11 @@
action="${actionName}"
params="[quickSearch: 'myTodays']">
- Today
- - Approved tasks where I am the lead or have been assigned.
+
+ -
- Yesterday
+
@@ -26,5 +26,5 @@
action="${actionName}"
params="[quickSearch: 'myTomorrows']">
- Tomorrow
+
@@ -32,5 +32,5 @@
action="${actionName}"
params="[quickSearch: 'myPastWeek']">
- Past Week
+
@@ -45,11 +45,11 @@
action="${actionName}"
params="[quickSearch: 'todays']">
- Today
- - All tasks that are not in the trash.
+
+ -
- Yesterday
+
@@ -57,5 +57,5 @@
action="${actionName}"
params="[quickSearch: 'tomorrows']">
- Tomorrow
+
@@ -63,5 +63,5 @@
action="${actionName}"
params="[quickSearch: 'pastWeek']">
- Past Week
+
@@ -69,6 +69,6 @@
action="${actionName}"
params="[quickSearch: 'plannersRange']">
- Planners Range
- - Tasks in the past week and two weeks ahead.
+
+ -
@@ -82,11 +82,11 @@
action="${actionName}"
params="[quickSearch: 'budgetPlanned']">
- Planned Tasks
- - Task with budget status of Planned, in the past week.
+
+ -
- Unplanned Tasks
+
@@ -100,5 +100,5 @@
-
+
-