Merge pull request #1 from moqui/master

Merge from moqui/HiveMind
moqui · May 12, 2020 · d66b6a9 · d66b6a9
2 parents db13a7d + 73aa752
commit d66b6a9
Show file tree

Hide file tree

Showing 24 changed files with 326 additions and 313 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ language: groovy
 sudo: true
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 install: true
 
@@ -19,6 +19,8 @@ env:
 
 script:
   - ./gradlew --no-daemon getGit -Pcomponent=HiveMind
+  - ./gradlew --no-daemon downloadElasticSearchLinux
+  - ./gradlew --no-daemon startElasticSearch
   - ./gradlew --no-daemon load
   - ./gradlew --no-daemon runtime:component:HiveMind:test
 

diff --git a/AUTHORS b/AUTHORS
@@ -1,4 +1,4 @@
-HiveMind (http://github.com/moqui/HiveMind)
+HiveMind PM and ERP (http://github.com/moqui/HiveMind)
 
 This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
@@ -34,7 +34,7 @@ that are otherwise encumbered.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2016 by David E. Jones - jonesde
+Written in 2010-2020 by David E. Jones - jonesde
 Written in 2015 by Sam Hamilton - samhamilton
 Written in 2015-2016 by Jens Hardings - jenshp
 Written in 2015 by Yao Chunlin - chunlinyao
@@ -60,8 +60,10 @@ litigation is filed.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2016 by David E. Jones - jonesde
+Written in 2010-2020 by David E. Jones - jonesde
 Written in 2015 by Yao Chunlin - chunlinyao
 Written in 2015-2016 by Jens Hardings - jenshp
 Written in 2015 by Sam Hamilton - samhamilton
 Written in 2018 by Zhang Wei - zhangwei1979
+
+===========================================================================
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![license](http://img.shields.io/badge/license-CC0%201.0%20Universal-blue.svg)](https://github.com/moqui/HiveMind/blob/master/LICENSE.md)
 [![build](https://travis-ci.org/moqui/HiveMind.svg)](https://travis-ci.org/moqui/HiveMind)
 [![release](http://img.shields.io/github/release/moqui/HiveMind.svg)](https://github.com/moqui/HiveMind/releases)
-[![commits since release](http://img.shields.io/github/commits-since/moqui/HiveMind/v1.3.0.svg)](https://github.com/moqui/HiveMind/commits/master)
+[![commits since release](http://img.shields.io/github/commits-since/moqui/HiveMind/v1.4.2.svg)](https://github.com/moqui/HiveMind/commits/master)
 [![downloads](http://img.shields.io/github/downloads/moqui/HiveMind/total.svg)](https://github.com/moqui/HiveMind/releases)
 
 [![LinkedIn Group](https://img.shields.io/badge/linked%20in%20group-moqui-blue.svg)](https://www.linkedin.com/groups/4640689)
@@ -82,11 +82,11 @@ From the **moqui** directory run:
 
 For the HiveMind Project Management application, in your browser go to:
 
-<http://localhost:8080/apps/hm>
+<http://localhost:8080/vapps/hm>
 
 Or for the admin application go to:
 
-<http://localhost:8080/apps/hmadmin>
+<http://localhost:8080/vapps/hmadmin>
 
 Use the button in the lower-left corner of the screen login as John Doe.
 
@@ -105,8 +105,9 @@ Here are command line steps for initial checkout, setup, and run:
 Here are steps for a basic update (for development with clean out and rebuild of database):
 
     $ cd moqui
-    $ ./gradlew cleanAll gitPullAll load
+    $ ./gradlew cleanAll gitPullAll
+    $ ./gradlew load
     $ java -jar moqui.war
 
-To access the project management app go to something like <http://localhost:8080/apps/hm> in a
-web browser. To access the admin app go to <http://localhost:8080/apps/hmadmin>.
+To access the project management app go to something like <http://localhost:8080/vapps/hm> in a
+web browser. To access the admin app go to <http://localhost:8080/vapps/hmadmin>.
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -1,6 +1,52 @@
 
 HiveMind Project Management and Service ERP Release Notes
 
+===========================================================================
+Release 1.4.2 - 07 Dec 2019
+===========================================================================
+
+HiveMind Project Management and Service ERP 1.4.2 is a patch level new
+feature and bug fix release.
+
+There are only minor changes and fixes in this release. For a complete
+list of changes see:
+
+https://github.com/moqui/HiveMind/compare/v1.4.1...v1.4.2
+
+Most changes come from screens reused from SimpleScreens.
+
+===========================================================================
+Release 1.4.1 - 23 July 2019
+===========================================================================
+
+HiveMind Project Management and Service ERP 1.4.1 is a patch level new
+feature and bug fix release.
+
+There are only minor changes and fixes in this release. For a complete
+list of changes see:
+
+https://github.com/moqui/HiveMind/compare/v1.4.0...v1.4.1
+
+===========================================================================
+Release 1.4.0 - 29 Nov 2018
+===========================================================================
+
+HiveMind Project Management and Service ERP 1.4.0 is a minor new feature
+and bug fix release.
+
+This release is based on Moqui Framework version 2.1.1, mantle-udm 2.1.0,
+mantle-usl 2.1.0, and SimpleScreens 2.1.0. It also uses the
+moqui-elasticsearch 1.1.1 and moqui-fop 1.1.1 tool components.
+
+Most of the new functionality in this release is in the areas of the app
+from SimpleScreens and shared with POPC ERP (Party, Accounting, etc). See
+the ReleaseNotes.txt file in SimpleScreens for more details.
+
+Some basic stats to show app growth (for PM and Admin apps):
+
+- Screens: 154 (last release 106)
+- Forms: 387 (last release 275)
+
 ===========================================================================
 Release 1.3.0 - 22 Oct 2017
 ===========================================================================

diff --git a/build.gradle b/build.gradle
@@ -24,13 +24,18 @@ repositories {
     jcenter()
 }
 
+// Log4J has annotation processors, disable to avoid warning
+tasks.withType(JavaCompile) { options.compilerArgs << "-proc:none" }
+tasks.withType(GroovyCompile) { options.compilerArgs << "-proc:none" }
+
 dependencies {
     compile project(':framework')
     testCompile project(':framework').configurations.testCompile.allDependencies
 }
 
 // by default the Java plugin runs test on build, change to not do that (only run test if explicit task)
-check.dependsOn.remove(test)
+// no longer workds as of gradle 4.8 or possibly earlier, use clear() instead: check.dependsOn.remove(test)
+check.dependsOn.clear()
 
 test {
     dependsOn cleanTest

diff --git a/component.xml b/component.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
-        name="HiveMind" version="1.3.0">
-    <depends-on name="moqui-elasticsearch" version="1.1.0"/>
-    <depends-on name="moqui-fop" version="1.1.0"/>
-    <depends-on name="mantle-udm" version="2.0.0"/>
-    <depends-on name="mantle-usl" version="2.0.0"/>
-    <depends-on name="SimpleScreens" version="2.0.0"/>
+        name="HiveMind" version="1.4.2">
+    <depends-on name="moqui-fop" version="1.1.2"/>
+    <depends-on name="mantle-udm" version="2.1.2"/>
+    <depends-on name="mantle-usl" version="2.1.2"/>
+    <depends-on name="SimpleScreens" version="2.1.2"/>
 </component>
diff --git a/data/HiveMindAabDocumentData.xml b/data/HiveMindAabDocumentData.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entity-facade-xml type="seed">
+<entity-facade-xml type="seed-initial">
     <!-- HiveMind PM (/hm) DataDocument Links -->
     <moqui.entity.document.DataDocumentLink dataDocumentId="MantleWikiPage" linkSeqId="21" linkSet="hm" label="Wiki Page" urlType="screen"
             linkUrl="/apps/hm/wiki/${wikiSpaceId}/${pagePath?:''}"/>
@@ -50,4 +50,16 @@ along with this software (see the LICENSE.md file). If not, see
             emailServerId="SYSTEM" bodyScreenLocation="component://HiveMind/screen/WikiPageUpdateNotification.xml"
             webappName="webroot" fromAddress="" ccAddresses="" bccAddresses=""
             subject="Wiki Page Updated: ${document.wikiSpaceId}/${document.pagePath}" sendPartial="Y"/>
+
+    <!-- NotificationTopic linkTemplate overrides for records from MyAccountDocumentData.xml in SimpleScreens -->
+    <moqui.security.user.NotificationTopic topic="MantleTask"
+            linkTemplate="/vapps/hm/Task/TaskSummary?workEffortId=${workEffortId}"/>
+    <moqui.security.user.NotificationTopic topic="MantleRequest"
+            linkTemplate="/vapps/hm/Request/EditRequest?requestId=${requestId}"/>
+    <!-- TODO: anything special for these?
+    <moqui.security.user.NotificationTopic topic="MantleEvent"
+            linkTemplate="/apps/my/User/Calendar/EventDetail?workEffortId=${workEffortId}"/>
+    <moqui.security.user.NotificationTopic topic="MantleCommunicationEvent"
+            linkTemplate="/apps/my/User/Messages/MessageThread?communicationEventId=${communicationEventId}"/>
+    -->
 </entity-facade-xml>
diff --git a/screen/HiveMindAdmin/Project/EditUsers.xml b/screen/HiveMindAdmin/Project/EditUsers.xml
@@ -12,49 +12,22 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
         default-menu-title="Parties" default-menu-index="3">
 
     <parameter name="workEffortId"/>
     <parameter name="rootWorkEffortId" required="true" from="rootWorkEffortId ?: workEffortId"/>
 
-    <transition name="addUserAssign">
-        <service-call name="create#mantle.work.effort.WorkEffortParty" in-map="context"/>
-        <default-response url="."/>
-    </transition>
-    <transition name="updateUserAssign">
-        <service-call name="update#mantle.work.effort.WorkEffortParty" in-map="context"/>
-        <default-response url="."/>
-    </transition>
-    <transition name="editUser"><default-response url="../../User/EditUser"/></transition>
+    <transition name="addUserAssign"><service-call name="create#mantle.work.effort.WorkEffortParty" in-map="context"/>
+        <default-response url="."/></transition>
+    <transition name="updateUserAssign"><service-call name="update#mantle.work.effort.WorkEffortParty" in-map="context"/>
+        <default-response url="."/></transition>
+    <transition name="editParty"><default-response url="//${appRoot}/Party/EditParty"/></transition>
 
-    <transition name="getPersonList">
-        <actions>
-            <entity-find entity-name="mantle.party.PersonAndUserAccount" list="pauList" limit="20">
-                <econditions combine="or">
-                    <econdition field-name="firstName" operator="like" value="%${term}%" ignore-case="true"/>
-                    <econdition field-name="lastName" operator="like" value="%${term}%" ignore-case="true"/>
-                    <econdition field-name="username" operator="like" value="%${term}%" ignore-case="true"/>
-                </econditions>
-                <order-by field-name="^firstName"/><order-by field-name="^lastName"/><order-by field-name="^username"/>
-            </entity-find>
-            <script>
-                def outList = []
-                for (def pau in pauList)
-                    outList.add([value:pau.partyId, label:"${pau.firstName} ${pau.lastName} (${pau.username})".toString()])
-                ec.web.sendJsonResponse(outList)
-            </script>
-        </actions>
-        <default-response type="none"/>
-    </transition>
+    <transition-include name="searchPartyList" location="component://SimpleScreens/template/party/PartyForms.xml"/>
 
     <actions>
         <set field="workEffortId" from="rootWorkEffortId"/>
-        <entity-find entity-name="mantle.work.effort.WorkEffortAndPartyDetail" list="wepapList">
-            <search-form-inputs/>
-            <econdition field-name="workEffortId" from="rootWorkEffortId"/>
-        </entity-find>
     </actions>
     <widgets>
         <container-dialog id="AddUserAssignDialog" button-text="Add User Assignment">
@@ -63,7 +36,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <field name="workEffortId"><default-field><hidden/></default-field></field>
 
                 <field name="partyId"><default-field title="Person">
-                    <text-line ac-transition="getPersonList" ac-min-length="2" size="15"/>
+                    <drop-down><dynamic-options transition="searchPartyList" server-search="true" min-length="2"/></drop-down>
                 </default-field></field>
                 <field name="roleTypeId"><default-field title="Role">
                     <drop-down no-current-selected-key="Assignee">
@@ -101,21 +74,29 @@ along with this software (see the LICENSE.md file). If not, see
         </container-dialog>
 
         <form-list name="UpdateUserAssignForm" list="wepapList" transition="updateUserAssign">
+            <entity-find entity-name="mantle.work.effort.WorkEffortAndPartyDetail" list="wepapList">
+                <search-form-inputs default-order-by="firstName,lastName,organizationName"/>
+                <econdition field-name="workEffortId" from="rootWorkEffortId"/>
+            </entity-find>
             <row-actions>
                 <entity-find-one entity-name="moqui.basic.StatusItem" value-field="currentStatus"/>
+                <entity-find entity-name="moqui.security.UserAccount" list="uaList">
+                    <econdition field-name="partyId"/></entity-find>
+                <set field="usernames" from="uaList*.username.join(', ')"/>
             </row-actions>
-            <field name="rootWorkEffortId"><default-field><hidden/></default-field></field>
-            <field name="workEffortId"><default-field><hidden/></default-field></field>
+            <hidden-parameters><parameter name="rootWorkEffortId"/><parameter name="workEffortId"/></hidden-parameters>
+
             <field name="partyId"><default-field><hidden/></default-field></field>
-            <field name="username"><header-field show-order-by="case-insensitive"/>
-                <default-field><link url="editUser" text="${username}" link-type="anchor" condition="username"/></default-field>
-            </field>
+            <field name="pseudoId"><header-field title="ID" show-order-by="case-insensitive"/>
+                <default-field><link url="editParty" text="${pseudoId}" link-type="anchor"/></default-field></field>
+            <field name="usernames"><default-field>
+                <link url="editParty" text="${usernames}" link-type="anchor" condition="usernames"/></default-field></field>
             <field name="firstName"><header-field title="First##Name" show-order-by="case-insensitive"/><default-field>
-                <display also-hidden="false"/></default-field></field>
+                <link url="editParty" text="${firstName}" link-type="anchor" condition="firstName"/></default-field></field>
             <field name="lastName"><header-field title="Last##Name" show-order-by="case-insensitive"/><default-field>
                 <display also-hidden="false"/></default-field></field>
             <field name="organizationName"><header-field title="Org" show-order-by="case-insensitive"/><default-field>
-                <display also-hidden="false"/></default-field></field>
+                <link url="editParty" text="${organizationName}" link-type="anchor" condition="organizationName"/></default-field></field>
 
             <field name="roleTypeId"><header-field title="Role" show-order-by="true"/>
                 <default-field><display-entity entity-name="RoleType" text="${description}"/></default-field>
@@ -136,7 +117,7 @@ along with this software (see the LICENSE.md file). If not, see
             </default-field></field>
             <field name="submitButton"><default-field title="Update"><submit/></default-field></field>
 
-            <form-list-column><field-ref name="username"/><field-ref name="roleTypeId"/></form-list-column>
+            <form-list-column><field-ref name="pseudoId"/><field-ref name="usernames"/><field-ref name="roleTypeId"/></form-list-column>
             <form-list-column><field-ref name="firstName"/><field-ref name="lastName"/><field-ref name="organizationName"/></form-list-column>
             <form-list-column><field-ref name="fromDate"/><field-ref name="thruDate"/></form-list-column>
             <form-list-column><field-ref name="expectationEnumId"/><field-ref name="emplPositionClassId"/></form-list-column>

diff --git a/screen/HiveMindAdmin/Project/ProjectTimeEntries.xml b/screen/HiveMindAdmin/Project/ProjectTimeEntries.xml
@@ -27,6 +27,8 @@ along with this software (see the LICENSE.md file). If not, see
 
     <transition name="createProjectInvoiceItems"><service-call name="mantle.account.InvoiceServices.create#ProjectInvoiceItems"/>
         <default-response url="."/></transition>
+
+    <transition-include name="getProjectList" location="component://SimpleScreens/template/work/WorkTransitions.xml"/>
     <transition-include name="getOpenClientInvoicesByProject" location="component://SimpleScreens/template/work/WorkTransitions.xml"/>
     <transition-include name="getOpenVendorInvoicesByFromParty" location="component://SimpleScreens/template/work/WorkTransitions.xml"/>
     <transition-include name="getProjectParties" location="component://SimpleScreens/template/work/WorkTransitions.xml"/>