Changeset 1336 for tupper


Ignore:
Timestamp:
2009-06-15 12:40:49 (3 years ago)
Author:
karel
Message:

Bug fixed: 'assigned to' field always '---' initially.
Added distinction between 'assigned' (kve) and 'assignedDisplay' (Karel Vervaeke)

Location:
tupper/trunk/tupper-site/src/main
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/ProjectResource.java

    r1313 r1336  
    7676            jsonProj.element("customer", proj.getCustomer().getName()); 
    7777            if (proj.getAssigned() != null) { 
    78                 jsonProj.element("assigned", proj.getAssigned().getFirstName() + " " + proj.getAssigned().getLastName()); 
     78                jsonProj.element("assigned", proj.getAssigned().getInitials()); 
     79                jsonProj.element("assignedDisplay", proj.getAssigned().getFirstName() + " " + proj.getAssigned().getLastName()); 
    7980            } 
    8081            jsonProj.element("done", proj.isDone()); 

  • tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/ProjectsResource.java

    r1300 r1336  
    108108                jsonProj.element("customer", proj.getCustomer().getName()); 
    109109                if (proj.getAssigned() != null) { 
    110                     jsonProj.element("assigned", proj.getAssigned().getFirstName() + " " + proj.getAssigned().getLastName()); 
     110                    jsonProj.element("assigned", proj.getAssigned().getInitials()); 
     111                    jsonProj.element("assignedDisplay", proj.getAssigned().getFirstName() + " " + proj.getAssigned().getLastName()); 
    111112                } 
    112113                jsonProj.element("completed", proj.isDone()); 

  • tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/TaskResource.java

    r1325 r1336  
    7878            jsonTask.element("done", task.isDone()); 
    7979            if (task.getAssigned() != null) { 
    80                 jsonTask.element("assigned", task.getAssigned().getFirstName() + " " + task.getAssigned().getLastName()); 
     80                jsonTask.element("assigned", task.getAssigned().getInitials()); 
     81                jsonTask.element("assignedDisplay", "" + task.getAssigned().getFirstName() + " " + task.getAssigned().getLastName()); 
    8182            } 
    8283            jsonTask.element("completed", task.isDone()); 

  • tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/TasksResource.java

    r1288 r1336  
    8484                jsonTask.element("description", task.getDescription()); 
    8585                if(task.getAssigned() != null){ 
    86                     jsonTask.element("assigned", task.getAssigned().getFirstName() + " " + task.getAssigned().getLastName()); 
     86                    jsonTask.element("assigned", task.getAssigned().getInitials()); 
     87                    jsonTask.element("assignedDisplay", task.getAssigned().getFirstName() + " " + task.getAssigned().getLastName()); 
    8788                }else{ 
    8889                    jsonTask.element("assigned", "---"); 

  • tupper/trunk/tupper-site/src/main/kauri/static/js/projects.js

    r1326 r1336  
    176176        $("#details_at").html("---"); 
    177177    }else{ 
    178         $("#details_at").html(json.assigned); 
     178        $("#details_at").html(json.assignedDisplay); 
    179179    } 
    180180    if(json.done === true){ 

  • tupper/trunk/tupper-site/src/main/kauri/templates/macro/task_details.xml

    r1272 r1336  
    1111          <span>Consumed Time:</span><span id="details_ct">${item.ct}</span> <!--<span id="details_time_consumed">hrs</span>--><br/> 
    1212 
    13           <span>Assigned To:</span><span id="details_at">${item.assigned}</span><br/> 
     13          <span>Assigned To:</span><span id="details_at">foo ${item.assignedDisplay}</span><br/> 
    1414          <span>Completed: </span> <input type="checkbox" value="completed" id="details_completed"> 
    1515          <t:if test='${item.completed == "true"}'> 
Note: See TracChangeset for help on using the changeset viewer.