svn commit: r613302 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: mrisaliti
Date: Fri Jan 18 14:45:25 2008 New Revision: 613302 URL: http://svn.apache.org/viewvc?rev=613302&view=rev Log: Taks/Stats forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1545) Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl?rev=613302&r1=613301&r2=613302&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderstats.ftl Fri Jan 18 14:45:25 2008 @@ -18,151 +18,157 @@ --> <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)> - - <div class="screenlet"> +<div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.OrderOrderStatisticsPage}</h3> </div> - <#--<div class='head3'>${uiLabelMap.OrderOrderStatisticsPage}</div>--> - <table class="basic-table" cellspacing='0'> - <tr> - <th> </th> - <th> </th> - <th>${uiLabelMap.CommonToday}</th> - <th>${uiLabelMap.OrderWTD}</th> - <th>${uiLabelMap.OrderMTD}</th> - <th>${uiLabelMap.OrderYTD}</th> - </tr> - <tr><td colspan="6"><hr/></td></tr> - <tr> - <td colspan="6"><b>${uiLabelMap.OrderOrdersTotals}</b></td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderGrossDollarAmountsIncludesAdjustmentsAndPendingOrders}</td> - <td>${dayItemTotal}</td> - <td>${weekItemTotal}</td> - <td>${monthItemTotal}</td> - <td>${yearItemTotal}</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderPaidDollarAmountsIncludesAdjustments}</td> - <td>${dayItemTotalPaid}</td> - <td>${weekItemTotalPaid}</td> - <td>${monthItemTotalPaid}</td> - <td>${yearItemTotalPaid}</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderPendingPaymentDollarAmountsIncludesAdjustments}</td> - <td>${dayItemTotalPending}</td> - <td>${weekItemTotalPending}</td> - <td>${monthItemTotalPending}</td> - <td>${yearItemTotalPending}</td> - </tr> - <tr><td colspan="6"><hr/></td></tr> - <tr> - <td colspan="6"><b>${uiLabelMap.OrderOrdersItemCounts}</b></td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderGrossItemsSoldIncludesPromotionsAndPendingOrders}</td> - <td>${dayItemCount?string.number}</td> - <td>${weekItemCount?string.number}</td> - <td>${monthItemCount?string.number}</td> - <td>${yearItemCount?string.number}</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderPaidItemsSoldIncludesPromotions}</td> - <td>${dayItemCountPaid?string.number}</td> - <td>${weekItemCountPaid?string.number}</td> - <td>${monthItemCountPaid?string.number}</td> - <td>${yearItemCountPaid?string.number}</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderPendingPaymentItemsSoldIncludesPromotions}</td> - <td>${dayItemCountPending?string.number}</td> - <td>${weekItemCountPending?string.number}</td> - <td>${monthItemCountPending?string.number}</td> - <td>${yearItemCountPending?string.number}</td> - </tr> - <tr><td colspan="6"><hr/></td></tr> - <tr> - <td colspan="6"><b>${uiLabelMap.OrderOrdersPending}</b></td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderWaitingPayment}</td> - <td>${waitingPayment?default(0)?string.number}</td> - <td>--</td> - <td>--</td> - <td>--</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderWaitingApproval}</td> - <td>${waitingApproval?default(0)?string.number}</td> - <td>--</td> - <td>--</td> - <td>--</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderWaitingCompletion}</td> - <td>${waitingComplete?default(0)?string.number}</td> - <td>--</td> - <td>--</td> - <td>--</td> - </tr> - <tr><td colspan="6"><hr/></td></tr> - <tr> - <td colspan="6"><b>${uiLabelMap.OrderStatusChanges}</b></td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderOrdered}</td> - <td>${dayOrder?size?default(0)?string.number}</td> - <td>${weekOrder?size?default(0)?string.number}</td> - <td>${monthOrder?size?default(0)?string.number}</td> - <td>${yearOrder?size?default(0)?string.number}</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderApproved}</td> - <td>${dayApprove?size?default(0)?string.number}</td> - <td>${weekApprove?size?default(0)?string.number}</td> - <td>${monthApprove?size?default(0)?string.number}</td> - <td>${yearApprove?size?default(0)?string.number}</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderCompleted}</td> - <td>${dayComplete?size?default(0)?string.number}</td> - <td>${weekComplete?size?default(0)?string.number}</td> - <td>${monthComplete?size?default(0)?string.number}</td> - <td>${yearComplete?size?default(0)?string.number}</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderCancelled}</td> - <td>${dayCancelled?size?default(0)?string.number}</td> - <td>${weekCancelled?size?default(0)?string.number}</td> - <td>${monthCancelled?size?default(0)?string.number}</td> - <td>${yearCancelled?size?default(0)?string.number}</td> - </tr> - <tr> - <td> </td> - <td>${uiLabelMap.OrderRejected}</td> - <td>${dayRejected?size?default(0)?string.number}</td> - <td>${weekRejected?size?default(0)?string.number}</td> - <td>${monthRejected?size?default(0)?string.number}</td> - <td>${yearRejected?size?default(0)?string.number}</td> - </tr> - </table> - </div> + <div class="screenlet-body"> + <table class="basic-table" cellspacing='0'> + <tr class="label"> + <td> </td> + <td> </td> + <td align="right">${uiLabelMap.CommonToday}</td> + <td align="right">${uiLabelMap.OrderWTD}</td> + <td align="right">${uiLabelMap.OrderMTD}</td> + <td align="right">${uiLabelMap.OrderYTD}</td> + </tr> + <tr> + <td colspan="2"> </td> + <td colspan="4"><hr/></td></tr> + <tr> + <td align="left" class="label">${uiLabelMap.OrderOrdersTotals}</td> + <td colspan="5"> </td> + </tr> + <tr> + <td> </td> + <td>${uiLabelMap.OrderGrossDollarAmountsIncludesAdjustmentsAndPendingOrders}</td> + <td align="right">${dayItemTotal}</td> + <td align="right">${weekItemTotal}</td> + <td align="right">${monthItemTotal}</td> + <td align="right">${yearItemTotal}</td> + </tr> + <tr class="alternate-row"> + <td> </td> + <td>${uiLabelMap.OrderPaidDollarAmountsIncludesAdjustments}</td> + <td align="right">${dayItemTotalPaid}</td> + <td align="right">${weekItemTotalPaid}</td> + <td align="right">${monthItemTotalPaid}</td> + <td align="right">${yearItemTotalPaid}</td> + </tr> + <tr> + <td> </td> + <td>${uiLabelMap.OrderPendingPaymentDollarAmountsIncludesAdjustments}</td> + <td align="right">${dayItemTotalPending}</td> + <td align="right">${weekItemTotalPending}</td> + <td align="right">${monthItemTotalPending}</td> + <td align="right">${yearItemTotalPending}</td> + </tr> + <tr><td colspan="6"><hr/></td></tr> + <tr> + <td align="left" class="label">${uiLabelMap.OrderOrdersItemCounts}</td> + <td colspan="5"> </td> + </tr> + <tr class="alternate-row"> + <td> </td> + <td>${uiLabelMap.OrderGrossItemsSoldIncludesPromotionsAndPendingOrders}</td> + <td align="right">${dayItemCount?string.number}</td> + <td align="right">${weekItemCount?string.number}</td> + <td align="right">${monthItemCount?string.number}</td> + <td align="right">${yearItemCount?string.number}</td> + </tr> + <tr> + <td> </td> + <td>${uiLabelMap.OrderPaidItemsSoldIncludesPromotions}</td> + <td align="right">${dayItemCountPaid?string.number}</td> + <td align="right">${weekItemCountPaid?string.number}</td> + <td align="right">${monthItemCountPaid?string.number}</td> + <td align="right">${yearItemCountPaid?string.number}</td> + </tr> + <tr class="alternate-row"> + <td> </td> + <td>${uiLabelMap.OrderPendingPaymentItemsSoldIncludesPromotions}</td> + <td align="right">${dayItemCountPending?string.number}</td> + <td align="right">${weekItemCountPending?string.number}</td> + <td align="right">${monthItemCountPending?string.number}</td> + <td align="right">${yearItemCountPending?string.number}</td> + </tr> + <tr><td colspan="6"><hr/></td></tr> + <tr> + <td align="left" class="label">${uiLabelMap.OrderOrdersPending}</td> + <td colspan="5"> </td> + </tr> + <tr> + <td> </td> + <td>${uiLabelMap.OrderWaitingPayment}</td> + <td align="right">${waitingPayment?default(0)?string.number}</td> + <td align="right">--</td> + <td align="right">--</td> + <td align="right">--</td> + </tr> + <tr class="alternate-row"> + <td> </td> + <td>${uiLabelMap.OrderWaitingApproval}</td> + <td align="right">${waitingApproval?default(0)?string.number}</td> + <td align="right">--</td> + <td align="right">--</td> + <td align="right">--</td> + </tr> + <tr> + <td> </td> + <td>${uiLabelMap.OrderWaitingCompletion}</td> + <td align="right">${waitingComplete?default(0)?string.number}</td> + <td align="right">--</td> + <td align="right">--</td> + <td align="right">--</td> + </tr> + <tr><td colspan="6"><hr/></td></tr> + <tr> + <td align="left" class="label">${uiLabelMap.OrderStatusChanges}</td> + <td colspan="5"> </td> + </tr> + <tr class="alternate-row"> + <td> </td> + <td>${uiLabelMap.OrderOrdered}</td> + <td align="right">${dayOrder?size?default(0)?string.number}</td> + <td align="right">${weekOrder?size?default(0)?string.number}</td> + <td align="right">${monthOrder?size?default(0)?string.number}</td> + <td align="right">${yearOrder?size?default(0)?string.number}</td> + </tr> + <tr> + <td> </td> + <td>${uiLabelMap.OrderApproved}</td> + <td align="right">${dayApprove?size?default(0)?string.number}</td> + <td align="right">${weekApprove?size?default(0)?string.number}</td> + <td align="right">${monthApprove?size?default(0)?string.number}</td> + <td align="right">${yearApprove?size?default(0)?string.number}</td> + </tr> + <tr class="alternate-row"> + <td> </td> + <td>${uiLabelMap.OrderCompleted}</td> + <td align="right">${dayComplete?size?default(0)?string.number}</td> + <td align="right">${weekComplete?size?default(0)?string.number}</td> + <td align="right">${monthComplete?size?default(0)?string.number}</td> + <td align="right">${yearComplete?size?default(0)?string.number}</td> + </tr> + <tr> + <td> </td> + <td>${uiLabelMap.OrderCancelled}</td> + <td align="right">${dayCancelled?size?default(0)?string.number}</td> + <td align="right">${weekCancelled?size?default(0)?string.number}</td> + <td align="right">${monthCancelled?size?default(0)?string.number}</td> + <td align="right">${yearCancelled?size?default(0)?string.number}</td> + </tr> + <tr class="alternate-row"> + <td> </td> + <td>${uiLabelMap.OrderRejected}</td> + <td align="right">${dayRejected?size?default(0)?string.number}</td> + <td align="right">${weekRejected?size?default(0)?string.number}</td> + <td align="right">${monthRejected?size?default(0)?string.number}</td> + <td align="right">${yearRejected?size?default(0)?string.number}</td> + </tr> + </table> + </div> +</div> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> -</#if> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl?rev=613302&r1=613301&r2=613302&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Fri Jan 18 14:45:25 2008 @@ -21,17 +21,17 @@ <!-- // function viewOrder(form) { if (form.taskStatus.value == "WF_NOT_STARTED") { - if (form.delegate.checked) { - form.action = "<@ofbizUrl>acceptassignment</@ofbizUrl>"; + if (form.delegate.checked) { + form.action = "<@ofbizUrl>acceptassignment</@ofbizUrl>"; } else { - form.action = "<@ofbizUrl>orderview</@ofbizUrl>"; - } + form.action = "<@ofbizUrl>orderview</@ofbizUrl>"; + } } else { - if (form.delegate.checked) { - form.action = "<@ofbizUrl>delegateassignment</@ofbizUrl>"; - } else { - form.action = "<@ofbizUrl>orderview</@ofbizUrl>"; - } + if (form.delegate.checked) { + form.action = "<@ofbizUrl>delegateassignment</@ofbizUrl>"; + } else { + form.action = "<@ofbizUrl>orderview</@ofbizUrl>"; + } } form.submit(); } @@ -40,256 +40,252 @@ <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session) || security.hasRolePermission("ORDERMGR_ROLE", "_VIEW", "", "", session)> <#assign tasksFound = false> -<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> - <tr> - <td width='100%'> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td align="left" width='70%' > - <div class='boxhead'>${uiLabelMap.OrderOrderNeedingAttention}</div> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td width='100%'> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> - <tr> - <td width='100%'> - <#if poList?has_content> - <#assign tasksFound = true> - <table width='100%' border='0' cellpadding='0' cellspacing='0' class='boxbottom'> - <tr> - <td> - <h3>${uiLabelMap.OrderOrderPurchaseToBeScheduled}</h3> - <table width='100%' cellpadding='2' cellspacing='0' border='0'> - <tr> - <td><div class="tableheadtext">${uiLabelMap.OrderOrderNumber}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonName}</div></td> - <td><div class="tableheadtext">${uiLabelMap.OrderOrderDate}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td> - <td width="1" align="right"><div class="tableheadtext">Items</div></td> - <td width="1" align="right"><div class="tableheadtext">Total</div></td> - <td width="1"> </td> - <td width="1"> </td> - </tr> - <tr><td colspan='8'><hr class='sepbar'></td></tr> - <#list poList as orderHeaderAndRole> - <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeaderAndRole)> - <#assign statusItem = orderHeaderAndRole.getRelatedOneCache("StatusItem")> - <#assign placingParty = orh.getPlacingParty()?if_exists> - <tr> - <td><a href="<@ofbizUrl>orderview?orderId=${orderHeaderAndRole.orderId}</@ofbizUrl>" class='buttontext'>${orderHeaderAndRole.orderId}</a></td> - <td> - <div class='tabletext'> - <#assign partyId = "_NA_"> - <#if placingParty?has_content> - <#assign partyId = placingParty.partyId> - <#if placingParty.getEntityName() == "Person"> - <#if placingParty.lastName?exists> - ${placingParty.lastName}<#if placingParty.firstName?exists>, ${placingParty.firstName}</#if> +<div class="screenlet"> + <div class="screenlet-header"> + <div class="boxhead">${uiLabelMap.OrderOrderNeedingAttention}</div> + </div> + <div class="screenlet-body"> + <table cellspacing="0" class="basic-table"> + <tr> + <td width='100%'> + <#if poList?has_content> + <#assign tasksFound = true> + <table cellspacing="0" class="basic-table"> + <tr> + <td> + <h3>${uiLabelMap.OrderOrderPurchaseToBeScheduled}</h3> + <table cellspacing="0" class="basic-table hover-bar"> + <tr class="header-row"> + <td>${uiLabelMap.OrderOrderNumber}</td> + <td>${uiLabelMap.CommonName}</td> + <td>${uiLabelMap.OrderOrderDate}</td> + <td>${uiLabelMap.CommonStatus}</td> + <td width="1" align="right">${uiLabelMap.OrderOrderItems}</td> + <td width="1" align="right">${uiLabelMap.OrderItemTotal}</td> + <td width="1"> </td> + <td width="1"> </td> + </tr> + <#assign alt_row = false> + <#list poList as orderHeaderAndRole> + <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeaderAndRole)> + <#assign statusItem = orderHeaderAndRole.getRelatedOneCache("StatusItem")> + <#assign placingParty = orh.getPlacingParty()?if_exists> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>orderview?orderId=${orderHeaderAndRole.orderId}</@ofbizUrl>" class='buttontext'>${orderHeaderAndRole.orderId}</a></td> + <td> + <div> + <#assign partyId = "_NA_"> + <#if placingParty?has_content> + <#assign partyId = placingParty.partyId> + <#if placingParty.getEntityName() == "Person"> + <#if placingParty.lastName?exists> + ${placingParty.lastName}<#if placingParty.firstName?exists>, ${placingParty.firstName}</#if> + <#else> + ${uiLabelMap.CommonNA} + </#if> + <#else> + <#if placingParty.groupName?exists> + ${placingParty.groupName} + <#else> + ${uiLabelMap.CommonNA} + </#if> + </#if> <#else> - N/A + ${uiLabelMap.CommonNA} </#if> - <#else> - <#if placingParty.groupName?exists> - ${placingParty.groupName} + </div> + </td> + <td><span style="white-space: nowrap;">${orderHeaderAndRole.getString("orderDate")}</span></td> + <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td> + <td align="right">${orh.getTotalOrderItemsQuantity()?string.number}</td> + <td align="right"><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orderHeaderAndRole.currencyUom?if_exists/></td> + <td width="1"> </td> + <td align='right'> + <a href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderHeaderAndRole.orderId}</@ofbizUrl>" class='buttontext'>Schedule Delivery</a> + </td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </td> + </tr> + </table> + </#if> + + <#if partyTasks?has_content> + <#assign tasksFound = true> + <table cellspacing="0" class="basic-table hover-bar"> + <tr> + <td> + <h3>${uiLabelMap.OrderWorkflow}</h3> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderNumber}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonName}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderDate}</a></td> + <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>" class="tableheadbutton">Total</a></td> + <td width="1"> </td> + <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderStartdateTime}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonPriority}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonMyStatus}</a></td> + </tr> + <#assign alt_row = false> + <#list partyTasks as task> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> + <#assign orderStr = "orderId=" + task.orderId + "&partyId=" + userLogin.partyId + "&roleTypeId=" + task.roleTypeId + "&workEffortId=" + task.workEffortId + "&fromDate=" + task.get("fromDate").toString()> + <a href="<@ofbizUrl>orderview?${orderStr}</@ofbizUrl>" class="buttontext"> + ${task.orderId} + </a> + </td> + <td> + <div> + <#if task.customerPartyId?exists> + <a href="${customerDetailLink}${task.customerPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> <#else> N/A </#if> - </#if> - <#else> - N/A - </#if> - </div> - </td> - <td><div class="tabletext"><span style="white-space: nowrap;">${orderHeaderAndRole.getString("orderDate")}</span></div></td> - <td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td> - <td align="right"><div class="tabletext">${orh.getTotalOrderItemsQuantity()?string.number}</div></td> - <td align="right"><div class="tabletext"><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orderHeaderAndRole.currencyUom?if_exists/></div></td> - <td width="1"> </td> - <td align='right'> - <a href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderHeaderAndRole.orderId}</@ofbizUrl>" class='buttontext'>Schedule Delivery</a> - </td> - </tr> - </#list> - </table> - </td> - </tr> - </table> - </#if> - - <#if partyTasks?has_content> - <#assign tasksFound = true> - <table width='100%' border='0' cellpadding='0' cellspacing='0' class='boxbottom'> - <tr> - <td> - <h3>${uiLabelMap.OrderWorkflow}</h3> - <table width='100%' cellpadding='2' cellspacing='0' border='0'> - <tr> - <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderNumber}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonName}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderDate}</a></td> - <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>" class="tableheadbutton">Total</a></td> - <td width="1"> </td> - <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderStartdateTime}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonPriority}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonMyStatus}</a></td> - </tr> - <tr><td colspan='8'><hr class='sepbar'></td></tr> - <#list partyTasks as task> - <tr> - <td> - <#assign orderStr = "orderId=" + task.orderId + "&partyId=" + userLogin.partyId + "&roleTypeId=" + task.roleTypeId + "&workEffortId=" + task.workEffortId + "&fromDate=" + task.get("fromDate").toString()> - <a href="<@ofbizUrl>orderview?${orderStr}</@ofbizUrl>" class="buttontext"> - ${task.orderId} - </a> - </td> - <td> - <div class="tabletext"> - <#if task.customerPartyId?exists> - <a href="${customerDetailLink}${task.customerPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> - <#else> - N/A - </#if> - </div> - </td> - <td> - <div class="tabletext"> - ${task.get("orderDate").toString()} - </div> - </td> - <td width="1" align="right"><div class='tabletext'><@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/></div></td> - <td width="1"> </td> - <td> - <#if task.actualStartDate?exists> - <#assign actualStartDate = task.get("actualStartDate").toString()> - <#else> - <#assign actualStartDate = "N/A"> - </#if> - <div class='tabletext'>${actualStartDate}</div> - </td> - <td><div class='tabletext'>${task.priority?default("0")}</div></td> - <td> - <a href="/workeffort/control/activity?workEffortId=${task.workEffortId}${externalKeyParam}" target="workeffort" class="buttontext"> - ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)} - </a> - </td> - </tr> - </#list> - </table> - </td> - </tr> - </table> - </#if> - - <#if roleTasks?has_content> - <#assign tasksFound = true> - <table width='100%' border='0' cellpadding='0' cellspacing='0' class='boxbottom'> - <tr> - <td> - <h3>${uiLabelMap.CommonWorkflowActivityUserRole}</h3> - <table width='100%' cellpadding='2' cellspacing='0' border='0'> - <tr> - <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderNumber}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonName}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderDate}</a></td> - <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonTotal}</a></td> - <td width="1"> </td> - <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonStartDateTime}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=wepaPartyId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyParty}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=roleTypeId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyRole}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonPriority}</a></td> - <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonStatus}</a></td> - <td> </td> - </tr> - <tr><td colspan='11'><hr class='sepbar'></td></tr> - <#list roleTasks as task> - <form method="get" name="F${task.workEffortId}"> - <input type="hidden" name="orderId" value="${task.orderId}"> - <input type="hidden" name="workEffortId" value="${task.workEffortId}"> - <input type="hidden" name="taskStatus" value="${task.currentStatusId}"> - <#if task.statusId?exists && task.statusId == "CAL_SENT"> - <input type="hidden" name="partyId" value="${userLogin.partyId}"> - <input type="hidden" name="roleTypeId" value="${task.roleTypeId}"> - <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}"> - <#else> - <input type="hidden" name="partyId" value="${userLogin.partyId}"> - <input type="hidden" name="roleTypeId" value="${task.roleTypeId}"> - <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}"> - <input type="hidden" name="fromPartyId" value="${task.wepaPartyId}"> - <input type="hidden" name="fromRoleTypeId" value="${task.roleTypeId}"> - <input type="hidden" name="fromFromDate" value="${task.get("fromDate").toString()}"> - <input type="hidden" name="toPartyId" value="${userLogin.partyId}"> - <input type="hidden" name="toRoleTypeId" value="${task.roleTypeId}"> - <input type="hidden" name="toFromDate" value="${now}"> - <input type="hidden" name="startActivity" value="true"> - </#if> - <tr> - <td> - <a href="javascript:viewOrder(document.F${task.workEffortId});" class="buttontext"> - ${task.orderId} - </a> - </td> - <td> - <#if task.customerPartyId?exists> - <a href="${customerDetailLink}${task.customerPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> - <#else> - - </#if> - </td> - <td> - <div class="tabletext"> - ${task.get("orderDate").toString()} - </div> - </td> - <td width="1" align="right"><div class='tabletext'><@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/></div></td> + </div> + </td> + <td> + <div> + ${task.get("orderDate").toString()} + </div> + </td> + <td width="1" align="right"><@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/></td> + <td width="1"> </td> + <td> + <#if task.actualStartDate?exists> + <#assign actualStartDate = task.get("actualStartDate").toString()> + <#else> + <#assign actualStartDate = "N/A"> + </#if> + <div>${actualStartDate}</div> + </td> + <td>${task.priority?default("0")}></td> + <td> + <a href="/workeffort/control/activity?workEffortId=${task.workEffortId}${externalKeyParam}" target="workeffort" class="buttontext"> + ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)} + </a> + </td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </td> + </tr> + </table> + </#if> + + <#if roleTasks?has_content> + <#assign tasksFound = true> + <table cellspacing="0" class="basic-table"> + <tr> + <td> + <h3>${uiLabelMap.CommonWorkflowActivityUserRole}</h3> + <table cellspacing="0" class="basic-table hover-bar"> + <tr class="header-row"> + <td><a href="<@ofbizUrl>tasklist?sort=orderId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderNumber}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=name</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonName}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=orderDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.OrderOrderDate}</a></td> + <td width="1" align="right"><a href="<@ofbizUrl>tasklist?sort=grandTotal</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonTotal}</a></td> <td width="1"> </td> - <td> - <#if task.actualStartDate?exists> - <#assign actualStartDate = task.get("actualStartDate").toString()> - <#else> - <#assign actualStartDate = "N/A"> - </#if> - <div class='tabletext'>${actualStartDate}</div> - </td> - <td> - <#if task.wepaPartyId == "_NA_"> - <div class="tabletext">N/A</div> - <#else> - <a href="${customerDetailLink}${task.wepaPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${task.wepaPartyId}</a> + <td><a href="<@ofbizUrl>tasklist?sort=actualStartDate</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonStartDateTime}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=wepaPartyId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyParty}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=roleTypeId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.PartyRole}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=priority</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonPriority}</a></td> + <td><a href="<@ofbizUrl>tasklist?sort=currentStatusId</@ofbizUrl>" class="tableheadbutton">${uiLabelMap.CommonStatus}</a></td> + <td> </td> + </tr> + <#assign alt_row = false> + <#list roleTasks as task> + <form method="get" name="F${task.workEffortId}"> + <input type="hidden" name="orderId" value="${task.orderId}"> + <input type="hidden" name="workEffortId" value="${task.workEffortId}"> + <input type="hidden" name="taskStatus" value="${task.currentStatusId}"> + <#if task.statusId?exists && task.statusId == "CAL_SENT"> + <input type="hidden" name="partyId" value="${userLogin.partyId}"> + <input type="hidden" name="roleTypeId" value="${task.roleTypeId}"> + <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}"> + <#else> + <input type="hidden" name="partyId" value="${userLogin.partyId}"> + <input type="hidden" name="roleTypeId" value="${task.roleTypeId}"> + <input type="hidden" name="fromDate" value="${task.get("fromDate").toString()}"> + <input type="hidden" name="fromPartyId" value="${task.wepaPartyId}"> + <input type="hidden" name="fromRoleTypeId" value="${task.roleTypeId}"> + <input type="hidden" name="fromFromDate" value="${task.get("fromDate").toString()}"> + <input type="hidden" name="toPartyId" value="${userLogin.partyId}"> + <input type="hidden" name="toRoleTypeId" value="${task.roleTypeId}"> + <input type="hidden" name="toFromDate" value="${now}"> + <input type="hidden" name="startActivity" value="true"> </#if> - </td> - <td><div class='tabletext'>${Static["org.ofbiz.order.task.TaskWorker"].getRoleDescription(task)}</div></td> - <td><div class='tabletext'>${task.priority?default("0")}</div></td> - <td> - <a href="/workeffort/control/activity?workEffortId=${task.workEffortId}" target="workeffort" class="buttontext"> - ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)} - </a> - </td> - <#if task.statusId?exists && task.statusId == "CAL_SENT"> - <td align="right"><input type="checkbox" name="delegate" value="true" checked></td> - <#else> - <td align="right"><input type="checkbox" name="delegate" value="true"></td> - </#if> - </tr> - </form> - </#list> - </table> - </td> - </tr> - </table> - </#if> - <#if !tasksFound> - <div class="tabletext">${uiLabelMap.CommonNoTaskAssigned}</div> - </#if> - </td> - </tr> - </table> - </td> - </tr> -</table> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> + <a href="javascript:viewOrder(document.F${task.workEffortId});" class="buttontext"> + ${task.orderId} + </a> + </td> + <td> + <#if task.customerPartyId?exists> + <a href="${customerDetailLink}${task.customerPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${Static["org.ofbiz.order.task.TaskWorker"].getCustomerName(task)}</a> + <#else> + + </#if> + </td> + <td> + <div> + ${task.get("orderDate").toString()} + </div> + </td> + <td width="1" align="right"><@ofbizCurrency amount=task.grandTotal isoCode=orderCurrencyMap.get(task.orderId)/></td> + <td width="1"> </td> + <td> + <#if task.actualStartDate?exists> + <#assign actualStartDate = task.get("actualStartDate").toString()> + <#else> + <#assign actualStartDate = "N/A"> + </#if> + <div>${actualStartDate}</div> + </td> + <td> + <#if task.wepaPartyId == "_NA_"> + <div>N/A</div> + <#else> + <a href="${customerDetailLink}${task.wepaPartyId}${externalKeyParam}" target="partymgr" class="buttontext">${task.wepaPartyId}</a> + </#if> + </td> + <td>${Static["org.ofbiz.order.task.TaskWorker"].getRoleDescription(task)}</td> + <td>${task.priority?default("0")}</td> + <td> + <a href="/workeffort/control/activity?workEffortId=${task.workEffortId}" target="workeffort" class="buttontext"> + ${Static["org.ofbiz.order.task.TaskWorker"].getPrettyStatus(task)} + </a> + </td> + <#if task.statusId?exists && task.statusId == "CAL_SENT"> + <td align="right"><input type="checkbox" name="delegate" value="true" checked></td> + <#else> + <td align="right"><input type="checkbox" name="delegate" value="true"></td> + </#if> + </tr> + </form> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </td> + </tr> + </table> + </#if> + <#if !tasksFound> + <div>${uiLabelMap.CommonNoTaskAssigned}</div> + </#if> + </td> + </tr> + </table> + </div> +</div> <#else> <h3>You do not have permission to view this page. ("ORDERMGR_VIEW" or "ORDERMGR_ADMIN" needed)</h3> -</#if> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml?rev=613302&r1=613301&r2=613302&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Fri Jan 18 14:45:25 2008 @@ -36,7 +36,7 @@ <screen name="OrderTaskList"> <section> <actions> - <set field="title" value="Order Task List"/> + <set field="titleProperty" value="OrderOrderTaskList"/> <set field="headerItem" value="tasklist"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh"/> </actions> @@ -51,4 +51,4 @@ </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |