Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Wed Aug 3 16:12:58 2011 @@ -182,13 +182,13 @@ public class OagisShipmentServices { /* running async for better error handling if (ServiceUtil.isError(oagisMsgInfoResult)) { String errMsg = ServiceUtil.getErrorMessage(oagisMsgInfoResult); - // errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "CreateOagisMessageInfoServiceError")); + // errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "CreateOagisMessageInfoServiceError")); Debug.logError(errMsg, module); } */ } catch (GenericServiceException e) { String errMsg = "Error creating OagisMessageInfo for the Incoming Message: " + e.toString(); - // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException")); + // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException")); Debug.logError(e, errMsg, module); } @@ -198,16 +198,16 @@ public class OagisShipmentServices { } catch (GenericEntityException e) { String errMsg = "Error getting Shipment from database for ID [" + shipmentId + "]: " + e.toString(); Debug.logInfo(e, errMsg, module); - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericEntityException")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericEntityException")); } if (shipment == null) { String errMsg = "Could not find Shipment ID [" + shipmentId + "]"; - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "ShipmentIdNotValid")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "ShipmentIdNotValid")); } else { if (invalidShipmentStatusSet.contains(shipment.get("statusId"))) { String errMsg = "Shipment with ID [" + shipmentId + "] is in a status [" + shipment.get("statusId") + "] that means it has been or is being shipped, so this Show Shipment message may be a duplicate."; - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "ShipmentInBadStatus")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "ShipmentInBadStatus")); } } @@ -231,7 +231,7 @@ public class OagisShipmentServices { "shipmentRouteSegmentId", "00001", "carrierPartyId", carrierPartyId, "trackingIdNumber", trackingNum, "userLogin", userLogin)); if (ServiceUtil.isError(resultMap)) { String errMsg = ServiceUtil.getErrorMessage(resultMap); - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "updateShipmentRouteSegmentError")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "updateShipmentRouteSegmentError")); Debug.logError(errMsg, module); } } @@ -255,7 +255,7 @@ public class OagisShipmentServices { GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId)); if (product == null) { String errMsg = "Product with ID [" + productId + "] not found (invalid Product ID)."; - errorMapList.add(UtilMisc.toMap("reasonCode", "ProductIdNotValid", "description", errMsg)); + errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ProductIdNotValid", "description", errMsg)); Debug.logError(errMsg, module); foundBadProductId = true; continue; @@ -312,7 +312,7 @@ public class OagisShipmentServices { shipmentItemList = delegator.findByAnd("ShipmentItem", UtilMisc.toMap("shipmentId", shipmentId, "productId",productId)); if (UtilValidate.isEmpty(shipmentItemList)) { String errMsg = "Could not find Shipment Item for Shipment with ID [" + shipmentId + "] and Product with ID [" + productId + "]."; - errorMapList.add(UtilMisc.toMap("reasonCode", "ShipmentItemForProductNotFound", "description", errMsg)); + errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ShipmentItemForProductNotFound", "description", errMsg)); Debug.logError(errMsg, module); continue; } @@ -338,7 +338,7 @@ public class OagisShipmentServices { // for now just get the first item, the other scenario is not yet supported if (shipmentItemList.size() > 1) { String errMsg = "Could not find single Shipment Item for Shipment with ID [" + shipmentId + "] and Product with ID [" + productId + "], found [" + shipmentItemList.size() + "] and could not narrow down to one."; - errorMapList.add(UtilMisc.toMap("reasonCode", "SingleShipmentItemForProductNotFound", "description", errMsg)); + errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "SingleShipmentItemForProductNotFound", "description", errMsg)); Debug.logError(errMsg, module); continue; } @@ -348,7 +348,7 @@ public class OagisShipmentServices { GenericValue orderShipment = EntityUtil.getFirst(delegator.findByAnd("OrderShipment", UtilMisc.toMap("shipmentId", shipmentId, "shipmentItemSeqId", shipmentItemSeqId))); if (orderShipment == null) { String errMsg = "Could not find Order-Shipment record for ShipmentItem with ID [" + shipmentId + "] and Item Seq-ID [" + shipmentItemSeqId + "]."; - errorMapList.add(UtilMisc.toMap("reasonCode", "OrderShipmentNotFound", "description", errMsg)); + errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "OrderShipmentNotFound", "description", errMsg)); Debug.logError(errMsg, module); continue; } @@ -386,7 +386,7 @@ public class OagisShipmentServices { if (UtilValidate.isNotEmpty(serialNumberList)) { if (messageQuantity.intValue() != serialNumberList.size()) { String errMsg = "Error: the quantity in the message [" + messageQuantity.intValue() + "] did not match the number of serial numbers passed [" + serialNumberList.size() + "] for ShipmentItem with ID [" + shipmentId + "] and Item Seq-ID [" + shipmentItemSeqId + "]."; - errorMapList.add(UtilMisc.toMap("reasonCode", "QuantitySerialMismatch", "description", errMsg)); + errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "QuantitySerialMismatch", "description", errMsg)); Debug.logInfo(errMsg, module); continue; } @@ -396,7 +396,7 @@ public class OagisShipmentServices { //OrderItem than there is quantity on the current ShipmentItem if (totalReserved < messageQuantity.intValue()) { String errMsg = "Inventory reservation quantity [" + totalReserved + "] was less than the message quantity [" + messageQuantity.intValue() + "] so cannot receive against reservations for ShipmentItem with ID [" + shipmentId + ":" + shipmentItemSeqId + "], and OrderItem [" + orderShipment.getString("orderId") + ":" + orderShipment.getString("orderItemSeqId") + "]"; - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumbersMissing")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumbersMissing")); Debug.logInfo(errMsg, module); continue; } @@ -456,13 +456,13 @@ public class OagisShipmentServices { if (OagisServices.requireSerialNumberExist.booleanValue()) { if (inventoryItemsBySerialNumber.size() == 0) { String errMsg = "Referenced serial numbers must already exist, but serial number [" + serialNumber + "] was not found. Product ID(s) considered are: " + productIdSet; - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumberRequiredButNotFound")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumberRequiredButNotFound")); continue; } } else { if (inventoryItemsBySerialNumber.size() > 0) { String errMsg = "Referenced serial numbers must NOT already exist, but serial number [" + serialNumber + "] already exists. Product ID(s) considered are: " + productIdSet; - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumberRequiredNotExistButFound")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumberRequiredNotExistButFound")); continue; } } @@ -475,7 +475,7 @@ public class OagisShipmentServices { Map<String, Object> resultMap = dispatcher.runSync("issueSerializedInvToShipmentPackageAndSetTracking", isitspastCtx); if (ServiceUtil.isError(resultMap)) { String errMsg = ServiceUtil.getErrorMessage(resultMap); - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "IssueSerializedInvServiceError")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "IssueSerializedInvServiceError")); Debug.logError(errMsg, module); } } @@ -485,7 +485,7 @@ public class OagisShipmentServices { Map<String, Object> resultMap = dispatcher.runSync("issueSerializedInvToShipmentPackageAndSetTracking", isitspastCtx); if (ServiceUtil.isError(resultMap)) { String errMsg = ServiceUtil.getErrorMessage(resultMap); - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "IssueSerializedInvServiceError")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "IssueSerializedInvServiceError")); Debug.logError(errMsg, module); } } @@ -515,7 +515,7 @@ public class OagisShipmentServices { if (shipmentItemQuantity > totalItemIssuanceQuantity) { String errMsg = "ShipmentItem [" + shipmentId + ":" + shipmentItem.get("shipmentItemSeqId") + "] was not completely fulfilled; shipment item quantity was [" + shipmentItemQuantity + "], but total fulfilled is only [" + totalItemIssuanceQuantity + "]"; - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "ShipmentItemNotCompletelyFulfilled")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "ShipmentItemNotCompletelyFulfilled")); Debug.logError(errMsg, module); } } @@ -526,13 +526,13 @@ public class OagisShipmentServices { UtilMisc.toMap("shipmentId", shipmentId, "userLogin", userLogin)); if (ServiceUtil.isError(resultMap)) { String errMsg = ServiceUtil.getErrorMessage(resultMap); - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SetShipmentStatusPackedAndShippedError")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SetShipmentStatusPackedAndShippedError")); Debug.logError(errMsg, module); } } } catch (Throwable t) { String errMsg = UtilProperties.getMessage(resource, "OagisErrorMessageShowShipment", UtilMisc.toMap("shipmentId", shipmentId, "omiPkMap", omiPkMap), locale); - errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SystemError")); + errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SystemError")); try { oagisMsgInfoCtx.put("processingStatusId", "OAGMP_SYS_ERROR"); @@ -960,7 +960,7 @@ public class OagisShipmentServices { uomiCtx.put("userLogin", userLogin); dispatcher.runSync("updateOagisMessageInfo", uomiCtx, 60, true); - List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.toMap("description", errMsg, "reasonCode", "SystemError")); + List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SystemError")); Map<String, Object> saveErrorMapListCtx = FastMap.newInstance(); saveErrorMapListCtx.putAll(omiPkMap); saveErrorMapListCtx.put("errorMapList", errorMapList); @@ -1203,7 +1203,7 @@ public class OagisShipmentServices { uomiCtx.put("userLogin", userLogin); dispatcher.runSync("updateOagisMessageInfo", uomiCtx, 60, true); - List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.toMap("description", errMsg, "reasonCode", "SystemError")); + List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SystemError")); Map<String, Object> saveErrorMapListCtx = FastMap.newInstance(); saveErrorMapListCtx.putAll(omiPkMap); saveErrorMapListCtx.put("errorMapList", errorMapList);
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/data/OfbizData_FR.xml Wed Aug 3 16:12:58 2011 @@ -163,13 +163,15 @@ under the License. <p>En effet, OFBiz est destiné à servir de socle pour créer d'autres applications qui seront, elles, utilisées directement. OFBiz est aussi destiné aux structures qui recherchent une solution pour accompagner leurs projets. Si vous désirez plus que ce qu'un logiciel "en version boîte" va offrir, et que les coûts de déploiement et de maintenance d'un systême informatique traditionnel vous semblent injustifiés, alors Apache OFBiz est la solution qu'il vous faut. </p> - <p>Sous licence Apache 2.0, et géré par une communauté de contributeurs et utilisateurs, OFBiz propose à tous une grande flexibilité par l'accès complet au code source. La communauté autour d'OFBiz permet de ne pas rester seul, mais de travailler avec beaucoup d'autres afin de faire avancer les projets. + <p>Sous licence Apache 2.0, et géré par une communauté de contributeurs et utilisateurs, OFBiz propose à tous une grande flexibilité par l'accès complet au code source et la grande. La communauté autour d'OFBiz permet de ne pas rester seul, mais de travailler avec beaucoup d'autres personnes afin de faire avancer les projets. </p> <p>Pour plus de détails et avoir des réponses à vos interrogations, vous pouvez consulter les documents suivants : - <a href="http://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Getting+Started";>Guide de démarrage Apache OFBiz</a>, - <a href="http://cwiki.apache.org/confluence/x/DAFk";>Nouvelles fonctionnalités (mis à jour mensuellement)</a>, - <a href="http://cwiki.apache.org/confluence/x/UgFk";>Est-ce qu'Apache OFBiz est fait pour moi ?</a>, + <ul> + <li><a href="http://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Getting+Started";>Guide de démarrage Apache OFBiz</a>,</li> + <li><a href="http://cwiki.apache.org/confluence/x/DAFk";>Nouvelles fonctionnalités (mis à jour mensuellement)</a>,</li> + <li><a href="http://cwiki.apache.org/confluence/x/UgFk";>Est-ce qu'Apache OFBiz est fait pour moi ?</a>,</li> + </ul> </p> <p>Pour plus d'informations techniques, visitez la <a href="http://cwiki.apache.org/confluence/x/GoB2";>documentation</a>.</p> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Wed Aug 3 16:12:58 2011 @@ -644,7 +644,7 @@ <property key="PageTitleTaskAssignedToMe"> <value xml:lang="de">Ãffne die mir zugeordneten Aufgaben</value> <value xml:lang="en">Open Tasks Assigned to me.</value> - <value xml:lang="fr">Ouvrir les tâches qui me sont affectées</value> + <value xml:lang="fr">Tâches qui me sont affectées</value> <value xml:lang="it">Compiti aperti assegnati a me.</value> <value xml:lang="nl">Openstaande taken voor mij</value> <value xml:lang="th">à¸à¸²à¸à¸à¸µà¹à¸¡à¸à¸à¸«à¸¡à¸²à¸¢à¹à¸«à¹à¸à¸±à¸</value> @@ -1042,11 +1042,11 @@ </property> <property key="ProjectMgrActualCompletionDateAbbr"> <value xml:lang="en">Act.Compl.</value> - <value xml:lang="fr">Date fin réelle</value> + <value xml:lang="fr">Fin réelle</value> </property> <property key="ProjectMgrEstimatedCompletionDateAbbr"> <value xml:lang="en">Est.Compl.</value> - <value xml:lang="fr">Date fin est.</value> + <value xml:lang="fr">Fin est.</value> </property> <property key="ProjectMgrFilterOn"> <value xml:lang="de">Filter aktivieren</value> @@ -1324,6 +1324,7 @@ </property> <property key="ProjectMgrProrityAbbr"> <value xml:lang="en">Prio.</value> + <value xml:lang="en">P.</value> </property> <property key="ProjectMgrPrivateOrPublic"> <value xml:lang="de">Privat/Ãffentlich</value> @@ -1569,7 +1570,7 @@ <property key="ProjectMgrSkillStandards"> <value xml:lang="de">Qualifikationsstandards</value> <value xml:lang="en">Skill Standards</value> - <value xml:lang="fr">Compétences standards</value> + <value xml:lang="fr">Compétences</value> <value xml:lang="it">Abilità standard</value> <value xml:lang="nl">Competentie-standaarden</value> <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸µà¹à¸§à¸²à¸à¹à¸à¸</value> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/entitydef/entitymodel.xml Wed Aug 3 16:12:58 2011 @@ -35,7 +35,7 @@ under the License. <view-entity entity-name="ProjectPartyAndPhase" package-name="org.ofbiz.specialpurpose.project" - title="To listr all the phases of project the logged user is part off"> + title="To list all the phases of project the logged user is part off"> <member-entity entity-alias="WEPA" entity-name="WorkEffortPartyAssignment"/> <member-entity entity-alias="WEP" entity-name="WorkEffort"/> <member-entity entity-alias="WEPH" entity-name="WorkEffort"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Aug 3 16:12:58 2011 @@ -705,7 +705,7 @@ <field-map field-name="statusId" from-field="project.currentStatusId"/> </entity-one> <set field="highInfo.createdDate" from-field="project.createdDate"/> - <set field="highInfo.parentProjectId" from-field="parentProject.workEffortId"/> + <set field="highInfo.parentProjectId" from-field="project.workEffortParentId"/> <!-- loop through the related phases and tasks --> <get-related value-field="project" relation-name="ChildWorkEffort" list="phases"/> <if-not-empty field="phases"> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Wed Aug 3 16:12:58 2011 @@ -118,19 +118,13 @@ if (phases) { // dependency can only show one in the ganttchart, so onl show the latest one.. preTasks = delegator.findByAnd("WorkEffortAssoc", ["workEffortIdTo" : task.workEffortId], ["workEffortIdFrom"]); - latestTaskId = ""; - Timestamp latestDate = null; + latestTaskIds = new LinkedList(); preTasks.each { preTask -> wf = preTask.getRelatedOne("FromWorkEffort"); - if (wf.estimatedStartDate) { - if (!latestDate || latestDate.before(wf.estimatedStartDate)) { - latestTaskId = wf.workEffortId; - latestDate = wf.estimatedStartDate; - } - } + latestTaskIds.add(wf.workEffortId); } - if (latestDate) { - taskInfo.preDecessor = latestTaskId; + if (UtilValidate.isNotEmpty(latestTaskIds)) { + taskInfo.preDecessor = latestTaskIds; } ganttList.add(taskInfo); } Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy Wed Aug 3 16:12:58 2011 @@ -29,5 +29,6 @@ if (parameters.workEffortId) { if (UtilValidate.isNotEmpty(projects)) { context.put("projectId", projects.get(0).getString("projectId")); context.put("projectName", projects.get(0).getString("projectName")); + context.put("phaseName", projects.get(0).getString("phaseName")); } } Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl Wed Aug 3 16:12:58 2011 @@ -36,7 +36,7 @@ g.setShowComp(1); // Show/Hide % Complet g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskSeqNum?if_exists}. ${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0, ${t.phaseNr}, 1<#if t.preDecessor?exists>, ${t.preDecessor}</#if>)); </#if> <#if t.workEffortTypeId == "MILESTONE"> - g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedStartDate)}","00ff00", "", 1 , "", 100 , 0,${t.phaseNr}, "", "" )); + g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","00ff00", "", 1 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0,${t.phaseNr}, "", "" )); </#if> </#list> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Aug 3 16:12:58 2011 @@ -142,10 +142,12 @@ under the License. <widgets> <include-menu name="TaskSubTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/> <container style="clear"/> - <label style="h1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}] ${uiLabelMap.ProjectMgrPhaseName}: ${phaseName} ${uiLabelMap.ProjectMgrProjectName}: ${projectName}"/> - <link style="h1" text="[${projectId}]" target="projectView"> - <parameter param-name="projectId"/> - </link> + <label style="h1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName} [${workEffort.workEffortId}]"/> + <label style="h1" text="${uiLabelMap.ProjectMgrPhaseName}: ${phaseName}"/> + <container style="h1"> + <label text="${uiLabelMap.ProjectMgrProjectName}: ${projectName}"/> + <link text="[${projectId}]" target="projectView"><parameter param-name="projectId"/></link> + </container> </widgets> </section> <decorator-section-include name="body"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Aug 3 16:12:58 2011 @@ -72,7 +72,7 @@ </entity-options> </drop-down> </field> - <field name="parentProjectName" parameter-name="workEffortParentId"> + <field name="parentProjectName" entry-name="parentProjectId" parameter-name="workEffortParentId"> <drop-down allow-empty="true"> <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId"> <entity-constraint name="workEffortTypeId" value="PROJECT"/> @@ -233,8 +233,8 @@ <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field> <field name="parentProjectId" title="${uiLabelMap.ProjectMgrParentProjectName}"> <display-entity entity-name="WorkEffort" description="${workEffortName} ${workEffortId}" key-field-name="workEffortId"> - <sub-hyperlink target="projectView" description="${workEffortId}" link-style="buttontext"> - <parameter param-name="projectId" from-field="workEffortId"/> + <sub-hyperlink target="projectView" description="${project.parentProjectId}" link-style="buttontext"> + <parameter param-name="projectId" from-field="project.parentProjectId"/> </sub-hyperlink> </display-entity> </field> @@ -386,7 +386,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="phaseId" parameter-name="workEffortId"><hidden/></field> - <field name="phaseSeqNum" parameter-name="sequenceNum"><text size="3"/></field> + <field name="phaseSeqNum" parameter-name="sequenceNum" title="${uiLabelMap.FormFieldTitle_sequenceNum}"><text size="3"/></field> <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Aug 3 16:12:58 2011 @@ -31,7 +31,7 @@ <field name="partyId" use-when="myTask!=void"><hidden value="${userLogin.partyId}"/></field> <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> - <field name="workEffortParentId" use-when="myTask==void&&projectId!=void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}"> + <field name="workEffortParentId" use-when="myTask==void @and projectId!=void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}"> <drop-down allow-empty="true"> <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${projectId}.${sequenceNum} ${workEffortName}[${workEffortId}]"> <entity-constraint name="workEffortTypeId" value="PHASE"/> @@ -41,7 +41,7 @@ </entity-options> </drop-down> </field> - <field name="workEffortParentId" use-when="myTask==void&&projectId==void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}"> + <field name="workEffortParentId" use-when="myTask==void @and projectId==void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}"> <drop-down allow-empty="true"> <entity-options entity-name="ProjectPartyAndPhase" key-field-name="phaseId" description="${projectName} -- ${phaseName}"> <entity-constraint name="partyId" env-name="userLogin.partyId"/> @@ -50,12 +50,12 @@ </entity-options> </drop-down> </field> - <field name="workEffortParentId" use-when="myTask!=void&&parameters.get("workEffortParentId")!=null" title="${uiLabelMap.ProjectMgrTaskPhase}*"> + <field name="workEffortParentId" use-when="myTask!=void @and parameters.get("workEffortParentId")!=null" title="${uiLabelMap.ProjectMgrTaskPhase}*"> <display-entity entity-name="WorkEffort" description="${workEffortName}[${workEffortId}]" key-field-name="workEffortId"> <sub-hyperlink target="MyTasks" description="[${uiLabelMap.CommonChange}]"/> </display-entity> </field> - <field name="workEffortParentId" use-when="myTask!=void&&parameters.get("workEffortParentId")==null" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}" event="onchange" action="javascript:document.EditTask.submit();"> + <field name="workEffortParentId" use-when="myTask!=void @and parameters.get("workEffortParentId")==null" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}" event="onchange" action="javascript:document.EditTask.submit();"> <drop-down allow-empty="true"> <entity-options entity-name="ProjectPartyAndPhase" key-field-name="phaseId" description="${projectName} -- ${phaseName}"> <entity-constraint name="partyId" env-name="userLogin.partyId"/> @@ -64,7 +64,7 @@ </entity-options> </drop-down> </field> - <field name="taskSeqId" entry-name="sequenceNum" parameter-name="sequenceNum"><text size="3"/></field> + <field name="taskSeqId" entry-name="sequenceNum" parameter-name="sequenceNum" title="${uiLabelMap.FormFieldTitle_sequenceNum}"><text size="3"/></field> <field name="roleTypeId" use-when="myTask!=void" title="${uiLabelMap.ProjectMgrMyRoleForThisTask}"> <drop-down current="selected" allow-empty="false"> <entity-options entity-name="ProjectIdPartyRoleAndPhase" description="${description}"> @@ -112,7 +112,8 @@ </field> <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}" position="1"><date-time type="date"/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}" position="2"><date-time type="date"/></field> - <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> + <field name="add" title="${uiLabelMap.CommonAdd}" use-when="task==void || task==null"><submit/></field> + <field name="add" title="${uiLabelMap.CommonSave}" use-when="task!=void @and task!=null"><submit/></field> </form> <form name="AssignTaskOtherProject" type="single" target="updateTask" default-map-name="task"> @@ -136,7 +137,7 @@ <field name="workEffortTypeId"><hidden value="PHASE"/></field> <field name="currentStatusId"><hidden value="_NA_"/></field> <field name="phaseName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrPhaseName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> - <field name="phaseSeqId" entry-name="sequenceNum" parameter-name="sequenceNum"><text size="3"/></field> + <field name="phaseSeqId" entry-name="sequenceNum" parameter-name="sequenceNum" title="${uiLabelMap.FormFieldTitle_sequenceNum}"><text size="3"/></field> <field name="phaseDdescription" parameter-name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonMax250Chars}"><textarea/></field> <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> </form> Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Aug 3 16:12:58 2011 @@ -0,0 +1 @@ +build Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java Wed Aug 3 16:12:58 2011 @@ -164,7 +164,7 @@ public abstract class BaseEntityCondExpr Iterator aai = autoFields.iterator(); while (aai.hasNext()) { String alias = (String) aai.next(); - view.addAliasAll(alias, ""); + view.addAliasAll(alias, "", null); } // create the other field aliases
