svn commit: r1305581 [35/36] - in /ofbiz/branches/20111205EmailH
Locked
svn commit: r1305581 [35/36] - in /ofbiz/branches/20111205EmailH
 
|
Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml Mon Mar 26 20:56:02 2012 @@ -1,105 +1,123 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app> - <display-name>Open For Business - scrum Component</display-name> - <description>scrum Component of the Open For Business Project - </description> - - <context-param> - <param-name>localDispatcherName</param-name> - <param-value>scrum</param-value> - <description>A unique name used to identify/recognize the local - dispatcher for the Service Engine</description> - </context-param> - <context-param> - <param-name>entityDelegatorName</param-name> - <param-value>default</param-value> - <description>The Name of the Entity Delegator to use, defined in - entityengine.xml</description> - </context-param> - <context-param> - <param-name>mainDecoratorLocation</param-name> - <param-value>component://scrum/widget/demotest/DemotestScreen.xml - </param-value> - <description>The location of the main-decorator screen to use for this - webapp; referred to as a context variable in screen def XML files. - </description> - </context-param> - <context-param> - <param-name>widgetVerbose</param-name> - <param-value>false</param-value> - <description>Enable widget boundary comments. See - org.ofbiz.widget.ModelWidget.widgetBoundaryCommentsEnabled(). - </description> - </context-param> - <context-param> - <param-name>compressHTML</param-name> - <param-value>false</param-value> - <description>Remove unnecessary whitespace from HTML output. - </description> - </context-param> - - <filter> - <filter-name>ContextFilter</filter-name> - <display-name>ContextFilter</display-name> - <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class> - <init-param> - <param-name>disableContextSecurity</param-name> - <param-value>N</param-value> - </init-param> - <init-param> - <param-name>allowedPaths</param-name> - <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css - </param-value> - </init-param> - <init-param> - <param-name>errorCode</param-name> - <param-value>403</param-value> - </init-param> - <init-param> - <param-name>redirectPath</param-name> - <param-value>/control/main</param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>ContextFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <listener> - <listener-class>org.ofbiz.webapp.control.ControlEventListener - </listener-class> - </listener> - <listener> - <listener-class>org.ofbiz.webapp.control.LoginEventListener - </listener-class> - </listener> - <!-- - NOTE: not all app servers support mounting implementations of the - HttpSessionActivationListener interface - --> - <!-- - <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> - --> - - <servlet> - <servlet-name>ControlServlet</servlet-name> - <display-name>ControlServlet</display-name> - <description>Main Control Servlet</description> - <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>ControlServlet</servlet-name> - <url-pattern>/control/*</url-pattern> - </servlet-mapping> - - <session-config> - <session-timeout>60</session-timeout><!-- in minutes --> - </session-config> - - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - <welcome-file>index.html</welcome-file> - <welcome-file>index.htm</welcome-file> - </welcome-file-list> -</web-app> \ No newline at end of file +<!-- +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. +--> + <web-app> + <display-name>Open For Business - scrum Component</display-name> + <description>scrum Component of the Open For Business Project + </description> + + <context-param> + <param-name>localDispatcherName</param-name> + <param-value>scrum</param-value> + <description>A unique name used to identify/recognize the local + dispatcher for the Service Engine</description> + </context-param> + <context-param> + <param-name>entityDelegatorName</param-name> + <param-value>default</param-value> + <description>The Name of the Entity Delegator to use, defined in + entityengine.xml</description> + </context-param> + <context-param> + <param-name>mainDecoratorLocation</param-name> + <param-value>component://scrum/widget/demotest/DemotestScreen.xml + </param-value> + <description>The location of the main-decorator screen to use for this + webapp; referred to as a context variable in screen def XML files. + </description> + </context-param> + <context-param> + <param-name>widgetVerbose</param-name> + <param-value>false</param-value> + <description>Enable widget boundary comments. See + org.ofbiz.widget.ModelWidget.widgetBoundaryCommentsEnabled(). + </description> + </context-param> + <context-param> + <param-name>compressHTML</param-name> + <param-value>false</param-value> + <description>Remove unnecessary whitespace from HTML output. + </description> + </context-param> + + <filter> + <filter-name>ContextFilter</filter-name> + <display-name>ContextFilter</display-name> + <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class> + <init-param> + <param-name>disableContextSecurity</param-name> + <param-value>N</param-value> + </init-param> + <init-param> + <param-name>allowedPaths</param-name> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css + </param-value> + </init-param> + <init-param> + <param-name>errorCode</param-name> + <param-value>403</param-value> + </init-param> + <init-param> + <param-name>redirectPath</param-name> + <param-value>/control/main</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>ContextFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener> + <listener-class>org.ofbiz.webapp.control.ControlEventListener + </listener-class> + </listener> + <listener> + <listener-class>org.ofbiz.webapp.control.LoginEventListener + </listener-class> + </listener> + <!-- + NOTE: not all app servers support mounting implementations of the + HttpSessionActivationListener interface + --> + <!-- + <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> + --> + + <servlet> + <servlet-name>ControlServlet</servlet-name> + <display-name>ControlServlet</display-name> + <description>Main Control Servlet</description> + <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>ControlServlet</servlet-name> + <url-pattern>/control/*</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>60</session-timeout><!-- in minutes --> + </session-config> + + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + </welcome-file-list> + </web-app> \ No newline at end of file Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/error/error.jsp URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/error/error.jsp?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/error/error.jsp (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/error/error.jsp Mon Mar 26 20:56:02 2012 @@ -1,3 +1,21 @@ +<%-- +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. +--%> <%@ page import="org.ofbiz.base.util.*" %> <html> <head> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/index.jsp URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/index.jsp?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/index.jsp (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/demotest/index.jsp Mon Mar 26 20:56:02 2012 @@ -1 +1,19 @@ +<%-- +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. +--%> <%response.sendRedirect("control/main");%> \ No newline at end of file Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <!-- The controller elements that are common to all OFBiz components Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml Mon Mar 26 20:56:02 2012 @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.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. +--> <web-app> <display-name>Open For Business - scrum Component</display-name> <description>scrum Component of the Open For Business Project</description> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/error/error.jsp URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/error/error.jsp?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/error/error.jsp (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/error/error.jsp Mon Mar 26 20:56:02 2012 @@ -1,3 +1,21 @@ +<%-- +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. +--%> <%@ page import="org.ofbiz.base.util.*" %> <html> <head> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/includes/pieChart.ftl Mon Mar 26 20:56:02 2012 @@ -1,4 +1,21 @@ +<#-- +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 id="params_birtReport" style='display:none'> <INPUT type="HIDDEN" name="productId" value="${product.productId}"/> </div> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/index.jsp URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/index.jsp?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/index.jsp (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/index.jsp Mon Mar 26 20:56:02 2012 @@ -1 +1,19 @@ +<%-- +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. +--%> <%response.sendRedirect("control/main");%> \ No newline at end of file Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property> <property name="units">in</property> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property> <property name="units">in</property> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property> <property name="units">in</property> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property> <property name="units">in</property> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property> <property name="units">in</property> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property> <property name="units">in</property> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property> <property name="units">in</property> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property> <property name="units">in</property> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/CommonScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/CommonScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/CommonScreens.xml Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/CommunicationEventForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/CommunicationEventForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/CommunicationEventForms.xml Mon Mar 26 20:56:02 2012 @@ -1,5 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<!-- +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. +--> +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="EditEmail" type="single" target="${target}" default-map-name="communicationEvent" id="updateEmailForProductBacklog"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/EmailTemplates.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/EmailTemplates.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/EmailTemplates.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/EmailTemplates.xml Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/OpenTestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/OpenTestForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/OpenTestForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/OpenTestForms.xml Mon Mar 26 20:56:02 2012 @@ -32,11 +32,11 @@ </entity-and> <set field="partyId" from-field="partyAssignViewList[0].partyId"/> </row-actions> - <field name="workEffortId" title="${uiLabelMap.ScrumTaskName}"> - <hyperlink target="editDefaultTask" description="${workEffortName}"> - <parameter param-name="workEffortId"/> - <parameter param-name="productId"/> - </hyperlink></field> + <field name="workEffortId" title="${uiLabelMap.ScrumTaskName}"> + <hyperlink target="editDefaultTask" description="${workEffortName}"> + <parameter param-name="workEffortId"/> + <parameter param-name="productId"/> + </hyperlink></field> <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType" description="${description}"/></field> <field name="createdDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display/></field> <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}"> @@ -63,8 +63,8 @@ </actions> <alt-target use-when="workEffortId!=null" target="updateDefaultTask"/> <field name="workEffortId"><hidden/></field> - <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}"><text default-value="${workEffortName}"/></field> - <field name="productId" title="${uiLabelMap.ScrumProduct}"><display-entity entity-name="Product" description="${internalName}"></display-entity></field> + <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}"><text default-value="${workEffortName}"/></field> + <field name="productId" title="${uiLabelMap.ScrumProduct}"><display-entity entity-name="Product" description="${internalName}"></display-entity></field> <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"> <drop-down > <entity-options entity-name="WorkEffortType" description="${description}"> @@ -74,8 +74,8 @@ </field> <field name="workEffortPurposeTypeId"><hidden value="SCRUM_DEFAULT_TASK"/></field> <field name="plannedHours" title="${uiLabelMap.ScrumInitialPlannedHours}"><text size="3"/></field> - <field name="currentStatusId"><hidden value="STS_CREATED"/></field> - <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field> + <field name="currentStatusId"><hidden value="STS_CREATED"/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field> <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}"> <drop-down allow-empty="true"> <entity-options description="${lastName} ${firstName} ${middleName}" entity-name="ScrumMemberUserLoginAndSecurityGroup" key-field-name="partyId" > @@ -85,23 +85,23 @@ </entity-options> </drop-down> </field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" use-when="workEffortId==null"><submit/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" use-when="workEffortId==null"><submit/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="workEffortId!=null"><submit/></field> </form> <form name="listCompletedTask" type="list" target="" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-and entity-name="WorkEffortAndPartyAssign"> - <field-map field-name="currentStatusId" value="STS_COMPLETED"/> - </entity-and> + <entity-and entity-name="WorkEffortAndPartyAssign"> + <field-map field-name="currentStatusId" value="STS_COMPLETED"/> + </entity-and> </actions> <row-actions> <entity-one entity-name="PartyNameView" value-field="party"/> </row-actions> <field name="workEffortId" title="Task Name"> - <hyperlink target="taskView" description="${workEffortName}"> - <parameter param-name="taskId" from-field="workEffortId"/> - </hyperlink> + <hyperlink target="taskView" description="${workEffortName}"> + <parameter param-name="taskId" from-field="workEffortId"/> + </hyperlink> </field> <field name="description"><display/></field> <field name="partyId"> @@ -140,7 +140,7 @@ <parameter param-name="productId" from-field="parameters.productId"/> </hyperlink> </field> - <field name="custRequestTypeId"><display></display> </field> + <field name="custRequestTypeId"><display></display> </field> <field name="custRequestTypeId" title="${uiLabelMap.ScrumUnplanBacklog}"> <display description="${custRequestType}"/> </field> @@ -150,29 +150,29 @@ </field> </form> <form name="editTask" type="upload" target="createTestTask"> - <actions> - <entity-and entity-name="WorkEffortPartyAssignView" list="membersPartyId"> - <field-map field-name="workEffortId" from-field="sprintId"/> - </entity-and> - <entity-one entity-name="WorkEffort" value-field="sprint"> - <field-map field-name="workEffortId" from-field="sprintId"/> - </entity-one> - <set field="projectId" from-field="sprint.workEffortParentId"/> - <set field="partyId" from-field="workEffortPartyAssignment.partyId"/> - <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="WorkEffort" value-field="project"> - <field-map field-name="workEffortId" from-field="projectId"/> - </entity-one> - <entity-and entity-name="CustRequestItem" list="CustRequest"> - <field-map field-name="custRequestId" from-field="custRequestId"/> - </entity-and> + <actions> + <entity-and entity-name="WorkEffortPartyAssignView" list="membersPartyId"> + <field-map field-name="workEffortId" from-field="sprintId"/> + </entity-and> + <entity-one entity-name="WorkEffort" value-field="sprint"> + <field-map field-name="workEffortId" from-field="sprintId"/> + </entity-one> + <set field="projectId" from-field="sprint.workEffortParentId"/> + <set field="partyId" from-field="workEffortPartyAssignment.partyId"/> + <set field="custRequestId" from-field="parameters.custRequestId"/> + <entity-one entity-name="WorkEffort" value-field="project"> + <field-map field-name="workEffortId" from-field="projectId"/> + </entity-one> + <entity-and entity-name="CustRequestItem" list="CustRequest"> + <field-map field-name="custRequestId" from-field="custRequestId"/> + </entity-and> <entity-condition entity-name="ScrumMemberUserLoginAndSecurityGroup" list="ScrumMember"> <condition-list combine="and"> <condition-expr field-name="partyStatusId" operator="not-equals" value="PARTY_DISABLED"/> <condition-expr field-name="groupId" operator="equals" value="SCRUM_TEAM"/> </condition-list> </entity-condition> - </actions> + </actions> <field name="sprintStatusId"><hidden value="${parameters.sprintStatusId}"/></field> <field name="projectName" title="${uiLabelMap.ScrumProjectName}" use-when="projectId!=null"> <display description="${project.workEffortName} [${projectId}]"/> @@ -181,25 +181,25 @@ <field name="sprintName" title="${uiLabelMap.ScrumSprintName}" use-when="sprintId!=null"> <display description="${sprint.workEffortName} [${sprintId}]"/> </field> - <field name="custRequestId" title="${uiLabelMap.ScrumBacklogItem}"> - <display-entity entity-name="CustRequest" description="${description}"> - <sub-hyperlink target="EditProdBacklog"></sub-hyperlink> - </display-entity> - </field> - <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}" required-field="true" tooltip="${uiLabelMap.ScrumToolTip100CharsMaximun}"><text/></field> - <field name="workEffortTypeId"><hidden value="SCRUM_TASK_ERROR"/></field> - <field name="currentStatusId"><hidden value="STS_CREATED"/></field> - <field name="roleTypeId"><hidden value="SCRUM_TEAM"/></field> - <field name="statusId"><hidden value="SCAS_ASSIGNED"/></field> - <field name="priority"><hidden value="1"/></field> - <field name="description" title="${uiLabelMap.CommonDescription}"><textarea rows="6"/></field> - <field name="uploadedFile"><file/></field> - <field name="contentTypeId"><hidden value="DOCUMENT"/></field> + <field name="custRequestId" title="${uiLabelMap.ScrumBacklogItem}"> + <display-entity entity-name="CustRequest" description="${description}"> + <sub-hyperlink target="EditProdBacklog"></sub-hyperlink> + </display-entity> + </field> + <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}" required-field="true" tooltip="${uiLabelMap.ScrumToolTip100CharsMaximun}"><text/></field> + <field name="workEffortTypeId"><hidden value="SCRUM_TASK_ERROR"/></field> + <field name="currentStatusId"><hidden value="STS_CREATED"/></field> + <field name="roleTypeId"><hidden value="SCRUM_TEAM"/></field> + <field name="statusId"><hidden value="SCAS_ASSIGNED"/></field> + <field name="priority"><hidden value="1"/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><textarea rows="6"/></field> + <field name="uploadedFile"><file/></field> + <field name="contentTypeId"><hidden value="DOCUMENT"/></field> <field name="resourceStatusId"><hidden value="CTNT_PUBLISHED"/></field> <field name="workEffortContentTypeId"><hidden value="CREATED_MEDIA"/></field> <field name="mimeTypeId"><hidden value="application/octet-stream"/></field> <field name="sprintId"><hidden value="${parameters.sprintId}"/></field> - <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" use-when="sprintId!=null"> + <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" use-when="sprintId!=null"> <drop-down > <list-options key-name="partyId" list-name="membersPartyId" description="${lastName} ${firstName} ${middleName}"/> </drop-down> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/OpenTestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/OpenTestScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/OpenTestScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/OpenTestScreens.xml Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/TaskForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/TaskForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/TaskForms.xml Mon Mar 26 20:56:02 2012 @@ -91,7 +91,7 @@ </sub-hyperlink> </display-entity> </field> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}"><text size="3" default-value="${resultMap.planHours}"/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}"><text size="3" default-value="${resultMap.planHours}"/></field> <field name="actualHours" use-when="task!=null" title="${uiLabelMap.ScrumActualHours}"><text default-value="${results.actualHours}" size="3" disabled="true"/></field> <!--<field name="actualHours" use-when="task==null" title="Actual Hours"><text size="3"/></field>--> <field name="currentStatusId" use-when="task==null"><hidden value="STS_CREATED"/></field> @@ -735,7 +735,7 @@ <display description="${party[0].lastName} ${party[0].firstName}"/> </field> <field name="taskCreatedDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field> - <field name="taskEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlanedHours}" parameter-name="planHours"><display></display></field> + <field name="taskEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlannedHours}" parameter-name="planHours"><display></display></field> <field name="taskActualMilliSeconds" title="${uiLabelMap.ScrumActualHours}" parameter-name="actualHours"><display description="${result.actualHours}"/></field> <field name="taskEstimatedStartDate" title="${uiLabelMap.CommonStartDate}" parameter-name="estimatedStartDate"><display type="date"/></field> <field name="editButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/TimeSheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/TimeSheetForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/TimeSheetForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/TimeSheetForms.xml Mon Mar 26 20:56:02 2012 @@ -23,24 +23,24 @@ <form name="FindTimeSheet" target="FindTimeSheet" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <actions> - <entity-condition entity-name="PartyRoleDetailAndPartyDetail" distinct="true" list="parties"> - <condition-list combine="or"> - <condition-expr field-name="roleTypeId" operator="equals" value="SCRUM_TEAM"/> - <condition-expr field-name="roleTypeId" operator="equals" value="SCRUM_MASTER"/> - </condition-list> - <select-field field-name="firstName"/> - <select-field field-name="middleName"/> - <select-field field-name="lastName"/> - <select-field field-name="partyId"/> - <order-by field-name="lastName"/> - </entity-condition> + <entity-condition entity-name="PartyRoleDetailAndPartyDetail" distinct="true" list="parties"> + <condition-list combine="or"> + <condition-expr field-name="roleTypeId" operator="equals" value="SCRUM_TEAM"/> + <condition-expr field-name="roleTypeId" operator="equals" value="SCRUM_MASTER"/> + </condition-list> + <select-field field-name="firstName"/> + <select-field field-name="middleName"/> + <select-field field-name="lastName"/> + <select-field field-name="partyId"/> + <order-by field-name="lastName"/> + </entity-condition> </actions> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="timesheetId"><text-find ignore-case="true"/></field> <field name="comments"><text-find ignore-case="true"/></field> <field name="partyId" title="${uiLabelMap.PartyParty}"> <drop-down allow-empty="true"> - <list-options key-name="partyId" list-name="parties" description="${lastName} ${firstName} ${middleName}"/> + <list-options key-name="partyId" list-name="parties" description="${lastName} ${firstName} ${middleName}"/> </drop-down> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/demotest/DemotestScreen.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/demotest/DemotestScreen.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/demotest/DemotestScreen.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/demotest/DemotestScreen.xml Mon Mar 26 20:56:02 2012 @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumForms.xml Mon Mar 26 20:56:02 2012 @@ -1,5 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<!-- +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. +--> +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="sprintList" type="list" use-row-submit="true" list-name="listIt" target="DeleteSprint" paginate-target="SprintList" separate-columns="true" @@ -166,7 +184,7 @@ <field name="dummy4" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> <field name="dummy5" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> <field name="taskActualHours" title="${uiLabelMap.ScrumActualHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display/></field> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display></display> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display></display> </field> <field name="deleteButton" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1&&!"CRQ_COMPLETED".equals("${custRequest.statusId}")" widget-style="buttontext"> <hyperlink target="DeleteSprintBackLogs" description="Delete" confirmation-message="Are you sure to delete this sprint backlog ?" link-type="hidden-form"> @@ -211,7 +229,7 @@ </form> <form name="sprintBacklogListItemsHideDelete" extends="sprintBacklogListItems"> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display/></field> <field name="deleteButton" position="1" use-when="showPosition1"><hidden/></field> <field name="deleteTaskButton" position="2" use-when="!"STS_COMPLETED".equals(taskCurrentStatusId)&&!"SCRUM_SPRINT".equals(taskTypeId)"><hidden/></field> <sort-order> @@ -304,7 +322,7 @@ <field name="actualStartDate" title="${uiLabelMap.CommonStartDate}"><display type="date"/></field> <field name="actualCompletionDate" title="${uiLabelMap.CommonEndDate}"><display type="date"/></field> <field name="estimatedHrs" title="${uiLabelMap.ScrumSprintLengthWeeks}"><display description="${estimatedHrs} week(s)"/></field> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}"><display description="${planHours} hours"/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}"><display description="${planHours} hours"/></field> <field name="totalBacklogs" title="${uiLabelMap.PageTitleTotalBacklog}"><display description="reviewed:${reviewedBacklog} completed:${completedBacklog} total:${totalbacklog}"></display></field> <field name="totalTasks" title="${uiLabelMap.PageTitleTotalTask}"><display description="created:${createdTask} completed:${completedTask} total:${totalTask}"></display></field> <field name="sprintId"><hidden value="${parameters.sprintId}"/></field> @@ -690,11 +708,11 @@ <field name="parentCustRequestId" title="${uiLabelMap.ScrumBacklogItemCategory}" use-when="custRequest!=null&&isTeamMember==true"> <display-entity entity-name="CustRequest" description="${custRequestName}" key-field-name="custRequestId"/> </field> - <field name="planedTime" parameter-name="custEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlanedTime}" tooltip="${uiLabelMap.ScrumHrs}" use-when="custRequest==null"> + <field name="plannedTime" parameter-name="custEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlannedTime}" tooltip="${uiLabelMap.ScrumHrs}" use-when="custRequest==null"> <text size="3"/> </field> - <field name="planedTime" parameter-name="custEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlanedTime}" tooltip="${uiLabelMap.ScrumHrs}" use-when="custRequest!=null&&isTeamMember==false"><text size="3" default-value="${custRequest.custEstimatedMilliSeconds/3600000}"/></field> - <field name="planedTime" parameter-name="custEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlanedTime}" tooltip="${uiLabelMap.ScrumHrs}" use-when="custRequest!=null&&isTeamMember==true"><display description="${custRequest.custEstimatedMilliSeconds/3600000}"/></field> + <field name="plannedTime" parameter-name="custEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlannedTime}" tooltip="${uiLabelMap.ScrumHrs}" use-when="custRequest!=null&&isTeamMember==false"><text size="3" default-value="${custRequest.custEstimatedMilliSeconds/3600000}"/></field> + <field name="plannedTime" parameter-name="custEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlannedTime}" tooltip="${uiLabelMap.ScrumHrs}" use-when="custRequest!=null&&isTeamMember==true"><display description="${custRequest.custEstimatedMilliSeconds/3600000}"/></field> <field name="custSequenceNum" title="${uiLabelMap.CommonSequenceNum}" use-when="custRequest==null"> <text size="3"></text> </field> @@ -763,7 +781,7 @@ <sort-field name="productOwerId"/> <sort-field name="parentCustRequestId"/> <sort-field name="Sprint"/> - <sort-field name="planedTime"/> + <sort-field name="plannedTime"/> <sort-field name="custSequenceNum"/> <sort-field name="billed"/> <sort-field name="unplannedFlag"/> @@ -1007,7 +1025,7 @@ <parameter param-name="productId"/> </hyperlink> </field> - <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlanedHours}"><text size="3"/></field> + <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlannedHours}"><text size="3"/></field> <field name="parentCustRequestId" position="2" title="${uiLabelMap.ScrumCategory}"> <drop-down allow-empty="true"> <entity-options description="${custRequestName}" entity-name="CustRequestAndCustRequestItem" key-field-name="custRequestId"> @@ -1020,7 +1038,7 @@ <field name="submitButton" widget-style="buttontext"><submit button-type="text-link"/></field> </form> <form name="ListProdBacklogForOwner" extends="ListProdBacklog"> - <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlanedHours}"><display/></field> + <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlannedHours}"><display/></field> <field name="submitButton" widget-style="buttontext"><submit button-type="text-link"/></field> </form> <form name="ListProdBacklogBySeq" type="multi" use-row-submit="false" list-name="custRequestAndCustRequestItems" target="updateProductBacklogItemRow?productId=${productId}&sequence=${sequence}&backStatusId=CRQ_ACCEPTED" @@ -1131,7 +1149,7 @@ </display> </field> <field name="newSequenceNum" title="${uiLabelMap.ScrumNewSequence}"><text size="3"/></field> - <field name="estimatedHours" position="1" title="${uiLabelMap.ScrumPlanedHours}"><text size="3"/></field> + <field name="estimatedHours" position="1" title="${uiLabelMap.ScrumPlannedHours}"><text size="3"/></field> <field name="parentCustRequestId" position="1" title="${uiLabelMap.ScrumCategory}"> <drop-down allow-empty="true"> <entity-options description="${custRequestName}" entity-name="CustRequestAndCustRequestItem" key-field-name="custRequestId"> @@ -1240,7 +1258,7 @@ <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> <field name="estimatedHrs" title="${uiLabelMap.ScrumSprintLengthWeeks}" position="2" use-when=""${sprintId}"!="""><display/></field> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}" position="2" use-when=""${sprintId}"!="""><display/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when=""${sprintId}"!="""><display/></field> <field name="actualHours" title="${uiLabelMap.ScrumActualHours}" position="2" use-when=""${sprintId}"!="""><display/></field> <field name="actualHoursNotBillYet" title="${uiLabelMap.ScrumActualHoursNotBill}" position="2" use-when=""${sprintId}"!="""><display/></field> <field name="sprintActualStartDate" title="${uiLabelMap.CommonStartDate}" position="2" use-when=""${sprintId}"!="""><display type="date"></display></field> @@ -1312,7 +1330,7 @@ <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> <field name="estimatedHrs" title="${uiLabelMap.ScrumSprintLengthWeeks}" position="2" use-when=""${sprintId}"!="""><display/></field> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}" position="2" use-when=""${sprintId}"!="""><display/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when=""${sprintId}"!="""><display/></field> <field name="actualHours" title="${uiLabelMap.ScrumActualHours}" position="2" use-when=""${sprintId}"!="""><display/></field> <field name="actualHoursNotBillYet" title="${uiLabelMap.ScrumActualHoursNotBill}" position="2" use-when=""${sprintId}"!="""><display/></field> <field name="sprintActualStartDate" title="${uiLabelMap.CommonStartDate}" position="2" use-when=""${sprintId}"!="""><display type="date"></display></field> @@ -1461,7 +1479,7 @@ <display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${custRequestName}"></display-entity> </field> <field name="custSequenceNum"><display/></field> - <field name="estimatedHours" title="${uiLabelMap.ScrumPlanedHours}"><text default-value="${groovy:return custRequest.custEstimatedMilliSeconds/3600000}"/></field> + <field name="estimatedHours" title="${uiLabelMap.ScrumPlannedHours}"><text default-value="${groovy:return custRequest.custEstimatedMilliSeconds/3600000}"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit/></field> </form> <!-- Product --> @@ -1974,7 +1992,7 @@ <parameter param-name="sprintId" from-field="workEffortlist[0].workEffortId"/> </hyperlink> </field> - <field name="estimated" title="${uiLabelMap.ScrumPlanedTime}" tooltip="${uiLabelMap.ScrumHrs}"><display description="${custRequest.custEstimatedMilliSeconds/3600000}"/></field> + <field name="estimated" title="${uiLabelMap.ScrumPlannedTime}" tooltip="${uiLabelMap.ScrumHrs}"><display description="${custRequest.custEstimatedMilliSeconds/3600000}"/></field> <field name="actualHours"><display description="${actualHours}"/></field> <field name="custSequenceNum"><display description="${custRequest.custSequenceNum}"/></field> <field name="billed"><display description="${custRequest.billed}"/></field> @@ -2013,7 +2031,7 @@ <field name="parentCustRequestId" position="2" title="${uiLabelMap.ScrumCategory}"> <display-entity entity-name="CustRequest" description="${custRequestName}" key-field-name="custRequestId"/> </field> - <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlanedHours}"><display description="${custEstimatedMilliSeconds/1000/60/60}"/></field> + <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlannedHours}"><display description="${custEstimatedMilliSeconds/1000/60/60}"/></field> <field name="billed" position="2" ><display></display></field> <field name="custRequestDate" position="2" title="${uiLabelMap.ScrumRequestDate}"><display/></field> <field name="fromPartyId" position="2" title="${uiLabelMap.ScrumRequesterName}"> @@ -2050,7 +2068,7 @@ <field name="parentCustRequestId" position="2" title="${uiLabelMap.ScrumCategory}"> <display-entity entity-name="CustRequest" description="${custRequestName}" key-field-name="custRequestId"/> </field> - <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlanedHours}"><display description="${custEstimatedMilliSeconds/1000/60/60}"/></field> + <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlannedHours}"><display description="${custEstimatedMilliSeconds/1000/60/60}"/></field> <field name="billed" position="2" ><display></display></field> <field name="custRequestDate" position="2" title="${uiLabelMap.ScrumRequestDate}"><display type="date"/></field> </form> @@ -2073,7 +2091,7 @@ <field name="submitButton" title="${uiLabelMap.CommonDelete}"><hidden/></field> </form> <form name="ViewSprintBacklogListItemsNoAction" extends="sprintBacklogListItems"> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display/></field> <field name="deleteButton" position="1" use-when="showPosition1"><hidden/></field> <field name="deleteTaskButton" position="2" use-when="!"STS_COMPLETED".equals(taskCurrentStatusId)&&!"SCRUM_SPRINT".equals(taskTypeId)"><hidden/></field> <field name="setCompleteButton" position="2" use-when="!"STS_COMPLETED".equals(taskCurrentStatusId)&&!"SCRUM_SPRINT".equals(taskTypeId)"><hidden/></field> @@ -2144,7 +2162,7 @@ </drop-down> </field> <field name="taskCreatedDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field> - <field name="taskEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlanedHours}" parameter-name="planHours"><text size="5"/></field> + <field name="taskEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlannedHours}" parameter-name="planHours"><text size="5"/></field> <field name="taskActualMilliSeconds" title="${uiLabelMap.ScrumActualHours}" parameter-name="actualHours"><display/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button" /></field> <field name="editButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> @@ -2787,7 +2805,7 @@ <display-entity entity-name="Person" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/> </field> <field name="taskCreatedDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field> - <field name="taskEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlanedHours}" parameter-name="planHours"><display/></field> + <field name="taskEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlannedHours}" parameter-name="planHours"><display/></field> <field name="taskActualMilliSeconds" title="${uiLabelMap.ScrumActualHours}" parameter-name="actualHours"><display description="${result.actualHours}"/></field> <field name="taskEstimatedStartDate" title="${uiLabelMap.CommonStartDate}" parameter-name="estimatedStartDate"><display type="date"/></field> </form> @@ -2868,7 +2886,7 @@ <list-options key-name="custRequestId" list-name="categoryList" description="[${productId}] : ${internalName} -- [${custRequestId}] : ${custRequestName}"/> </drop-down> </field> - <field name="custEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlanedTime}" tooltip="${uiLabelMap.ScrumHrs}"><text size="3"></text></field> + <field name="custEstimatedMilliSeconds" title="${uiLabelMap.ScrumPlannedTime}" tooltip="${uiLabelMap.ScrumHrs}"><text size="3"></text></field> <field name="story" title="${uiLabelMap.ScrumStory}" ><textarea rows="4" cols="60"/></field> <field name="custSequenceNum"><hidden value="1"/></field> <field name="noteInfo" title="${uiLabelMap.ScrumHowToTest}" ><textarea rows="4" cols="60"/></field> @@ -2902,7 +2920,7 @@ </entity-options> </drop-down> </field> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}"><text size="3" default-value="${resultMap.planHours}"/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}"><text size="3" default-value="${resultMap.planHours}"/></field> <field name="currentStatusId"><hidden value="STS_CREATED"/></field> <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonMax250Chars}"><textarea/></field> <field name="uploadedFile"><file/></field> @@ -2940,8 +2958,8 @@ <parameter param-name="statusId" from-field="parameters.statusId"/> </hyperlink> </field> - <!--<field name="estimatedHours" title="${uiLabelMap.ScrumPlanedHours}" use-when=""${statusId}"=="CRQ_ACCEPTED""><text size="3"/></field> - <field name="estimatedHours" title="${uiLabelMap.ScrumPlanedHours}" use-when=""${statusId}"=="CRQ_REVIEWED""><display/></field>--> + <!--<field name="estimatedHours" title="${uiLabelMap.ScrumPlannedHours}" use-when=""${statusId}"=="CRQ_ACCEPTED""><text size="3"/></field> + <field name="estimatedHours" title="${uiLabelMap.ScrumPlannedHours}" use-when=""${statusId}"=="CRQ_REVIEWED""><display/></field>--> <field name="parentCustRequestId" title="${uiLabelMap.ScrumCategory}"> <drop-down allow-empty="true"> <entity-options description="${custRequestName}" entity-name="CustRequestAndCustRequestItem" key-field-name="custRequestId"> @@ -3047,7 +3065,7 @@ <field name="dummy4" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> <field name="dummy5" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> <field name="taskActualHours" title="${uiLabelMap.ScrumActualHours}" position="2" use-when="workEffortId!=null"><display/></field> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}" position="2" use-when="workEffortId!=null"> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="workEffortId!=null"> <display/> </field> <field name="deleteButton" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1&&!"CRQ_COMPLETED".equals("${custRequest.statusId}")" widget-style="buttontext"> @@ -3090,7 +3108,7 @@ </form> <form name="unplanBacklogListItemsHideDelete" extends="unplanBacklogListItems"> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}" position="2" use-when="workEffortId!=null"><display/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="workEffortId!=null"><display/></field> <field name="deleteButton" position="1" use-when="showPosition1"><hidden/></field> <field name="deleteTaskButton" position="2" use-when="workEffortId!=null"><hidden/></field> <sort-order> @@ -3110,7 +3128,7 @@ </sort-order> </form> <form name="unplanBacklogListItemsForOwner" extends="unplanBacklogListItems"> - <field name="planHours" title="${uiLabelMap.ScrumPlanedHours}" position="2" use-when="workEffortId!=null"><display/></field> + <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="workEffortId!=null"><display/></field> <field name="deleteButton" position="1" use-when="showPosition1"><hidden/></field> <field name="deleteTaskButton" position="2" use-when="workEffortId!=null"><hidden/></field> <field name="setCompleteButton" position="2" use-when="workEffortId!=null"><hidden/></field> @@ -3156,7 +3174,7 @@ <field name="dummy1" title="${uiLabelMap.ScrumMoveToUnplannedSprint}" use-when=""${statusId}"=="CRQ_REVIEWED"" position="2"><display description=" "/></field> </form> <form name="unplannedBacklogListByCategoriesForOwner" extends="unplannedBacklogListByCategories"> - <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlanedHours}"><display/></field> + <field name="estimatedHours" position="2" title="${uiLabelMap.ScrumPlannedHours}"><display/></field> </form> <form name="NewTaskForUnplanBacklog" target="createTaskForUnplanBacklog?productId=${parameters.productId}" extends="EditSprintTask" extends-resource="component://scrum/widget/TaskForms.xml"> <actions> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumMenus.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumMenus.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumMenus.xml Mon Mar 26 20:56:02 2012 @@ -1,5 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<!-- +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. +--> +<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="ScrumAppBar" title="${uiLabelMap.ScrumApplication}" default-menu-item-name="products" id="app-navigation" type="simple" Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/scrum/widget/scrumScreens.xml Mon Mar 26 20:56:02 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> @@ -681,10 +699,17 @@ <entity-one entity-name="Product" value-field="productMap"> <field-map field-name="productId" from-field="parameters.productId"/> </entity-one> - <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> - <field-map field-name="custRequestId" from-field="custRequestId"/> - <field-map field-name="thruDate" value=""></field-map> - </entity-and> + <entity-condition entity-name="CustRequestAndContent" list="custRequestAndContents"> + <condition-list combine="and"> + <condition-expr field-name="custRequestId" from-field="custRequestId"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/> + <condition-list combine="or"> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="nowTimestamp"/> + <condition-expr field-name="thruDate" from-field="null"/> + </condition-list> + </condition-list> + <order-by field-name="fromDate"/> + </entity-condition> <entity-and entity-name="CustRequestAndCustRequestItem" list="categoryList"> <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="custRequestTypeId" value="RF_PARENT_BACKLOG"/> @@ -1001,10 +1026,17 @@ <set field="contentId" from-field="parameters.contentId"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <set field="productId" from-field="parameters.productId"/> - <entity-and entity-name="CustRequestAndContent" list="custRequestAndContents"> - <field-map field-name="custRequestId" from-field="custRequestId"/> - <field-map field-name="thruDate" value=""></field-map> - </entity-and> + <entity-condition entity-name="CustRequestAndContent" list="custRequestAndContents"> + <condition-list combine="and"> + <condition-expr field-name="custRequestId" from-field="custRequestId"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/> + <condition-list combine="or"> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="nowTimestamp"/> + <condition-expr field-name="thruDate" from-field="null"/> + </condition-list> + </condition-list> + <order-by field-name="fromDate"/> + </entity-condition> </actions> <widgets> <decorator-screen name="CommonScrumProductBacklogItemDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java Mon Mar 26 20:56:02 2012 @@ -226,7 +226,7 @@ public class Activity extends InstanceEn public void remove() throws GenericEntityException { if (!newValue) { delegator.removeValue(activity); - Debug.log("**** REMOVED : " + this, module); + Debug.logInfo("**** REMOVED : " + this, module); } } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java Mon Mar 26 20:56:02 2012 @@ -63,7 +63,7 @@ public class ActivityVariable extends In super(mgr, delegator); this.newValue = true; this.activityVariable = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfActivityVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityVariableId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfActivityVariable))); - Debug.log("******* New activity variable created", module); + Debug.logInfo("******* New activity variable created", module); } public static ActivityVariable getInstance(EntityPersistentMgr mgr, GenericValue activityVariable) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |