svn commit: r1653248 - in /ofbiz/trunk/applications/humanres/data/helpdata: HELP_HR.xml HELP_HR_main.xml

2015-01-20 Thread sharan
Author: sharan
Date: Tue Jan 20 13:59:18 2015
New Revision: 1653248

URL: http://svn.apache.org/r1653248
Log: (empty)

Modified:
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR.xml
ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_main.xml

Modified: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR.xml?rev=1653248r1=1653247r2=1653248view=diff
==
--- ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR.xml (original)
+++ ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR.xml Tue Jan 20 
13:59:18 2015
@@ -22,5 +22,45 @@ under the License.
   xsi:schemaLocation=http://docbook.org/ns/docbook 
../../../content/dtd/docbook.xsd
   xmlns=http://docbook.org/ns/docbook;
   titleHuman Resources Introduction/title
-  paraWIP, to be continued.../para
+
+   titleAbout OFBiz Human Resources/title
+paraThe people who work for your company, it's human capital, are it's
+most important asset. Selecting a software platform that increases the
+value of your companies human capital and delivers benefits, services and
+opportunities to your workforce, is critical to your companies success
+./para
+  
+  paraThat platform must be able to accurately and reliability process
+worker transactions, collect decision support information, and communicate
+between management, workers and outside resources. The OFBiz Human
+Resource application (HR App) can provide a backbone for building that
+platform./para
+
+ paraIn this chapter you are introduced to the organization of this
+document and to the key business objects that are the core to HR
+App./para
+
+paraIn the HR App you can:/para
+
+itemizedlist
+  listitem
+paraCreate positions/para
+  /listitem
+
+  listitem
+paraFulfill positions/para
+  /listitem
+
+  listitem
+paraDefine the responsibilities of a position/para
+  /listitem
+
+  listitem
+paraDefine a tree reporting structure between positions/para
+  /listitem
+
+  listitem
+paraTrack the positions fulfillments over time/para
+  /listitem
+/itemizedlist
 /section

Modified: ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_main.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_main.xml?rev=1653248r1=1653247r2=1653248view=diff
==
--- ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_main.xml (original)
+++ ofbiz/trunk/applications/humanres/data/helpdata/HELP_HR_main.xml Tue Jan 20 
13:59:18 2015
@@ -22,11 +22,51 @@ under the License.
   xsi:schemaLocation=http://docbook.org/ns/docbook 
../../../content/dtd/docbook.xsd
   xmlns=http://docbook.org/ns/docbook;
   titleThe Human Resources Main screen./title
+  
+  
+paraThe Main window is the entry point into the HR App and displays the
+Company tree view for navigating to key HR App items./para
+
   para This screen will show the the organization of your company, the top 
level company is defined in a system setup file: general.properties.
 The system will list devisions and departments in the role 
quot;Internal organizationquot; as defined in the party relationships 
 as a quot;Group memberquot; under it in as many levels as required.
   /para
+  
   para
 related to an quot;Internal Organizationquot; is an employee 
position which can be full filled by an employee in an employment. 
   /para
+   title Nodes In the Company Tree/title
+
+paraThere are three node types in the tree, each identified by a
+different icon. The top of the tree represents your Company, the highest
+level in the HR App organization. The Company and departments under the
+Company can have children departments or positions. Under positions are
+the people who fulfill the position./para
+  
+titleUsage/title
+
+itemizedlist
+  listitem
+paraNavigate the HR Organization to view departments, positions and
+people/para
+  /listitem
+
+  listitem
+paraAdd or remove a department/para
+  /listitem
+
+  listitem
+paraAdd a person/para
+  /listitem
+
+  listitem
+paraQuickly open the profile of any item in the tree/para
+  /listitem
+
+  listitem
+paraIf the item is a position you can add a person to fulfill the
+position/para
+  /listitem
+/itemizedlist
+  
 /section




svn propchange: r1653248 - svn:log

2015-01-20 Thread jleroux
Author: jleroux
Revision: 1653248
Modified property: svn:log

Modified: svn:log at Tue Jan 20 14:05:39 2015
--
--- svn:log (original)
+++ svn:log Tue Jan 20 14:05:39 2015
@@ -0,0 +1 @@
+OFBIZ-6015 updated HR Help Screens



svn commit: r1653296 - in /ofbiz/trunk/framework/widget: dtd/widget-form.xsd src/org/ofbiz/widget/model/ModelFormField.java

2015-01-20 Thread adrianc
Author: adrianc
Date: Tue Jan 20 16:51:56 2015
New Revision: 1653296

URL: http://svn.apache.org/r1653296
Log:
Fixed a lookup bug caused by the recent widget refactoring, reported by lmac on 
the dev mailing list.

Modified:
ofbiz/trunk/framework/widget/dtd/widget-form.xsd
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java

Modified: ofbiz/trunk/framework/widget/dtd/widget-form.xsd
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=1653296r1=1653295r2=1653296view=diff
==
--- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Tue Jan 20 16:51:56 2015
@@ -1018,6 +1018,19 @@ under the License.
 xs:documentationDeprecated - use the image 
element./xs:documentation
 /xs:annotation
 /xs:attribute
+xs:attribute name=target-type default=intra-app
+xs:annotation
+xs:documentationDeprecated - use the url-mode 
attribute./xs:documentation
+/xs:annotation
+xs:simpleType
+xs:restriction base=xs:token
+xs:enumeration value=intra-app /
+xs:enumeration value=inter-app /
+xs:enumeration value=content /
+xs:enumeration value=plain /
+/xs:restriction
+/xs:simpleType
+/xs:attribute
 /xs:extension
 /xs:complexContent
 /xs:complexType

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java?rev=1653296r1=1653295r2=1653296view=diff
==
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java 
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java 
Tue Jan 20 16:51:56 2015
@@ -2102,12 +2102,15 @@ public class ModelFormField {
 private final FlexibleStringExpander description;
 private final boolean requestConfirmation;
 private final Link link;
+
 public HyperlinkField(Element element, ModelFormField modelFormField) {
 super(element, modelFormField);
 this.alsoHidden = 
!false.equals(element.getAttribute(also-hidden));
 this.confirmationMsgExdr = 
FlexibleStringExpander.getInstance(element.getAttribute(confirmation-message));
 this.description = 
FlexibleStringExpander.getInstance(element.getAttribute(description));
 this.requestConfirmation = 
true.equals(element.getAttribute(request-confirmation));
+// Backwards-compatible fix
+element.setAttribute(url-mode, 
element.getAttribute(target-type));
 this.link = new Link(element);
 }
 




svn propchange: r1653296 - svn:log

2015-01-20 Thread adrianc
Author: adrianc
Revision: 1653296
Modified property: svn:log

Modified: svn:log at Tue Jan 20 16:54:32 2015
--
--- svn:log (original)
+++ svn:log Tue Jan 20 16:54:32 2015
@@ -1 +1 @@
-Fixed a lookup bug caused by the recent widget refactoring, reported by lmac 
on the dev mailing list.
+Fixed a lookup bug caused by the recent widget refactoring, reported by lmac 
on the user mailing list.