svn commit: r708467 - in /ofbiz/trunk/specialpurpose: mypage/script/org/ofbiz/mypage
Locked
svn commit: r708467 - in /ofbiz/trunk/specialpurpose: mypage/script/org/ofbiz/mypage
 
|
Author: hansbak
Date: Tue Oct 28 00:22:17 2008 New Revision: 708467 URL: http://svn.apache.org/viewvc?rev=708467&view=rev Log: show est/act hours on ganntchart, improve email reply function, little change to scheduler Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=708467&r1=708466&r2=708467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Oct 28 00:22:17 2008 @@ -178,14 +178,7 @@ </else> </if-not-empty> </simple-method> - - <simple-method method-name="checkEnteredEmailExists" short-description="Check Enter Email Exists when click New Email"> - <set-service-fields service-name="createCommunicationEvent" map-name="parameters" to-map-name="createCommEvent"/> - <call-service service-name="createCommunicationEvent" in-map-name="createCommEvent"> - <result-to-request result-name="communicationEventId" request-name="communicationEventId"/> - </call-service> - </simple-method> - + <simple-method method-name="createCommunicationContent" short-description="Upload Content and Create Communication Content Association"> <!-- Call layout to get field --> <call-class-method class-name="org.ofbiz.content.layout.LayoutWorker" Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml?rev=708467&r1=708466&r2=708467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Tue Oct 28 00:22:17 2008 @@ -221,13 +221,13 @@ <!-- EMAIL COMMUNICATIONS --> <request-map uri="NewCommunicationEvents"> - <security https="true" auth="true"/> + <security https="true" auth="true"/> <response name="success" type="view" value="EditCommunicationEvent"/> </request-map> <request-map uri="NewCommunicationEvent"> <security https="true" auth="true"/> - <event type="simple" path="org/ofbiz/mypage/Events.xml" invoke="checkEnteredEmailExists"/> + <event type="service" invoke="createCommunicationEvent"/> <response name="success" type="view" value="EditCommunicationEvent"/> </request-map> Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl?rev=708467&r1=708466&r2=708467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl (original) +++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl Tue Oct 28 00:22:17 2008 @@ -3,21 +3,7 @@ <h3>Attach File</h3> </div> <div class="screenlet-body"> - <div class="label">${uiLabelMap.Content}</div> - <form id="content2comevent" method="post" enctype="multipart/form-data" action="<@ofbizUrl>addContentToCommEvent</@ofbizUrl>" name="content2comevent"> - <input type="hidden" name="partyId" value="${partyId}" id="contentPartyId"/> - <input type="hidden" name="communicationEventId" value="${communicationEventId}"/> - <input type="hidden" name="partyContentTypeId" value="USERDEF"/> - <input type="hidden" name="communicationEventTypeId" value="${communicationEventTypeId}"/> - <input type="hidden" name="parentCommEventId" value="${parameters.parentCommEventId?if_exists}"/> - <input type="hidden" name="originalCommEventId" value="${parameters.originalCommEventId?if_exists}"/> - <input type="text" size="25" name="contentId"/> - <a href="javascript:call_fieldlookup2(document.content2comevent.contentId,'LookupContent');"> - <img width="15" height="14" border="0" alt="Lookup" src="/images/fieldlookup.gif"/> - </a> - <input type="submit" value="${uiLabelMap.CommonAdd}"/><br><br> - </form> - + <div class="label">${uiLabelMap.Attach}</div> <form id="uploadPartyContent" method="post" enctype="multipart/form-data" action="<@ofbizUrl>uploadAttachFiletoEmail</@ofbizUrl>"> <input type="hidden" name="dataCategoryId" value="PERSONAL"/> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=708467&r1=708466&r2=708467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Tue Oct 28 00:22:17 2008 @@ -273,7 +273,7 @@ <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field> <field name="subject"><text size="60" default-value="${parameters.subject}"/></field> <field name="fileAttach"><display/></field><field name="fileAttach"> - <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&partyId=${userLogin.partyId}&communicationEventId=${parameters.communicationEventId}&parentCommEventId=${parameters.parentCommEventId}&originalCommEventId=${parameters.originalCommEventId}" description="Attach File"/> + <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&partyId=${userLogin.partyId}&communicationEventId=${parameters.communicationEventId}" description="Attach File"/> </field> <field name="contentMimeTypeId"><hidden value="text/plain"/></field> <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20" default-value="${parameters.content}"/></field> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=708467&r1=708466&r2=708467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Tue Oct 28 00:22:17 2008 @@ -216,7 +216,7 @@ <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/> </and> </condition> - <link target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&partyIdFrom=${userLogin.partyId}&statusId=COM_PENDING&parentCommEventId=${parameters.communicationEventId}"/> + <link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&parentCommEventId=${parameters.communicationEventId}&donePage=${parameters.donePage}"/> </menu-item> <menu-item name="forward" title="${uiLabelMap.Forward}"> <condition> @@ -228,7 +228,7 @@ <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/> </and> </condition> - <link target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&partyIdFrom=${userLogin.partyId}&statusId=COM_PENDING&originalCommEventId=${parameters.communicationEventId}"/> + <link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&originalCommEventId=${parameters.communicationEventId}&donePage=${parameters.donePage}"/> </menu-item> <menu-item name="createRequestFromCommEvent" title="${uiLabelMap.PartyCreateRequestFromCommEvent}"> <condition> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=708467&r1=708466&r2=708467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Oct 28 00:22:17 2008 @@ -801,7 +801,6 @@ </iterate> </if-not-empty> <field-to-list field-name="projectParty" list-name="projectParties"/> - <log level="always" message="=====writing party: ${projectParty.partyId} Hours: ${projectParty.actualHours}"></log> <clear-field field-name="projectParty"/> </then> </if> @@ -1263,7 +1262,6 @@ <simple-method method-name="addValidationPartiesToTask" short-description="SECA to add either project-testing or -approval parties to a task when a task is set to complete"> <!-- check if this is the last party which completed his task --> - <log level="always" message="============= check workEffort: ${parameters.workEffortId}"/> <entity-condition entity-name="WorkEffortPartyAssignment" list-name="openTasks" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="workEffortId" operator="equals" env-name="parameters.workEffortId"/> @@ -1306,7 +1304,6 @@ </if-not-empty> <else> <log level="info" message="Not the last party who completes his task: validation parties not added...."></log> - <log level="info" message="=====parties not completed: openTasks: ${openTasks}"></log> </else> </if-empty> </simple-method> Modified: ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java?rev=708467&r1=708466&r2=708467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java (original) +++ ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java Tue Oct 28 00:22:17 2008 @@ -47,7 +47,7 @@ while (a.hasNext()) { GenericValue assoc = (GenericValue) a.next(); GenericValue nextTask = assoc.getRelatedOne("ToWorkEffort"); - nextTask.put("estimatedStartDate", task.getTimestamp("estimatedCompletionDate")); + nextTask.put("estimatedStartDate", UtilDateTime.addDaysToTimestamp(task.getTimestamp("estimatedCompletionDate"), 1)); // start of next task the next day nextTask.put("estimatedCompletionDate", calculateCompletionDate(nextTask, task.getTimestamp("estimatedCompletionDate"))); nextTask.store(); setDatesFollowingTasks(nextTask); Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=708467&r1=708466&r2=708467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Tue Oct 28 00:22:17 2008 @@ -68,6 +68,12 @@ taskInfo = resultTaskInfo.taskInfo; taskInfo.taskNr = task.workEffortId; taskInfo.phaseNr = phase.phaseId; + Debug.log("=====" + taskInfo.currentStatusId); + if (taskInfo.plannedHours && !taskInfo.currentStatusId.equals("PTS_COMPLETED") && taskInfo.plannedHours > taskInfo.actualHours) { + taskInfo.resource = taskInfo.plannedHours + " Hrs"; + } else { + taskInfo.resource = taskInfo.actualHours + " Hrs"; + } double duration = resultTaskInfo.plannedHours; if (!taskInfo.estimatedStartDate && taskInfo.actualStartDate) { taskInfo.estimatedStartDate = taskInfo.actualStartDate; @@ -96,23 +102,6 @@ } else { taskInfo.url = ""; } - resultTaskResource = dispatcher.runSync("getTasksByParties", [userLogin : userLogin , workEffortId : task.workEffortId]); - taskParties = resultTaskResource.taskParties; - resource = ""; - int i = 0; - if (taskParties){ - taskParties.each { parties -> - symbol = " "; - partyname = parties.partyName; - name = partyname.substring(partyname.indexOf(",")+1 , partyname.length()); - if (i > 0){ - symbol = ", "; - } - resource = resource + symbol + name; - i++; - } - } - taskInfo.resource = resource ; // dependency preTasks = delegator.findByAnd("WorkEffortAssoc", ["workEffortIdTo" : task.workEffortId], ["workEffortIdFrom"]); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |