Changeset 737 for trunk

Timestamp:

Dec 8, 2010, 12:04:47 PM (14 years ago)

Author:

gav

Message:

Remove task budget status from task views.

Location:

trunk

Files:

• grails-app/i18n/messages.properties (modified) (1 diff)
• grails-app/services/TaskSearchService.groovy (modified) (3 diffs)
• grails-app/views/taskDetailed/_quickSearchPane.gsp (modified) (1 diff)
• grails-app/views/taskDetailed/edit.gsp (modified) (1 diff)
• web-app/js/taskQuickSearchPane.js (modified) (2 diffs)

trunk/grails-app/i18n/messages.properties

@@ -429 +429 @@
 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.

trunk/grails-app/services/TaskSearchService.groovy

@@ -21 +21 @@
     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 +186 @@
             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 +362 @@
 
     /**
-    * 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.

trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp

@@ -20 +20 @@
                             <span id="allTasksHelp">
                                 <g:helpBalloon class="helpballoon" code="task.search.text.all.tasks" />
-                            </span>
-                            <span id="budgetPlannedHelp">
-                                <g:helpBalloon class="helpballoon" code="task.search.text.budget.planned" />
-                            </span>
-                            <span id="budgetUnplannedHelp">
-                                <g:helpBalloon class="helpballoon" code="task.search.text.budget.unplanned" />
                             </span>
                             <span id="personsTasksHelp">

trunk/grails-app/views/taskDetailed/edit.gsp

@@ -137 +137 @@
                                 </td>
                             </tr>
-                            
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskBudgetStatus">Budget Status:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskBudgetStatus','errors')}">
-                                    <g:select optionKey="id"
-                                                        from="${TaskBudgetStatus.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
-                                                        name="taskBudgetStatus.id"
-                                                        value="${taskInstance?.taskBudgetStatus?.id}" >
-                                    </g:select>
-                                </td>
-                            </tr>
                         
                             <tr class="prop">

trunk/web-app/js/taskQuickSearchPane.js

@@ -2 +2 @@
 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 @@
         case 'allTasks':
             showUtil('allTasksHelp');
-            hideArrayUtil(personsTasksSelectionIds);
-            break;
-        case 'budgetPlanned':
-            showUtil('budgetPlannedHelp');
-            hideArrayUtil(personsTasksSelectionIds);
-            break;
-        case 'budgetUnplanned':
-            showUtil('budgetUnplannedHelp');
             hideArrayUtil(personsTasksSelectionIds);
             break;