Commit Graph
298 Commits
Author SHA1 Message Date
Nicolas Malin 7165768251 Implemented: Add a framework method to get main webapp menu with the webapp name
(OFBIZ-10601)

To improve theme management and provide better tools for new themes, we implement a method to obtain the main menu of a webapp.
Instead of just managing a menu, we extend the functionality by offering a method to expose a summary of the webapp, to simplify the navigation.

For this we add a new attribute on webapp definition app-shortcut-screen :

    <webapp name="mywebapp"
            ...
            app-shortcut-screen="component://mycomponent/widget/CommonScreens.xml#ShortcutApp"
            ...
    />

The idea is to define a new purpose screen *Shortcut* that contains what defines a webapp when an action or navigation has been requested. With this screen you can load a menu, a search, a complex description and use all screen powerfulness to resolve what displaying and support by theming

    <screen name="ShortcutApp">
        <section>
            <actions>
                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
            </actions>
            <widgets>
                <decorator-screen name="ShortcutDecorator" location="component://common/widget/CommonScreens.xml">
                    <decorator-section name="body">
                        <include-menu name="MyShortcutAppBar" location="component://mycomponent/widget/CommonMenus.xml"/>
                    </decorator-section>
                </decorator-screen>
            </widgets>
        </section>
    </screen>

Each component are self-sufficient to define what shortcuts to display without framework change or knowledge about other component.
Each theme can implement and customize the display rendering at will.

To illustrate an example of implementation we set sub menu for each webapp defined on applications and exploit it on bluelight theme.

Thanks for Dennis Balkir, Jacques Leroux, Leila Mekika and Julien Nicolas for their involvement
2021-01-15 08:56:23 +01:00
Jacques Le Roux ec2b84341e Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"
This reverts commit 17eb2e4cf7.

It does not work when using <<target="javascript:........>>
I could change those cases but it's easier and safer to simply revert back to
target-type!

Thanks: James for report
2020-12-18 11:08:32 +01:00
Jacques Le Roux 17eb2e4cf7 Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)
Same for sub-hyperlink
2020-12-11 16:52:04 +01:00
Akash Jain da0f52d005 Improved: Status ID checkbox for FindEmploymentApps, FindPartyQuals and FindEmplLeaves forms (OFBIZ-11937) 2020-08-04 15:41:53 +05:30
lodhiravi 32a0cb865e Fixed: Added employee lookup to search/select employee(person) while creating new employment. This will also fixed the issue of party groups being selected as a employee. (OFBIZ-11697) (#210) 2020-07-04 23:11:58 +05:30
holivier 21077ac056 Documented: remove docbook help files for humanres (OFBIZ-11587)
All files have been migrated to asciidoc format and help link now point
to the html file generated from the asciidoc files

In the global Help Docbook index tree, remove all points about
humanres and add a short page with a link to the new help
2020-06-19 17:23:29 +02:00
James Yong c0e527efb2 Improved: Headerize external script in multi-block html template (OFBIZ-11741)
Allow external scripts within the multi-block html template, to be rendered
within the html head tag, when a new attribute data-import is set to “head”

Thanks: Jacques for review
2020-05-30 12:00:21 +08:00
James Yong f443ace724 Improved: Apply multi-block attr to each application (OFBIZ-11706)
Revert multi-block attr on RemoveInternalOrg.ftl, to fix
regression for HR tree.
There is no inline script causing CSP issue in the 1st place.

Thanks: Olivier for reporting
2020-05-18 20:26:39 +08:00
James Yong 2c62637752 Improved: Apply multi-block attr to each application (OFBIZ-11706)
For Accounting, Content, HR, Manufacturing.
2020-05-15 17:43:38 +08:00
Jacques Le Roux a609900105 Fixed: POC for CSRF Token
(OFBIZ-11306)

While reviewing I found this non related fix (FindPayGrade should be plural)
Better to commit it apart
2020-01-03 09:23:10 +01:00
Jacopo Cappellato cbad4d3e22 Fixed: Add missing view permissions checks to various screens. 2019-11-15 19:23:38 +01:00
Aditya Sharma 1965e3a39a Improved: Activate / Finish EmplPositionType ValidResponsibilities
(OFBIZ-11045)
Most of code / form / screen already exist to manage EmpPositionType, except

1. menu item
2. screen menu fields
Fixed  wrong entity name in the entityCondition prepared in ListValidResponsibilities form

Thanks Olivier Heintz for reporting and providing the patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1868911 13f79535-47bb-0310-9956-ffa450edef68
2019-10-25 08:51:03 +00:00
Jacques Le Roux f91ec0ec90 Improved: Make Create Menu tab bar for Leave consistent
(OFBIZ-8195)

Add a create Leave tab bar in the main decorator to maintain the consistency 
throughout the tab bar of Leave.

Thanks: Avnindra Sharma for the report and patch, Devanshu Vyas for testing

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867703 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 08:18:22 +00:00
Jacques Le Roux 9398f6770e Improved: Make Create Menu tab bar for Employee Position consistent
(OFBIZ-8190)

Adds a create Employee Position tab bar in the main decorator to maintain the 
consistency throughout the tab bar of Employee Position.

Thanks: Avnindra Sharma for the report and patch, Devanshu Vyas for testing

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867695 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 07:43:16 +00:00
Jacques Le Roux 579f532228 Improved: Make Create Menu tab bar for Employee consistent
(OFBIZ-8189)

Adds a create Employee tab bar in the main decorator to maintain the consistency 
throughout the tab bar of Employee.

Thanks: Avnindra Sharma for report and patch, Devanshu Vyas for test

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867688 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 06:58:47 +00:00
Jacques Le Roux ddb43a6493 Fixed: field emplFromDate is forgot in PayHistory entity
(OFBIZ-11028)

Arpit Mor: steps to regenerate:
    Login to the URL: https://demo-trunk.ofbiz.apache.org/humanres/control/main
    Click on Employments
    Click on New Employments
    Click on Create
Actual: Error message is displayed.

Olivier Heintz: employment is associated with PayHistory, and there is a problem 
in PayHistory entity definition in OFBiz,
In PayHistory, the field fromDate from Employment is confused with fromDate 
about the current record.
A Employment can have multiple PayHistories and should have multiple
because PayHistory should show history of Pay  for a employment  !
It's necessary to have a field emplFromDate (to have the complete employment 
primaryKey).
When modifying a PayRecord the current should be expire and a new one should 
be created.

Thanks: Arpit Mor for report at OFBIZ-10969 and Olivier Heintz for the fix

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859571 13f79535-47bb-0310-9956-ffa450edef68
2019-05-20 17:14:43 +00:00
Jacques Le Roux d89b68face Improved: Splitting CommonRate and CommonProductRating
(OFBIZ-3844)

Simplifies and adds comments for clarity

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1848923 13f79535-47bb-0310-9956-ffa450edef68
2018-12-14 10:38:18 +00:00
Jacques Le Roux 5597b1d65a Improved: Splitting CommonRate and CommonProductRating
(OFBIZ-3844)

The CommonRate label is currently not used coherently throughout the application 
stack. The existing translations suggest that the commonly understood meaning of 
CommonRate is a rate as a tariff or day rate. However, in the product management 
GUI, the CommonRate label is used to demark the section where ProductRating 
setting are made.

The provided fix splits CommonRate into two labels, CommonRatioRate and 
CommonAssessRate (product rating). Also, the application/product/webapp/ form 
definition now references the CommonAssessRate label.

Thanks: Carsten Schinzer for report and patch, Adrian for suggestion and Markus
May for discussion

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1848834 13f79535-47bb-0310-9956-ffa450edef68
2018-12-13 09:43:03 +00:00
Michael Brohl 7c67b85698 Improved: Implement dependency from "State/Province" Field to "Country"
in New Employee Form.
(OFBIZ-10326)

Thanks Benjamin Jugl and Julian Leichert for reporting and providing 
the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1848469 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 13:36:26 +00:00
Suraj Khurana 9ca5823a8a Improved: Consistency and Readability improvements for include-menu tag.
(OFBIZ-8972)
Thanks Ankush Upadhyay for reporting and Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1845088 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 08:29:43 +00:00
Aditya Sharma 1451943617 Fixed: Broken page renders while click on Submit button
(OFBIZ-7535)
Submit button on ListEmploymentApps form has no check to hide when no record in List due to which button always appears and shows broken screen when submitting empty list.
Thanks Ankush Upadhyay for reporting the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1841662 13f79535-47bb-0310-9956-ffa450edef68
2018-09-22 08:44:42 +00:00
Deepak Dixit b13070d7fa Improved: Standardise layout for Party
(OFBIZ-10334)
Thanks Dennis Balkir for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835957 13f79535-47bb-0310-9956-ffa450edef68
2018-07-15 09:10:49 +00:00
Jacques Le Roux cf0c677e10 Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

Fix my previous commits, there is no themes webapp so no URL at 
/themes/common/webapp/images/ofbiz_logo.png
It's only images/ofbiz_logo.png


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820978 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 12:56:30 +00:00
Paul Foxworthy 5fd7402240 Fixed: Find Employee Position does not allow "don't care" for boolean fields (OFBIZ-10158)
In the demo app, go to https://demo-stable.ofbiz.apache.org/humanres/control/FindEmplPositions, click on New Employee Position, and toggle one of the four flags, e.g. set Temporary Flag to N.

Now on the Find screen, there is no way to find all employee positions: it insists on a Yes or No for the flags. This patch allows a blank "don't care" option.

Thanks: Larissa Zanoni at Blockfreight for discovering this issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820949 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 06:50:17 +00:00
Jacques Le Roux b964875337 Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

The ofbiz_logo.png is now in theme. This is only the framework part. 
I have also made change in theme but I need to review again and perhaps create 
a patch for others to review...
Note: testUpdatePartyGroup is OK

Then I'll also rename the logo in site to use the same name before maybe
referring to svn trunk repo to use only 1 file everywhere, same for the .ico
file

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820862 13f79535-47bb-0310-9956-ffa450edef68
2018-01-11 11:05:26 +00:00
Jacques Le Roux 95b17d4d23 Improved: The main logo in screen upper part shows distorted
(OFBIZ-9990)

Fixes this issue in Tomahawk and Flat Grey themes by using ofbiz_logo.png, 
instead of the old logo deprecated ofbiz_logo.gif 

While at it use the same logo everywhere it's possible. It was needed for links 
to http://ofbiz.apache.org/images/ofbiz_logo.gif which no longer exists 
(actually seems only used for tests so could stay like that but better not refer 
to it anyway)

Also use this logo for Bluelight theme where it fits. 

It could not be used in Rainbow themes because they are using a Scalable Vector 
Graphics file (ofbiz-white.svg) that can't be replaced by the new png logo file
BTW this file still uses a TM symbol instead of a ®

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816897 13f79535-47bb-0310-9956-ffa450edef68
2017-12-01 18:45:50 +00:00
Deepak Dixit 88493836bc Improved: Moved jquery related js/plugins from images to common-theme webapp and made changes accordinlgy. (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809389 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 10:41:28 +00:00
Deepak Dixit 1a7aee6685 Improved:Use from-field pattern instead of value=dollor pattern in 'set' element
Apply slightly modified patch from jira issue, fixed some typo (OFBIZ-9607)
Thanks Suraj Khurana and Rohit Rai for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806326 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 20:23:40 +00:00
Nicolas Malin 40fdd2ca73 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step 
#9 Change all set screen and script that call widget.properties values replaced by call to modelTheme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806150 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 10:02:34 +00:00
Deepak Dixit 7f04d6de79 Improved: Service "deletePayHistory" does not have correct implementation (OFBIZ-9111)
Use entity auto for deletePayHistory service, also added new service to expirePayHistory and call expirePayHistory from UI.

Thanks Pawan Verma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801348 13f79535-47bb-0310-9956-ffa450edef68
2017-07-09 06:02:33 +00:00
Deepak Dixit caac1033e0 Fixed: Applied slightly modified patch from jira, Employment Applications in Party manager does not list any record even if they exist (OFBIZ-9220)
Thanks Aditya Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1791490 13f79535-47bb-0310-9956-ffa450edef68
2017-04-15 11:15:43 +00:00
Deepak Dixit d09255c0b7 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Divesh Dutta 1337db5cb2 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8926) (OFBIZ-8927)

Thanks: Ankush Upadhyay for the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768235 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 16:11:36 +00:00
Divesh Dutta 70eb7ff508 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +00:00
Divesh Dutta 738a12bec1 Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Pranay Pandey 769aa89ea8 Improved: HR List forms column alignment.
(OFBIZ-8456)

Thanks: Aditi Patidar for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1765047 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 12:35:27 +00:00
Michael Brohl 5ac2ec81f5 Fix for: Broken page renders while click on Submit button on Qualification Screen.
(OFBIZ-8223)

Thanks: Avnindra Sharma for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761492 13f79535-47bb-0310-9956-ffa450edef68
2016-09-19 20:04:32 +00:00
Divesh Dutta 556279917d Improved:Display from date with default to now timestamp and also add asterisk sign to all the forms where it is part of primary key in all the components.
(OFBIZ-7650) (OFBIZ-7651) (OFBIZ-7653) (OFBIZ-7660) (OFBIZ-7662) (OFBIZ-7665) (OFBIZ-7666) (OFBIZ-8028)(OFBIZ-8029) (OFBIZ-8255)

Thanks: Anuj Jain and Ratnesh for the pathes and Swapnil Shah for reporting the issues.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761192 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:02:39 +00:00
Divesh Dutta ef0805ffb0 Improved:Convert search criteria on status into multi select pattern for project and HR component.
(OFBIZ-7549) (OFBIZ-7550)

Added Check box for status fields on Find Qualifications, Find Employment Applications, Find Leave in HR and in Find Tasks, Find TimeSheet in Project components.

Thanks: Mohammad Kathawala for the patch and Swapnil Shah for reporting the issues. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761186 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 10:45:46 +00:00
Michael Brohl 5c67a416aa Improved: Humanres: Consistent form name.
(OFBIZ-8067)

Change all form names to upper camel case for consistency.

Thanks: Tanmay Muley for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761080 13f79535-47bb-0310-9956-ffa450edef68
2016-09-16 20:42:50 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Ashish Vijaywargiya 8c67087769 Applied patch from jira issue - OFBIZ-7560 - While adding new skill to any party the old skills are get disappeared from the party skill list.
Thanks Pritam for the contribution. Thanks Montalbano for the discussion.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751112 13f79535-47bb-0310-9956-ffa450edef68
2016-07-03 05:33:44 +00:00
Pranay Pandey 11508ce7d5 [OFBIZ-7604] Added lookup for approver party at leave approval find form. Thanks Amardeep Singh Jhajj for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750447 13f79535-47bb-0310-9956-ffa450edef68
2016-06-28 06:18:07 +00:00
Jacques Le Roux c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit d9a8278ae6 (OFBIZ-7245) Renamed groovy file in upper camel case as per best practices
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747850 13f79535-47bb-0310-9956-ffa450edef68
2016-06-11 06:12:27 +00:00
Deepak Dixit b893dd38fc (OFBIZ-7230) Relocate .groovy files in the workeffort component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747775 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:52:49 +00:00
Deepak Dixit e929d179d8 (OFBIZ-7228) Relocate .groovy files in the party component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747770 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:39:22 +00:00
Deepak Dixit 080fb8e5dc (OFBIZ-7224) Relocate .groovy files in the humanres component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747757 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 17:28:48 +00:00