Index: /trunk/grails-app/i18n/messages.properties
===================================================================
--- /trunk/grails-app/i18n/messages.properties (revision 736)
+++ /trunk/grails-app/i18n/messages.properties (revision 737)
@@ -429,18 +429,4 @@
task.search.text.all.tasks.between.none.found=No tasks found between {0} and {1}.
-task.search.text.budget.planned=Budget Planned
-task.search.text.budget.planned.help=Tasks with a budget status of 'Planned'.
-task.search.text.budget.planned.message=Tasks with a budget status of 'Planned' for {0}.
-task.search.text.budget.planned.none.found=No tasks found with a budget status of 'Planned' for {0}.
-task.search.text.budget.planned.between.message=Tasks with a budget status of 'Planned' between {0} and {1}.
-task.search.text.budget.planned.between.none.found=No tasks found with a budget status of 'Planned' between {0} and {1}.
-
-task.search.text.budget.unplanned=Budget Unplanned
-task.search.text.budget.unplanned.help=Tasks with a budget status of 'Unplanned'.
-task.search.text.budget.unplanned.message=Tasks with a budget status of 'Unplanned' for {0}.
-task.search.text.budget.unplanned.none.found=No tasks found with a budget status of 'Unplanned' for {0}.
-task.search.text.budget.unplanned.between.message=Tasks with a budget status of 'Unplanned' between {0} and {1}.
-task.search.text.budget.unplanned.between.none.found=No tasks found with a budget status of 'Unplanned' between {0} and {1}.
-
task.search.text.persons.tasks=Person's Tasks
task.search.text.persons.tasks.help=Approved tasks that a person is assigned to.
Index: /trunk/grails-app/services/TaskSearchService.groovy
===================================================================
--- /trunk/grails-app/services/TaskSearchService.groovy (revision 736)
+++ /trunk/grails-app/services/TaskSearchService.groovy (revision 737)
@@ -21,6 +21,4 @@
def getQuickSearchSelection() {
[ 'allTasks': g.message(code: 'task.search.text.all.tasks'),
- 'budgetPlanned': g.message(code: 'task.search.text.budget.planned'),
- 'budgetUnplanned': g.message(code: 'task.search.text.budget.unplanned'),
'personsImmediateCallouts': g.message(code: 'task.search.text.persons.immediate.callouts'),
'personsTasks': g.message(code: 'task.search.text.persons.tasks')
@@ -188,42 +186,4 @@
case "allTasks":
allTasks()
- break
- case "budgetUnplanned":
- result.taskInstanceList = getBudgetTasks(params, TaskBudgetStatus.read(1), result.startDate, result.endDate+1)
- if(result.taskInstanceList.totalCount > 0) {
- if(result.startDate == result.endDate)
- result.message = getMessage(code:"task.search.text.budget.unplanned.message",
- args:[ formatted(result.startDate) ])
- else
- result.message = getMessage(code:"task.search.text.budget.unplanned.between.message",
- args:[ formatted(result.startDate), formatted(result.endDate) ])
- }
- else {
- if(result.startDate == result.endDate)
- result.message = getMessage(code:"task.search.text.budget.unplanned.none.found",
- args:[ formatted(result.startDate) ])
- else
- result.message = getMessage(code:"task.search.text.budget.unplanned.between.none.found",
- args:[ formatted(result.startDate), formatted(result.endDate) ])
- }
- break
- case "budgetPlanned":
- result.taskInstanceList = getBudgetTasks(params, TaskBudgetStatus.read(2), result.startDate, result.endDate+1)
- if(result.taskInstanceList.totalCount > 0) {
- if(result.startDate == result.endDate)
- result.message = getMessage(code:"task.search.text.budget.planned.message",
- args:[ formatted(result.startDate) ])
- else
- result.message = getMessage(code:"task.search.text.budget.planned.between.message",
- args:[ formatted(result.startDate), formatted(result.endDate) ])
- }
- else {
- if(result.startDate == result.endDate)
- result.message = getMessage(code:"task.search.text.budget.planned.none.found",
- args:[ formatted(result.startDate) ])
- else
- result.message = getMessage(code:"task.search.text.budget.planned.between.none.found",
- args:[ formatted(result.startDate), formatted(result.endDate) ])
- }
break
default:
@@ -402,42 +362,4 @@
/**
- * Get tasks by budget status, by default planned in the last week.
- * @param params The request 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, taskBudgetStatus=null, startDate=null, endDate=null) {
- def paginateParams = [:]
- paginateParams.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
- paginateParams.offset = params?.offset?.toInteger() ?: 0
-
- def sort = "task." + (params?.sort ?: "targetStartDate")
- def order = params?.order == "desc" ? "desc" : "asc"
- def orderBy = " order by " + sort + ' ' + order
-
- def namedParams = [:]
- namedParams.taskBudgetStatus = taskBudgetStatus ?: TaskBudgetStatus.read(2) // Planned.
- namedParams.startDate = startDate ?: dateUtilService.today
- namedParams.endDate = endDate ?: dateUtilService.tomorrow
-
- def baseQuery = "from Task as task \
- where (task.trash = false \
- and task.taskBudgetStatus = :taskBudgetStatus \
- and task.targetStartDate < :endDate \
- and task.targetCompletionDate >= :startDate \
- )"
-
- 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
- } // getBudgetTasks()
-
- /**
* Get work done by person and date.
* A person ID and date may be specified in params otherwise the current user and today are used.
Index: /trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp (revision 736)
+++ /trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp (revision 737)
@@ -20,10 +20,4 @@
-
-
-
-
-
-
Index: /trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/edit.gsp (revision 736)
+++ /trunk/grails-app/views/taskDetailed/edit.gsp (revision 737)
@@ -137,17 +137,4 @@
-
-
- |
-
- |
-
-
-
- |
-
Index: /trunk/web-app/js/taskQuickSearchPane.js
===================================================================
--- /trunk/web-app/js/taskQuickSearchPane.js (revision 736)
+++ /trunk/web-app/js/taskQuickSearchPane.js (revision 737)
@@ -2,5 +2,5 @@
function updateQuickSearchSelection() {
var personsTasksSelectionIds = ['personLabel', 'personSelection', 'completedLabel', 'completedSelection'];
- var helpBalloonSpanIds = ['allTasksHelp', 'budgetPlannedHelp', 'budgetUnplannedHelp', 'personsTasksHelp', 'personsImmediateCalloutsHelp'];
+ var helpBalloonSpanIds = ['allTasksHelp', 'personsTasksHelp', 'personsImmediateCalloutsHelp'];
var val = $("quickSearchSelect").value;
@@ -12,12 +12,4 @@
case 'allTasks':
showUtil('allTasksHelp');
- hideArrayUtil(personsTasksSelectionIds);
- break;
- case 'budgetPlanned':
- showUtil('budgetPlannedHelp');
- hideArrayUtil(personsTasksSelectionIds);
- break;
- case 'budgetUnplanned':
- showUtil('budgetUnplannedHelp');
hideArrayUtil(personsTasksSelectionIds);
break;