Author: jleroux
Date: Mon Mar 28 12:08:13 2016
New Revision: 1736876
URL: http://svn.apache.org/viewvc?rev=1736876&view=rev
Log:
A patch from Pierre Smits for <<relocate .ftl files in the project component>>
https://issues.apache.org/jira/browse/OFBIZ-6812
Added:
ofbiz/trunk/specialpurpose/projectmgr/template/
ofbiz/trunk/specialpurpose/projectmgr/template/project/
ofbiz/trunk/specialpurpose/projectmgr/template/project/edittaskandassoc.ftl
(with props)
ofbiz/trunk/specialpurpose/projectmgr/template/project/ganttChart.ftl
(with props)
ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/
ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/noteinfo.ftl
(with props)
ofbiz/trunk/specialpurpose/projectmgr/template/request/
ofbiz/trunk/specialpurpose/projectmgr/template/request/overViewRequestItems.ftl
(with props)
ofbiz/trunk/specialpurpose/projectmgr/template/survey/
ofbiz/trunk/specialpurpose/projectmgr/template/survey/ListSurveys.ftl
(with props)
ofbiz/trunk/specialpurpose/projectmgr/template/survey/TestWorkEffortSurvey.ftl
(with props)
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
Added:
ofbiz/trunk/specialpurpose/projectmgr/template/project/edittaskandassoc.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/template/project/edittaskandassoc.ftl?rev=1736876&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/template/project/edittaskandassoc.ftl
(added)
+++ ofbiz/trunk/specialpurpose/projectmgr/template/project/edittaskandassoc.ftl
Mon Mar 28 12:08:13 2016
@@ -0,0 +1,219 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <#if task?has_content>
+ <li
class="h3"> ${uiLabelMap.PageTitleEditTask} #${project.workEffortId!}
${uiLabelMap.CommonInformation}</li>
+ <#else>
+ <li class="h3"> ${uiLabelMap.PageTitleAddTask}</li>
+ </#if>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <#assign workEffortIdFrom = parameters.workEffortIdFrom>
+ <#if task?has_content>
+ <form name="addTaskAndAssocForm" method="get"
action="<@ofbizUrl>updateTaskAndAssoc</@ofbizUrl>">
+ <#else>
+ <br />
+ <form name="addTaskAndAssocForm" method="get"
action="<@ofbizUrl>createTaskAndAssoc</@ofbizUrl>">
+ </#if>
+ <table width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <#if !(task??)>
+ <td><input type="hidden" name="workEffortTypeId"
value="${parameters.workEffortTypeId!}"/></td>
+ <#else>
+ <td><input type="hidden" name="workEffortTypeId"
value="${task.workEffortTypeId!}"/></td>
+ <td><input type="hidden" name="workEffortId"
value="${task.workEffortId!}"/></td>
+ <td><input type="hidden" name="workEffortName"
value="${task.workEffortName!}"/></td>
+ </#if>
+ </tr>
+ <tr>
+ <td><input type="hidden" name="workEffortIdFrom"
value="${workEffortIdFrom!}"/></td>
+ <td><input type="hidden" name="workEffortParentId"
value="${workEffortIdFrom!}"/></td>
+ <td><input type="hidden" name="workEffortAssocTypeId"
value="WORK_EFF_BREAKDOWN"/>
+ </tr>
+ <tr>
+ <td width="20%">
+ ${uiLabelMap.ProjectMgrTaskDetails}
+ </td>
+ </tr>
+ <tr>
+ <td class="label" >${uiLabelMap.ProjectMgrQuickAssignPartyId}</td>
+ <td>
+ <@htmlTemplate.lookupField formName="addTaskAndAssocForm"
name="quickAssignPartyId" id="quickAssignPartyId"
fieldFormName="LookupPartyName"/>
+ </td>
+ </tr>
+ <tr>
+ <#if task??>
+ <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>
+ <td>${task.workEffortId!}</td>
+ </#if>
+ </tr>
+ <tr>
+ <td class="label" >${uiLabelMap.CommonName}*</td>
+ <#if task??>
+ <td>${task.workEffortName!}<span
class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <#else>
+ <td><input type="text" name="workEffortName" value=""/><span
class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ </#if>
+ </tr>
+ <tr>
+ <td class="label" >${uiLabelMap.CommonDescription}</td>
+ <#if task??>
+ <td><input type="text" name="description"
value="${task.description!}"/></td>
+ <#else>
+ <td><input type="text" name="description" value=""/></td>
+ </#if>
+ </tr>
+ <tr>
+ <td class="label" >${uiLabelMap.CommonStatus}</td>
+ <td>
+ <select name="currentStatusId">
+ <#if task??>
+ <#assign currentStatus =
task.geRelatedOne("CurrentStatusItem")!>
+ <option selected="selected"
value="${currentStatus.currentStatusId}">${currentStatus.description}</option>
+ <#assign statusValidChangeToDetailList =
delegator.findByAnd("StatusValidChangeToDetail",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId",
currentStatus.currentStatusId), null, false)>
+ <#list statusValidChangeToDetailList as
statusValidChangeToDetail>
+ <option
value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
+ </#list>
+ <#else>
+ <#assign statusItemGenrals = delegator.findByAnd("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId",
"CALENDAR_STATUS"), null, false)>
+ <#assign statusItemTasks = delegator.findByAnd("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"),
null, false)>
+ <#assign statusItemEvents = delegator.findByAnd("StatusItem",
Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"),
null, false)>
+ <#list statusItemGenrals as statusItem>
+ <option
value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option>
+ </#list>
+ <#list statusItemTasks as statusItem>
+ <option
value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option>
+ </#list>
+ <#list statusItemEvents as statusItem>
+ <option
value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option>
+ </#list>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.CommonPriority}</td>
+ <td>
+ <#if task?has_content>
+ <#assign priority = task.priority!>
+ </#if>
+ <select name="priority" size="1">
+ <#if priority??>
+ <option selected="selected"
value="${priority}">${priority}</option>
+ <option></option>
+ <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option>
+ <option value=2>${uiLabelMap.WorkEffortPriorityTwo}</option>
+ <option value=3>${uiLabelMap.WorkEffortPriorityThree}</option>
+ <option value=4>${uiLabelMap.WorkEffortPriorityFour}</option>
+ <option value=5>${uiLabelMap.WorkEffortPriorityFive}</option>
+ <option value=6>${uiLabelMap.WorkEffortPrioritySix}</option>
+ <option
value=7>${uiLabelMap.WorkEffortPrioritySeventh}</option>
+ <option value=8>${uiLabelMap.WorkEffortPriorityEight}</option>
+ <option value=9>${uiLabelMap.WorkEffortPriorityNine}</option>
+ <#else>
+ <option></option>
+ <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option>
+ <option value=2>${uiLabelMap.WorkEffortPriorityTwo}</option>
+ <option value=3>${uiLabelMap.WorkEffortPriorityThree}</option>
+ <option value=4>${uiLabelMap.WorkEffortPriorityFour}</option>
+ <option value=5>${uiLabelMap.WorkEffortPriorityFive}</option>
+ <option value=6>${uiLabelMap.WorkEffortPrioritySix}</option>
+ <option
value=7>${uiLabelMap.WorkEffortPrioritySeventh}</option>
+ <option value=8>${uiLabelMap.WorkEffortPriorityEight}</option>
+ <option value=9>${uiLabelMap.WorkEffortPriorityNine}</option>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
+ <td>
+ <#assign enumerations = delegator.findByAnd("Enumeration",
Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"),
null, false)>
+ <select name="scopeEnumId">
+ <#if task??>
+ <#assign scopeEnumId = task.scopeEnumId!>
+ <#list enumerations as enumeration>
+ <option <#if "${enumeration.enumId}" ==
scopeEnumId!>selected="selected"</#if>>${enumeration.description}</option>
+ </#list>
+ <#else>
+ <#list enumerations as enumeration>
+ <option
value="${enumeration.enumId}">${enumeration.description}</option>
+ </#list>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
+ <td>
+ <#if task??>
+ <@htmlTemplate.renderDateTimeField name="estimatedStartDate"
className="" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.estimatedStartDate!}" size="25" maxlength="30"
id="estimatedStartDate1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ <#else>
+ <@htmlTemplate.renderDateTimeField name="estimatedStartDate"
className="" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate1"
dateType="date" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td
class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
+ <td>
+ <#if task??>
+ <@htmlTemplate.renderDateTimeField
name="estimatedCompletionDate" className="" event="" action="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS"
value="${task.estimatedCompletionDate!}" size="25" maxlength="30"
id="estimatedCompletionDate1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ <#else>
+ <@htmlTemplate.renderDateTimeField
name="estimatedCompletionDate" className="" event="" action="" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30"
id="estimatedCompletionDate1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
+ <td>
+
+
+ <#if task??>
+ <@htmlTemplate.renderDateTimeField name="actualStartDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.actualStartDate!}" size="25" maxlength="30"
id="actualStartDate1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ <#else>
+ <@htmlTemplate.renderDateTimeField name="actualStartDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualStartDate1"
dateType="date" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td
class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
+ <td>
+
+ <#if task??>
+ <@htmlTemplate.renderDateTimeField name="actualCompletionDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${task.actualCompletionDate!}" size="25" maxlength="30"
id="actualCompletionDate2" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ <#else>
+ <@htmlTemplate.renderDateTimeField name="actualCompletionDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualCompletionDate2"
dateType="date" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <input type="submit" name="submit"
value="${uiLabelMap.CommonSave}"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/edittaskandassoc.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/edittaskandassoc.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/edittaskandassoc.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/specialpurpose/projectmgr/template/project/ganttChart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/template/project/ganttChart.ftl?rev=1736876&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/template/project/ganttChart.ftl
(added)
+++ ofbiz/trunk/specialpurpose/projectmgr/template/project/ganttChart.ftl Mon
Mar 28 12:08:13 2016
@@ -0,0 +1,64 @@
+<#-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -->
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div style="position:relative" class="gantt" id="GanttChartDIV"></div>
+<script type="text/javascript" language="javascript">
+var g = new JSGantt.GanttChart('g',document.getElementById('GanttChartDIV'),
'day');
+
+g.setShowRes(1); // Show/Hide Responsible (0/1)
+g.setShowDur(1); // Show/Hide Duration (0/1)
+g.setShowComp(1); // Show/Hide % Complete(0/1)
+
+// Parameters (pID, pName, pStart, pEnd,
pColor, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen)
+
+<#list phaseTaskList as t>
+ <#if t.workEffortTypeId == "PHASE">
+ g.AddTaskItem(new JSGantt.TaskItem(${t.phaseNr}, "${t.phaseSeqNum!}.
${t.phaseName}", "", "", "00ff00", "", 0, "", 0, 1, 0, 1));
+ </#if>
+ <#if t.workEffortTypeId == "TASK">
+ g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskSeqNum!}.
${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}",
"${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 ,
"${t.resource!}", ${t.completion!} , 0, ${t.phaseNr}, 1<#if t.preDecessor??>,
"${t.preDecessor}"</#if>));
+ </#if>
+ <#if t.workEffortTypeId == "MILESTONE">
+ g.AddTaskItem(new
JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}",
"${StringUtil.wrapString(t.estimatedCompletionDate)}","00ff00", "", 1 ,
"${t.resource!}", ${t.completion!} , 0,${t.phaseNr}, "", "" ));
+ </#if>
+</#list>
+
+<#--
+
+TaskItem(pID, pName, pStart, pEnd, pColor, pLink, pMile, pRes, pComp, pGroup,
pParent, pOpen, pDepend)
+pID: (required) is a unique ID used to identify each row for parent functions
and for setting dom id for hiding/showing
+pName: (required) is the task Label
+pStart: (required) the task start date, can enter empty date ('') for groups
+pEnd: (required) the task end date, can enter empty date ('') for groups
+pColor: (required) the html color for this task; e.g. '00ff00'
+pLink: (optional) any http link navigated to when task bar is clicked.
+pMile:(optional) represent a milestone
+pRes: (optional) resource name
+pComp: (required) completion percent
+pGroup: (optional) indicates whether this is a group(parent) - 0=NOT Parent;
1=IS Parent
+pParent: (required) identifies a parent pID, this causes this task to be a
child of identified task
+pOpen: UNUSED - in future can be initially set to close folder when chart is
first drawn
+pDepend: dependency: need previous task finished.
+
+-->
+g.Draw();
+g.DrawDependencies();
+</script>
+
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/ganttChart.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/ganttChart.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/ganttChart.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/noteinfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/noteinfo.ftl?rev=1736876&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/noteinfo.ftl
(added)
+++ ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/noteinfo.ftl
Mon Mar 28 12:08:13 2016
@@ -0,0 +1,127 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3"> ${uiLabelMap.WorkEffortNotes}</li>
+ <#--if project?has_content>
+ <li><a
href="<@ofbizUrl>newNotesForProject?workEffortId=${project.workEffortId!}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li>
+ <#else>
+ <li><a
href="<@ofbizUrl>newNotesForTask?workEffortId=${task.workEffortId!}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li>
+ </#if-->
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <table width='100%' border='0' cellspacing='0' cellpadding='0'
class='boxbottom'>
+ <tr>
+ <td>
+ <#if workEffortNoteandDetails?has_content>
+ <table width="100%" border="0" cellpadding="1">
+ <#list workEffortNoteandDetails as note>
+ <tr>
+ <td valign="top" width="35%">
+ <div> <b>${uiLabelMap.CommonBy}:
</b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
note.noteParty, true)}</div>
+ <div> <b>${uiLabelMap.CommonAt}:
</b>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(note.noteDateTime!,"dd-MM-yyyy
HH:mm",Static["java.util.TimeZone"].getDefault(),context.get("locale"))}</div>
+ </td>
+ <td valign="top" width="50%">
+ <div>${note.noteInfo!}</div>
+ </td>
+ <td align="right" valign="top" width="15%">
+ <#if note.internalNote! == "N">
+ <div>${uiLabelMap.ProjectMgrPrintableNote}</div>
+ <#if project?has_content>
+ <a
href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId!}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
+ <#else>
+ <a
href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId!}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
+ </#if>
+ </#if>
+ <#if note.internalNote! == "Y">
+ <div>${uiLabelMap.OrderNotPrintableNote}</div>
+ <#if project?has_content>
+ <a
href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId!}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
+ <#else>
+ <a
href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId!}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>"
class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
+ </#if>
+ </#if>
+ </td>
+ </tr>
+ <#if note_has_next>
+ <tr><td colspan="3"><hr/></td></tr>
+ </#if>
+ </#list>
+ </table>
+ <#else>
+ <#if project?has_content>
+ <div> ${uiLabelMap.ProjectMgrProjectNoNotes}.</div>
+ <#else>
+ <div> ${uiLabelMap.ProjectMgrTaskNoNotes}.</div>
+ </#if>
+
+ </#if>
+ </td>
+ </tr>
+ </table>
+ <#if parameters.showForm??>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3"> ${uiLabelMap.OrderAddNote}</li>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <form name="createnoteform" method="post"
+ <#if project?has_content>
action="<@ofbizUrl>createNewNotesForProject</@ofbizUrl>"
+ <#else> action="<@ofbizUrl>createNewNotesForTask</@ofbizUrl>"
+ </#if>>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <#if project?has_content>
+ <td><input type="hidden" name="workEffortId"
value="${project.workEffortId}" /></td>
+ <#else>
+ <td><input type="hidden" name="workEffortId"
value="${task.workEffortId}" /></td>
+ </#if>
+ </tr>
+ <tr>
+ <td width="26%"
align="right"><div>${uiLabelMap.OrderNote}</div></td>
+ <td width="54%">
+ <textarea name="noteInfo" rows="5" cols="70"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td/><td>${uiLabelMap.OrderInternalNote} :
+ <select name="internalNote" size="1"><option
value=""></option><option value="Y"
selected>${uiLabelMap.CommonYes}</option><option
value="N">${uiLabelMap.CommonNo}</option></select></td>
+ </tr>
+ <tr>
+ <td/><td><i>${uiLabelMap.OrderInternalNoteMessage}</i></td>
+ </tr>
+ </table>
+ <#if project?has_content>
+ <a href="javascript:document.createnoteform.submit()"
class="buttontext">${uiLabelMap.CommonSave}</a>
+ <#else>
+ <a href="javascript:document.createnoteform.submit()"
class="buttontext">${uiLabelMap.CommonSave}</a>
+ </#if>
+ </form>
+ </div>
+ </#if>
+ </div>
+ </div>
+
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/noteinfo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/noteinfo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/project/summary/noteinfo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
ofbiz/trunk/specialpurpose/projectmgr/template/request/overViewRequestItems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/template/request/overViewRequestItems.ftl?rev=1736876&view=auto
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/template/request/overViewRequestItems.ftl
(added)
+++
ofbiz/trunk/specialpurpose/projectmgr/template/request/overViewRequestItems.ftl
Mon Mar 28 12:08:13 2016
@@ -0,0 +1,111 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.PageTitleRequestItems}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <table class="basic-table hover-bar" cellspacing="0" >
+ <tr class="header-row">
+ <td>
+ ${uiLabelMap.CommonNbr}
+ </td>
+ <td colspan="2">
+ ${uiLabelMap.CommonDescription}
+ </td>
+ <td>
+ </td>
+ </tr>
+ <#list custRequestItems as custRequestItemList>
+ <#if custRequestItemList.custRequestItemSeqId?has_content>
+ <tr class="header-row">
+ <td>
+ </td>
+ <td colspan="2">
+ </td>
+ <td>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a
href="<@ofbizUrl>requestitem?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>"
class="linktext">${custRequestItemList.custRequestItemSeqId}</a>
+ </td>
+ <td colspan="2">
+ <#if custRequestItemList.story?has_content>
+ <textarea readonly="readonly" rows="15"
cols="72">${custRequestItemList.story}</textarea>
+ </#if>
+ </td>
+
+ <#-- now show notes details per line item -->
+ <td colspan="1" align="right" valign="top" width="50%"
nowrap="nowrap" style="background-color:white; vertical-align: top;">
+ <#if custRequestItemNoteViews?has_content>
+ <table class="basic-table hover-bar" cellspacing="0">
+ <tr class="header-row">
+ <td>
+ </td>
+ <td>
+ ${uiLabelMap.CommonNbr}
+ </td>
+ <td>
+ ${uiLabelMap.CommonNote}
+ </td>
+ <td>
+ ${uiLabelMap.PartyParty}
${uiLabelMap.PartyName}
+ </td>
+ <td>
+ ${uiLabelMap.CommonDate}
+ </td>
+ </tr>
+ <#list custRequestItemNoteViews as
custRequestItemNoteViewList>
+ <#if
custRequestItemNoteViewList.custRequestItemSeqId ==
custRequestItemList.custRequestItemSeqId>
+ <#if row?has_content>
+ <#assign row="">
+ <#else>
+ <#assign row="alternate-row">
+ </#if>
+ <#assign partyNameView =
delegator.findOne("PartyNameView",
Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId",
custRequestItemNoteViewList.partyId), false)!/>
+ <tr class="${row}">
+ <td>
+ </td>
+ <td>
+ ${custRequestItemNoteViewList.noteId}
+ </td>
+ <td >
+ ${custRequestItemNoteViewList.noteInfo}
+ </td>
+ <td >
+ ${partyNameView.groupName!}
${partyNameView.firstName!} ${partyNameView.lastName!}
+ </td>
+ <td>
+
${custRequestItemNoteViewList.noteDateTime.toString().substring(0,10)}
+ </td>
+ </tr>
+ </#if>
+ </#list>
+ </table>
+ </#if>
+ <a
href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>"
class="linktext">${uiLabelMap.OrderAddNote}</a>
+ </td>
+ </tr>
+ </#if>
+ </#list>
+ </table>
+</div>
\ No newline at end of file
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/request/overViewRequestItems.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/request/overViewRequestItems.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/request/overViewRequestItems.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/specialpurpose/projectmgr/template/survey/ListSurveys.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/template/survey/ListSurveys.ftl?rev=1736876&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/template/survey/ListSurveys.ftl
(added)
+++ ofbiz/trunk/specialpurpose/projectmgr/template/survey/ListSurveys.ftl Mon
Mar 28 12:08:13 2016
@@ -0,0 +1,73 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul><li class="h3">${uiLabelMap.CommonList}
${uiLabelMap.EcommerceSurveys}</li></ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <#if workEffortSurveyAppls?has_content>
+ <table class="basic-table hover-bar" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.ContentSurveySurveyId}</td>
+ <td>${uiLabelMap.CommonFromDateTime}</td>
+ <td>${uiLabelMap.CommonThruDateTime}</td>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <#list workEffortSurveyAppls as workEffortSurveyAppl>
+ <#if workEffortSurveyAppl?has_content>
+ <#assign productStoreSurveyAppls =
workEffortSurveyAppl.getRelated("ProductStoreSurveyAppl", null, null, false)>
+ <#list productStoreSurveyAppls as productStoreSurveyAppl>
+ <#if productStoreSurveyAppl?has_content>
+ <#assign survey =
productStoreSurveyAppl.getRelatedOne("Survey", false)>
+ <tr>
+ <form method="post"
action="<@ofbizUrl>updateWorkEffortSurveyAppl</@ofbizUrl>"
name="editWorkEffortSurveyAppl_${workEffortSurveyAppl_index}">
+ <td><a
href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId!}"
class="buttontext">${workEffortSurveyAppl.surveyId!} -
${survey.surveyName!}</a></td>
+ <td>${workEffortSurveyAppl.fromDate!}</td>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="thruDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(workEffortSurveyAppl.thruDate)!}" size="25"
maxlength="30" id="thruDate1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ </td>
+ <td><a
href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId!}&workEffortId=${workEffortSurveyAppl.workEffortId!}</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td>
+ <#if !isReadable??>
+ <input type="hidden" name="surveyId"
value="${workEffortSurveyAppl.surveyId!}"/>
+ <input type="hidden" name="workEffortId"
value="${workEffortSurveyAppl.workEffortId!}"/>
+ <input type="hidden" name="fromDate"
value="${workEffortSurveyAppl.fromDate!}"/>
+ <td><input type="submit" name="submitBtn"
value='${uiLabelMap.CommonUpdate}' /> </td>
+ </form>
+ <td>
+ <form
id="deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}" method="post"
action="<@ofbizUrl>deleteWorkEffortSurveyAppl</@ofbizUrl>">
+ <input type="hidden" name="surveyId"
value="${workEffortSurveyAppl.surveyId!}" />
+ <input type="hidden" name="workEffortId"
value="${workEffortSurveyAppl.workEffortId!}" />
+ <input type="hidden" name="fromDate"
value="${workEffortSurveyAppl.fromDate!}" />
+ <a
href="javascript:document.getElementById('deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}').submit()"
class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
+ </td>
+ </#if>
+ </tr>
+ </#if>
+ </#list>
+ </#if>
+ </#list>
+ </table>
+ </#if>
+ </div>
+</div>
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/survey/ListSurveys.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/survey/ListSurveys.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/survey/ListSurveys.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
ofbiz/trunk/specialpurpose/projectmgr/template/survey/TestWorkEffortSurvey.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/template/survey/TestWorkEffortSurvey.ftl?rev=1736876&view=auto
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/template/survey/TestWorkEffortSurvey.ftl
(added)
+++
ofbiz/trunk/specialpurpose/projectmgr/template/survey/TestWorkEffortSurvey.ftl
Mon Mar 28 12:08:13 2016
@@ -0,0 +1,36 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${survey.surveyName}</div>
+ </div>
+ <div class="screenlet-body">
+ <#-- Render the survey -->
+ <#if surveyWrapper?has_content>
+ <form method="post" enctype="multipart/form-data"
action="<@ofbizUrl>testWorkEffortSurveyResponse</@ofbizUrl>" style="margin: 0;">
+ <input type="hidden" name="productStoreSurveyId"
value="${productStoreSurveyId}"/>
+ <input type="hidden" name="workEffortId"
value="${workEffortId}"/>
+ ${surveyWrapper.render()}
+ </form>
+ <#else>
+ <h1>${uiLabelMap.OrderNothingToDoHere}</h1>
+ </#if>
+ </div>
+</div>
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/survey/TestWorkEffortSurvey.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/survey/TestWorkEffortSurvey.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/specialpurpose/projectmgr/template/survey/TestWorkEffortSurvey.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1736876&r1=1736875&r2=1736876&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Mar 28
12:08:13 2016
@@ -244,7 +244,7 @@ under the License.
<widgets>
<label
style="h1">${uiLabelMap.PageTitleEditTask}</label>
<platform-specific>
- <html><html-template
location="component://projectmgr/webapp/projectmgr/project/edittask.ftl"/></html>
+ <html><html-template
location="component://projectmgr/template/project/edittask.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>
@@ -257,7 +257,7 @@ under the License.
<!-- Edit an existing Task -->
<widgets>
<platform-specific>
- <html><html-template
location="component://projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl"/></html>
+ <html><html-template
location="component://projectmgr/template/project/edittaskandassoc.ftl"/></html>
</platform-specific>
</widgets>
<!-- Edit an existing SubTask -->
@@ -271,7 +271,7 @@ under the License.
<label
style="h1">${uiLabelMap.ProjectMgrSubTaskName}: ${task.workEffortName}</label>
<container><label
style="h1">${uiLabelMap.PageTitleEditSubTask}</label></container>
<platform-specific>
- <html><html-template
location="component://projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl"/></html>
+ <html><html-template
location="component://projectmgr/template/project/edittaskandassoc.ftl"/></html>
</platform-specific>
</fail-widgets>
</section>
@@ -423,7 +423,7 @@ under the License.
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleProjectGanttChart}">
<platform-specific>
- <html><html-template
location="component://projectmgr/webapp/projectmgr/project/ganttChart.ftl"/></html>
+ <html><html-template
location="component://projectmgr/template/project/ganttChart.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -569,7 +569,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <html><html-template
location="component://projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl"/></html>
+ <html><html-template
location="component://projectmgr/template/project/summary/noteinfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -1032,7 +1032,7 @@ under the License.
<container style="clear"/>
<screenlet
title="${uiLabelMap.PageTitleProjectGanttChart}">
<platform-specific>
- <html><html-template
location="component://projectmgr/webapp/projectmgr/project/ganttChart.ftl"/></html>
+ <html><html-template
location="component://projectmgr/template/project/ganttChart.ftl"/></html>
</platform-specific>
</screenlet>
</widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml?rev=1736876&r1=1736875&r2=1736876&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml Mon Mar 28
12:08:13 2016
@@ -31,7 +31,7 @@ under the License.
<widgets>
<decorator-screen name="CommonTaskDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://projectmgr/webapp/projectmgr/survey/TestWorkEffortSurvey.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template
location="component://projectmgr/template/survey/TestWorkEffortSurvey.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=1736876&r1=1736875&r2=1736876&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Mon Mar 28
12:08:13 2016
@@ -403,7 +403,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <html><html-template
location="component://projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl"/></html>
+ <html><html-template
location="component://projectmgr/template/project/summary/noteinfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -580,7 +580,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template
location="component://projectmgr/webapp/projectmgr/survey/ListSurveys.ftl"/></html>
+ <html><html-template
location="component://projectmgr/template/survey/ListSurveys.ftl"/></html>
</platform-specific>
</widgets>
</section>
