Jacques Le Roux
4deae05a38
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/specialpurpose@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux
a98ac13d9d
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/specialpurpose@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux
b20816bfa8
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/specialpurpose@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit
54f6e94bc1
(OFBIZ-7218) Relocate .groovy files in the specialpurpose/projectmgr component
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747848 13f79535-47bb-0310-9956-ffa450edef68
2016-06-11 05:50:23 +00:00
Jacques Le Roux
832e582052
This closes "Replace bsh code with Groovy code" https://issues.apache.org/jira/browse/OFBIZ-6332 with all its subtasks and more.
...
jleroux: I suspected it was only a matter of replacing "${bsh" by "${groovy" in *.xml. But I had not the guts to get into 11(!) sub tasks.
So, in Eclipse, I simply did a S/R in *.xml and compared parts of my changes with some Pierre's most "complex" patches respectively product, ebaystore, projectmgr and scrum.
They were totally similar (just revisions number changed) so here is the whole.
I will later improve these changes by removing HTML entities when possible, this is a bit more delicate because in some cases the XML schema are not complete (or/and for other still obscure to me reasons) and if you simply replace HTML entities by simple code (eg &Amp; by &) you get issues in logs when the XML parser cross them...
Note: only menus, screen and forms are changed here.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1682118 13f79535-47bb-0310-9956-ffa450edef68
2015-05-27 20:39:43 +00:00
Bruno Busco
c05cdc2f21
Added UiLabels resources loading in Porlets.
...
This fixes the missing portlet UILabels rendering when accessing the Portal Page Admin in WebTools.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@996090 13f79535-47bb-0310-9956-ffa450edef68
2010-09-11 07:10:50 +00:00
Adam Heath
0f8f2093e3
Fix a bunch of no final newline issues.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Bruno Busco
9ce666ca0d
Part of OFBIZ-3067 - Menus and form widget files location
...
Assetmaint, Oagis and Projectmgr components
Renamed assetmaint/widget/Menus.xml to assetmaint/widget/AssetmaintMenus.xml
Renamed oagis/widget/Menus.xml to oagis/widget/OagisMenus.xml
Renamed projectmgr/widget/Menus.xml to projectmgr/widget/ProjectMenus.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@829325 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 08:54:33 +00:00
Jacques Le Roux
b7d0f685f2
A patch from Erwan de FERRIERES " Misc. internationalization on projectmgr" ( https://issues.apache.org/jira/browse/OFBIZ-3069 ) - OFBIZ-3069
...
Word "week" was hard-coded in a form and a timesheet's total was hardcoded in the groovy script
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@828844 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 20:46:17 +00:00
Bruno Busco
d2b7b4dbdd
Changed <container style="screenlet"> pattern to <screenlet...>.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@826483 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 18:24:32 +00:00
Hans Bakker
7a775df6e6
fix timesheet problems
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@767788 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 04:25:56 +00:00
Jacques Le Roux
97bb3073c9
2d part and end of an effort to remove trailing spaces
...
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg )
Of course this effort to remove trailing spaces has no functional implications.
Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {
So these changes are also in this commit, should not be a problem anyway.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Hans Bakker
f75c3840ec
move timesheet back into project manager, corrected field format error in portletCategory entity (needs drop and reload from seed data) and general corrections
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@759853 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 06:49:26 +00:00
Marco Risaliti
4feaec188c
A lot of hardcoded labels cleaning and changes some wrong references
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@746341 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 19:11:06 +00:00
Jacques Le Roux
a11a682e85
<if-compare field-name= => <if-compare field=
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@739769 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 14:13:19 +00:00
Jacques Le Roux
949e088c08
<field-map(.*)env-name => <field-map$1from-field
...
<service(.*)result-map-name => <service$1result-map
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@739764 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 13:54:08 +00:00
Jacques Le Roux
ea40a85e51
<entity-one entity-name=(.*)value-name => <entity-one entity-name=$1value-field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@739732 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 10:27:43 +00:00
Marco Risaliti
f5e116b4fc
A lot of cleaning into WorkEffort labels (Part of OFBIZ-1780)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@731376 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 22:14:57 +00:00
Hans Bakker
fdc47f8656
show in timesheet task list and 'assign task to me', only the available tasks + grrovy conversion
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@704298 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 02:55:40 +00:00
Hans Bakker
cccdd70c4b
cleanup viewsize/viewindex assignments, to screenlet conversion
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@688244 13f79535-47bb-0310-9956-ffa450edef68
2008-08-23 01:59:21 +00:00
Hans Bakker
ffd0c6fd07
change order of project drop down, fix of timesheet display, remove log messages
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@687663 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 09:30:33 +00:00
Hans Bakker
8b211697d3
fix timesheet list,add button in screenlet
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@671494 13f79535-47bb-0310-9956-ffa450edef68
2008-06-25 10:07:20 +00:00
Hans Bakker
171cb4c424
convert to screenlet and do not show checkboxes on timesheet
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@671044 13f79535-47bb-0310-9956-ffa450edef68
2008-06-24 07:03:20 +00:00
Jacques Le Roux
c26afd2e77
Use (new) ${uiLabelMap.CommonNbr} instead of # and ${uiLabelMap.OrderNbr}. Suppressed EcommerceNbr was not used
...
More and better French labels in Order (work in progress...)
Some sparse labels fix in Product
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@659052 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 09:02:28 +00:00
Hans Bakker
282136a46d
OFBIZ-1703: localization of projectmanager and chinese language added
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@636182 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 02:45:18 +00:00
Christian Geisert
dd5c44cca9
Setting svn properties (svn:eol-style,svn:mime-type,svn:keywords)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@634225 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 11:32:39 +00:00
Adrian Crum
898a731e5e
Second sweep through the maincss.css style sheet. Changed the head1, head2, and head3 style names to h1, h2, and h3. Updated affected styles in ftl and xml files.
...
The ecommerce component is excluded from this commit.
These changes shouldn't break any layout. If you spot something wrong, let me know and I'll fix it.
I won't make any more maincss.css changes for a little while. I'll let the dust settle from these two commits, then I'll go through the file and physically remove the deprecated styles.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@627051 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 19:30:09 +00:00
Marco Risaliti
3332c243ff
All the Project Manager forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1618)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@618698 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 16:47:50 +00:00
Hans Bakker
0c7173dc48
fix the paging on all projectmgr screens
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@611997 13f79535-47bb-0310-9956-ffa450edef68
2008-01-15 02:47:08 +00:00
Hans Bakker
06b5a5467e
In the timesheet entry different rateTypes on the same task accepted now
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@609923 13f79535-47bb-0310-9956-ffa450edef68
2008-01-08 10:29:43 +00:00
Hans Bakker
9c712e3a15
corrected errors in timesheet, 'set to comlete' wrong link'
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@609865 13f79535-47bb-0310-9956-ffa450edef68
2008-01-08 04:23:33 +00:00
Hans Bakker
b58f3a5be2
refactoring of names to re-use more forms/screens
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@607391 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 07:30:30 +00:00
Hans Bakker
8334f46c87
more re-use of screen parts
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@607389 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 06:55:00 +00:00
Hans Bakker
447723bd10
reorganised timesheet option
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@607374 13f79535-47bb-0310-9956-ffa450edef68
2007-12-29 04:55:24 +00:00
Hans Bakker
0743f8597a
add the possibility to create any weekly timesheet
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@607193 13f79535-47bb-0310-9956-ffa450edef68
2007-12-28 09:12:42 +00:00
Hans Bakker
67e31958f5
introduced a 'readOnly' timesheet after the status has been set to 'complete
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@606847 13f79535-47bb-0310-9956-ffa450edef68
2007-12-26 05:08:47 +00:00
Hans Bakker
ca0e7ae637
changed resource selection, need reload of demo data
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@604795 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 08:50:54 +00:00
Hans Bakker
c45354374a
add a partyList to the task overview
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@604769 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 04:35:23 +00:00
Hans Bakker
27e169fb5a
rewritten timesheet maintenance screens to allow the weekly input to tasks of projects the login ID is member of.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@602651 13f79535-47bb-0310-9956-ffa450edef68
2007-12-09 08:06:00 +00:00
Hans Bakker
c58822c10f
cleanup of the timesheet screens, only reporting on tasks, temporary removed tree menu items. This completes the basic implementation of the project manager. Next actions will be a ganttchart in Dojo and a project sheduler to set estimated dates on the tasks
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@599289 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 06:02:05 +00:00
Hans Bakker
e316905a73
moved project views from workeffort in the projmgr, change the time entry screens to enter only time on tasks, an in the option 'mytime' only on tasks in project of which the logged on user is member of.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@597072 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 13:27:53 +00:00
Hans Bakker
a733d562f7
replace edittimesheet.ftl with a form from workeffort
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@596566 13f79535-47bb-0310-9956-ffa450edef68
2007-11-20 08:22:21 +00:00
Anil Patel
bab08c01f7
Adding forms and screens for Project management. Most of the forms are intentionally done using freemarker so we have more control over UI. Planning to use Ajax/Effects where makes sense.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@574051 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 19:02:11 +00:00