Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda: [200] trunk/equanda-generate/src/main/velocity
|
From: <tri...@us...> - 2007-12-12 14:52:03
|
Revision: 200
http://equanda.svn.sourceforge.net/equanda/?rev=200&view=rev
Author: triathlon98
Date: 2007-12-12 06:51:57 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
EQ-99 (partial) fixed component classes, generate edit templates (with configurability)
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui.ini
Added Paths:
-----------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/boolean.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/int.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/templates.properties
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
Removed Paths:
-------------
trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -32,6 +32,7 @@
package ${package}.components.${engine.lowerFirst("$table.Name")};
+#set( $ejbPackage=${engine.getConfig("ejb-package")} )
import ${ejbPackage}.client.${table.Name};
import ${package}.pages.${table.Name}Edit;
import org.apache.tapestry.annotations.Parameter;
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -3,11 +3,11 @@
<t:actionlink t:id="Edit" context="object.uOID">
#set( $sep = "" )
#foreach( $field in $table.getFields() )
-#if( $field.isReference() || $field.isDescription || !field.isDisplay() )
+#if( $field.isReference() || $field.isDescription() || $field.isDisplayed() )
#if( !$field.isLink() )
- $sep \${object.${field.VarName}}
+ $sep \$\{object.${field.VarName}\}
#else
- <span t:type="${engine.lowerFirst(${field.LinkTable.Name}"}.Display" t:value="object.${field.VarName}">
+ <span t:type="${engine.lowerFirst("${field.LinkTable.Name}")}.Display" t:value="object.${field.VarName}">
#end
#set( $sep = "," )
#end
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -32,9 +32,21 @@
package ${package}.components.${engine.lowerFirst("$table.Name")};
-import ${ejbPackage}.client.${table.Name};
+#set( $ejbPackage=${engine.getConfig("ejb-package")} )
+import ${ejbPackage}.client.*;
+import org.equanda.t5gui.SelectedSetter;
+import org.apache.tapestry.OptionModel;
+import org.apache.tapestry.SelectModel;
+import org.apache.tapestry.ValueEncoder;
import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.internal.OptionModelImpl;
+import org.apache.tapestry.internal.SelectModelImpl;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
/**
* Object edit component
*/
@@ -46,4 +58,51 @@
public ${table.Name} getValue() { return value; }
public void setValue( ${table.Name} value ) { this.value = value; }
+
+ public boolean isTypeKnown() { return value.getUOID() != null; }
+
+ public ValueEncoder getTypeEncoder()
+ {
+ return new ValueEncoder<String>()
+ {
+ public String toClient( String o )
+ {
+ return o;
+ }
+
+ public String toValue( String s )
+ {
+ return s;
+ }
+ };
+ }
+
+ public SelectModel getTypeModel()
+ {
+ List<OptionModel> list = new ArrayList<OptionModel>();
+ ${table.Name}Type type = new ${table.Name}Type();
+ Collection<String> values = type.getAllowedStringValues();
+ Iterator<String> names = type.getAllowedStringNames().iterator();
+ for ( String value : values )
+ {
+ String name = names.next();
+ list.add( new OptionModelImpl( name, false, value ) );
+ }
+ return new SelectModelImpl( null, list );
+ }
+
+#foreach( $field in $table.Fields)
+#if( $field.isLink() && !$field.isMultiple() )
+ public SelectedSetter<$field.FieldTypeName> getOrganizationSetter()
+ {
+ return new SelectedSetter<${field.FieldTypeName}>() {
+ ${table.Name} keep = value;
+ public void setSelected( ${field.FieldTypeName} newValue )
+ {
+ keep.set${field.Name}( newValue );
+ }
+ };
+ }
+#end
+#end
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -1,115 +1,34 @@
-<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="${table.Name}-edit" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <span t:type="equanda/Tabs">
- <t:parameter name="contentAll">
- <t:label for="equandaType"/>
- <div style="display:none;">
- <a href="javascript:;" id="Show-${table.Name}-type-" onclick="
- $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
- $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='none';});
- $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='none';});
- ">BASE</a>
- <a href="javascript:;" id="Show-${table.Name}-type-INTE" onclick="
- $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
- $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='block';});
- $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='none';});
- ">INTE</a>
- <a href="javascript:;" id="Show-${table.Name}-type-PERS" onclick="
- $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
- $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='block';});
- $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='block';});
- ">PERS</a>
- </div>
- <input class="${table.Name}-type-Selector" t:type="Select" t:label="EquandaType" t:id="equandaType" t:value="value.EquandaType" t:disabled="isTypeKnown()" model="TypeModel" encoder="TypeEncoder" onchange="$(('Show-${table.Name}-type-'+this.options[this.selectedIndex].value).trim()).onclick();"/>
- <br/>
- <div class="${table.Name}-Reference ${table.Name}-type-">
- <t:label for="reference"/>
- <input t:type="TextField" t:label="Reference" t:id="reference" t:value="value.Reference" t:validate="max=30" size="30" onkeyup="equandaConvertCase( this, 2);"/>
- <br/></div>
- <div class="${table.Name}-Name ${table.Name}-type-">
- <t:label for="name"/>
- <input t:type="TextField" t:label="Name" t:id="name" t:value="value.Name" t:validate="max=100" size="50"/>
- <br/></div>
- </t:parameter>
- <t:parameter name="title1">Default</t:parameter>
- <t:parameter name="content1">
- <label>${table.Name}</label>
- <input t:type="${engine.lowerFirst("${table.Name}")}/LinkOne" t:label="${table.Name}" t:id="${engine.lowerFirst("${table.Name}")}" t:value="value.${table.Name}" t:setter="${table.Name}Setter"/>
- <br/>
- <t:label for="externalreference"/>
- <input t:type="TextField" t:label="Externalreference" t:id="externalreference" t:value="value.Externalreference" t:validate="max=100" size="20"/>
- <br/>
- <t:label for="description"/>
- <input t:type="TextArea" t:label="Description" t:id="description" t:value="value.Description" t:validate="max=120" size="50"/>
- <br/>
+#macro( render $key1 $key2 $key3 $key4 )
+#set( $file = "" )
+#set( $file = $keyvalue.get("key1") )
+#if( "x$file" != "x" )
+#parse( "$file" )
+#else
+#set( $file = $keyvalue.get("key2") )
+#if( "x$file" != "x" )
+#parse( "$file" )
+#else
+#set( $file = $keyvalue.get("key3") )
+#if( "x$file" != "x" )
+#parse( "$file" )
+#else
+#set( $file = $keyvalue.get("key4") )
+#if( "x$file" != "x" )
+#parse( "$file" )
+#else
+"No renderer for object $key1 $key2 $key3"
+#end##key4
+#end##key3
+#end##key2
+#end##key1
+#end##macro
- <fieldset>
- <legend></legend>
- <div class="${table.Name}-PersonFirstName ${table.Name}-type-INTE">
- <t:label for="personFirstName"/>
- <input t:type="TextField" t:label="PersonFirstName" t:id="personFirstName" t:value="value.PersonFirstName" length="32" size="25"/>
- <br/></div>
- <div class="${table.Name}-PersonName ${table.Name}-type-PERS">
- <t:label for="personname"/>
- <input t:type="TextField" t:label="PersonName" t:id="personName" t:value="value.PersonName" length="32" size="25"/>
- <br/></div>
- <t:label for="birthdate"/>
- <input t:type="DateField" t:label="Birthdate" t:id="birthdate" t:value="value.Birthdate"/>
- <br/>
- <t:label for="portfolio"/>
- <input t:type="TextField" t:label="Portfolio" t:id="portfolio" t:value="value.Portfolio" length="100" size="50"/>
- <br/>
- <fieldset>
- <legend>Address</legend>
- <t:label for="address"/>
- <input t:type="TextArea" t:label="Address" t:id="address" t:value="value.Address" t:validate="max=120" size="50"/>
- <br/>
- <t:label for="zip"/>
- <input t:type="TextField" t:label="Zip" t:id="zip" t:value="value.Zip" t:validate="max=100" size="20"/>
- <br/>
- <t:label for="city"/>
- <input t:type="TextField" t:label="City" t:id="city" t:value="value.City" t:validate="max=40" size="20"/>
- <br/>
- <t:label for="country"/>
- <input t:type="TextField" t:label="Country" t:id="country" t:value="value.Country" t:validate="max=2" size="2"/>
- <br/>
- <t:label for="phone"/>
- <input t:type="TextField" t:label="Phone" t:id="phone" t:value="value.Phone" t:validate="max=32" size="20"/>
- <br/>
- <t:label for="mobilephone"/>
- <input t:type="TextField" t:label="Mobilephone" t:id="mobilephone" t:value="value.Mobilephone" t:validate="max=32" size="20"/>
- <br/>
- <t:label for="fax"/>
- <input t:type="TextField" t:label="Fax" t:id="fax" t:value="value.Fax" t:validate="max=32" size="20"/>
- <br/>
- <t:label for="email"/>
- <input t:type="TextField" t:label="Email" t:id="email" t:value="value.Email" t:validate="max=100" size="20"/>
- <br/>
- <t:label for="url"/>
- <input t:type="TextField" t:label="Url" t:id="url" t:value="value.Url" t:validate="max=100" size="20"/>
- <br/>
- </fieldset>
- </fieldset>
- </t:parameter>
- <t:parameter name="title2">Metadata</t:parameter>
- <t:parameter name="content2">
- <t:label for="uoid"/>
- <input t:type="TextField" t:label="EquandaId" t:id="uoid" t:value="value.UOID" size="14" disabled="true"/>
- <br/>
- <t:label for="equandaCreationDate"/>
- <input t:type="TextField" t:label="EquandaCreationDate" t:id="equandaCreationDate" t:value="value.EquandaCreationDate" size="20" disabled="true"/>
- <br/>
- <t:label for="equandaModificationDate"/>
- <input t:type="TextField" t:label="EquandaModificationDate" t:id="equandaModificationDate" t:value="value.EquandaModificationDate" size="20" disabled="true"/>
- <br/>
- <t:label for="equandaVersion"/>
- <input t:type="TextField" t:label="EquandaVersion" t:id="equandaVersion" t:value="value.EquandaVersion" size="6" disabled="true"/>
- <br/>
- <t:label for="equandaStatus"/>
- <input t:type="TextField" t:label="EquandaStatus" t:id="equandaStatus" t:value="value.EquandaStatus" size="2" disabled="true"/>
- <br/>
- </t:parameter>
- </span>
- <script type="text/javascript">$$('.${table.Name}-type-Selector')[0].onchange();</script>
+## render all the pages in the form
+#render( "pages" "" "" "" )
+## and assure that the correct fields are visible based on the type
+<script type="text/javascript">$$('.${table.Name}-type-Selector')[0].onchange();</script>
+
</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -32,6 +32,7 @@
package ${package}.components.${engine.lowerFirst("$table.Name")};
+#set( $ejbPackage=${engine.getConfig("ejb-package")} )
import ${ejbPackage}.client.${table.Name};
import org.equanda.t5gui.SelectedSettings;
import ${package}.pages.${table.Name}All;
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -32,6 +32,7 @@
package ${package}.components.${engine.lowerFirst("$table.Name")};
+#set( $ejbPackage=${engine.getConfig("ejb-package")} )
import ${ejbPackage}.client.${table.Name};
import org.equanda.t5gui.SelectedSetter;
import org.equanda.t5gui.SelectedSettings;
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -32,6 +32,7 @@
package ${package}.components.${engine.lowerFirst("$table.Name")};
+#set( $ejbPackage=${engine.getConfig("ejb-package")} )
import ${ejbPackage}.client.EquandaGlobal;
import ${ejbPackage}.client.${table.Name};
import ${ejbPackage}.client.${table.Name}SelectorEJB;
@@ -79,17 +80,11 @@
if ( isForSelectOne() ) model.add( "equandaSelectOne", null );
if ( isForSelectList() ) model.add( "equandaSelectList", null );
model.add( "equandaSelectEdit", null );
- model.add(
-#set( $sep = "" )
#foreach( $field in $table.getFields() )
-#if( $field.isReference() || $field.isDescription || !field.isDisplay() )
- $sep $field.VarName
-#set( $sep = "," )
+#if( $field.isReference() || $field.isDescription() || $field.isDisplayed() )
+ model.add( "$field.VarName" );
#end
#end
- );
- model.add( "reference" );
- model.add( "name" );
return model;
}
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/boolean.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/boolean.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/boolean.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,2 @@
+<t:label for="${field.VarName}"/>
+<input t:type="CheckBox" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,2 @@
+<t:label for="birthdate"/>
+<input t:type="DateField" t:label="Birthdate" t:id="birthdate" t:value="value.Birthdate"/>
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,2 @@
+<t:label for="${field.VarName}"/>
+<input t:type="DateField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,18 @@
+#if( !$field.isHidden() )
+<div class="${table.Name}-${field.Name} ${table.Name}-type-${field.TableType}">
+#set( $renderfirst = "$field.Renderer" )
+#if( "x$renderfirst" == "x" )#set( $renderfirst = "field.${table.Name}.{$field.Name}" )#end
+#set( $specifictype = "type.${field.Type}" )
+#set( $generictype = "" )
+#if( $field.isLink() )
+#if( $field.isMultiple() )
+ #set( $specifictype = "type.${field.Type}.list" )
+ #set( $generictype = "type.link.list" )
+#else
+ #set( $specifictype = "type.${field.Type}.one" )
+ #set( $generictype = "type.link.one" )
+#end
+#end
+#render( "$renderer" "field.{$field.Name}" "$specifictype" "$generictype" )
+<br/></div>
+#end
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,18 @@
+#if( !$group.isHidden() )
+#if( "x$group.Renderer" != "x" )
+#render( "$group.Renderer" "" "" "" )
+#else
+<fieldset>
+ <legend>$group.Name</legend>
+
+#foreach( $field in $group.Fields)
+#render( "field" "" "" "" )
+#end
+
+#foreach( $group in $group.Groups)
+#render( "group" "" "" "" )
+#end
+
+</fieldset>
+#end##own renderer
+#end##!group.isHidden
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/int.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/int.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/int.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,2 @@
+<t:label for="${field.VarName}"/>
+<input t:type="TextField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
===================================================================
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
===================================================================
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/page.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,18 @@
+#if( !$page.isHidden() )
+#if( $page.Name == "ALL" )
+<t:parameter name="contentAll">
+#else
+<t:parameter name="content$pageindex">
+#set( $pageindex = $pageindex + 1 )
+#end
+
+#foreach( $field in $page.Fields)
+#render( "field" "" "" "" )
+#end
+
+#foreach( $group in $page.Groups)
+#render( "group" "" "" "" )
+#end
+
+</t:parameter>
+#end##isHidden
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,20 @@
+<span t:type="equanda/Tabs">
+## page titles
+#set( $pageindex = "1" )
+#foreach( $page in $table.Pages )
+#if( !$page.isHidden() )
+#if( $page.Name != "ALL" )
+<t:parameter name="title$pageindex">
+ $page.Name
+</t:parameter>
+#set( $pageindex = $pageindex + 1 )
+#end
+#end##isHidden
+#end## foreach page
+
+## page contents
+#set( $pageindex = "1" )
+#foreach( $page in $table.Pages )
+#render( "page" "" "" "" )
+#end
+</span>
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,2 @@
+<t:label for="${field.VarName}"/>
+<input t:type="TextField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/templates.properties
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/templates.properties (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/templates.properties 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,16 @@
+pages=edit-tml/pages.tml.vm
+page=edit-tml/page.tml.vm
+group=edit-tml/group.tml.vm
+field=edit-tml/field.tml.vm
+
+type.string=edit-tml/string.tml.vm
+type.double=edit-tml/double.tml.vm
+type.int=edit-tml/int.tml.vm
+type.date=edit-tml/date.tml.vm
+type.timestamp=edit-tml/timestamp.tml.vm
+type.boolean=edit-tml/boolean.tml.vm
+type.link.one=edit-tml/linkone.tml.vm
+type.link.list=edit-tml/linklist.tml.vm
+
+field.EquandaUser.Password=edit-tml/password.tml.vm
+field.EquandaType=edit-tml/type.tml.vm
\ No newline at end of file
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,2 @@
+<t:label for="${field.VarName}"/>
+<input t:type="DateField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Added: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,22 @@
+<div class="${table.Name}-EquandaType ${table.Name}-type-">
+ <t:label for="equandaType"/>
+ <div style="display:none;">
+ <a href="javascript:;" id="Show-${table.Name}-type-" onclick="
+ $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
+ $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='none';});
+ $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='none';});
+ ">BASE</a>
+ <a href="javascript:;" id="Show-${table.Name}-type-INTE" onclick="
+ $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
+ $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='block';});
+ $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='none';});
+ ">INTE</a>
+ <a href="javascript:;" id="Show-${table.Name}-type-PERS" onclick="
+ $$('.${table.Name}-type-').each(function show(object){object.style.display='block';});
+ $$('.${table.Name}-type-INTE').each(function show(object){object.style.display='block';});
+ $$('.${table.Name}-type-PERS').each(function show(object){object.style.display='block';});
+ ">PERS</a>
+ </div>
+ <input class="${table.Name}-type-Selector" t:type="Select" t:label="EquandaType" t:id="equandaType" t:value="value.EquandaType" t:disabled="isTypeKnown()" model="TypeModel" encoder="TypeEncoder" onchange="$(('Show-${table.Name}-type-'+this.options[this.selectedIndex].value).trim()).onclick();"/>
+ <br/>
+</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -32,6 +32,7 @@
package ${package}.pages;
+#set( $ejbPackage=${engine.getConfig("ejb-package")} )
import ${ejbPackage}.client.${table.Name};
import ${ejbPackage}.client.${table.Name}SelectorEJB;
import ${ejbPackage}.client.EquandaGlobal;
@@ -67,5 +68,5 @@
}
}
- public Class getAllPage() { return ${table.Name}All.class; }
+ public Class getAllPage() { return ${table.Name}EquandaAll.class; }
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -3,7 +3,7 @@
<title>${table.Name}, Edit</title>
</t:parameter>
<t:parameter name="context">
- <span id="context">uoid ${object?.uOID}</span>
+ <span id="context">uoid \$\{object?.uOID\}</span>
</t:parameter>
<t:parameter name="buttons">
<input class="defaultSubmit" t:type="submit" value="Save" t:id="save"/>
Copied: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm (from rev 194, trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.java.vm)
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,93 @@
+#**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (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.mozilla.org/MPL/
+ *
+ * Code generated by applying this template can be freely used.
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * Contributor(s):
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ *#
+/**
+ * This file is generated by equanda on $generationdate, do not modify
+ */
+
+package ${package}.pages;
+
+#set( $ejbPackage=${engine.getConfig("ejb-package")} )
+import ${ejbPackage}.client.${table.Name};
+import ${ejbPackage}.client.${table.Name}SelectorEJB;
+import ${ejbPackage}.client.EquandaGlobal;
+import org.equanda.t5gui.ListGetter;
+import ${package}.base.SelectPageBase;
+import org.apache.log4j.Logger;
+import org.apache.tapestry.annotations.InjectPage;
+import org.equanda.persistence.om.EquandaPersistenceException;
+
+import java.util.List;
+
+/**
+ * Object selector page
+ */
+public class ${table.Name}${select.Name}
+ extends SelectPageBase<${table.Name}>
+{
+ private static final Logger equandaLog = Logger.getLogger( ${table.Name}${select.Name}.class );
+
+ @InjectPage
+ private ${table.Name}Edit equandaCreatePage;
+
+ public ${table.Name}Edit getEquandaCreatePage() { return equandaCreatePage; }
+
+#foreach( $par in $select.Selections )
+#if( $par.isTestComparison() && $par.isParameter() )
+ @Persist
+ ${sel.JavaFieldType} ${sel.VarName};
+
+ public ${sel.JavaFieldType} get${sel.Name}() { return $sel.VarName; }
+
+#end
+#end
+
+ private static final ListGetter<${table.Name}> SELECTOR = new ListGetter<${table.Name}>()
+ {
+ public List<${table.Name}> getList()
+ {
+ ${table.Name}SelectorEJB sel = EquandaGlobal.get${table.Name}Selector();
+ List<${table.Name}> list = null;
+ try
+ {
+ list = sel.select${select.Name}( $select.ParametersListNoLimit );
+ }
+ catch ( EquandaPersistenceException ee )
+ {
+ equandaLog.error( ee, ee );
+ }
+ sel.remove();
+ return list;
+ }
+ };
+
+ public ListGetter<${table.Name}> getSelector()
+ {
+ return SELECTOR;
+ }
+}
Copied: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm (from rev 194, trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.tml.vm)
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -0,0 +1,27 @@
+<t:selectlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+ <t:parameter name="title">
+ <meta http-equiv="Content-Language" content="en"/>
+ <title>${table.Name}, ${selector.Name}</title>
+ </t:parameter>
+ <t:parameter name="context">
+ <span id="context">context info</span>
+ </t:parameter>
+ <t:parameter name="buttons">
+ <input t:type="submit" value="Refresh" t:id="refresh" class="defaultSubmit" />
+ <input t:type="submit" value="Print" t:id="print"/>
+ <input t:type="submit" value="Create" t:id="create"/>
+ </t:parameter>
+ <t:parameter name="selectors">
+#set( $allSel = ${table.Selectors} )
+ <ul>
+#foreach( $sel in $allSel )
+#if( $sel.Name != $selector.Name )
+ <li><a t:type="pagelink" t:page="${table.Name}${sel.Name}">${sel.Name}</a></li>
+#end
+#end
+ <li><a href="#nowhere-yet">ExternalReference</a></li>
+ </ul>
+ </t:parameter>
+
+ <t:${engine.lowerFirst("$table.Name")}.Select selector="selector" selectedSettings="selectedSettings" />
+</t:selectlayout>
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.java.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.java.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -1,92 +0,0 @@
-#**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (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.mozilla.org/MPL/
- *
- * Code generated by applying this template can be freely used.
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * Contributor(s):
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- *#
-/**
- * This file is generated by equanda on $generationdate, do not modify
- */
-
-package ${package}.pages;
-
-import ${ejbPackage}.client.${table.Name};
-import ${ejbPackage}.client.${table.Name}SelectorEJB;
-import ${ejbPackage}.client.EquandaGlobal;
-import org.equanda.t5gui.ListGetter;
-import ${package}.base.SelectPageBase;
-import org.apache.log4j.Logger;
-import org.apache.tapestry.annotations.InjectPage;
-import org.equanda.persistence.om.EquandaPersistenceException;
-
-import java.util.List;
-
-/**
- * Object selector page
- */
-public class ${table.Name}${select.Name}
- extends SelectPageBase<${table.Name}>
-{
- private static final Logger equandaLog = Logger.getLogger( ${table.Name}All.class );
-
- @InjectPage
- private ${table.Name}Edit equandaCreatePage;
-
- public ${table.Name}Edit getEquandaCreatePage() { return equandaCreatePage; }
-
-#foreach( $par = $select.Selections )
-#if( isTestComparison() && selection.isParameter() )
- @Persist
- ${sel.JavaFieldType} ${sel.VarName};
-
- public ${sel.JavaFieldType} get${sel.Name}() { return $sel.VarName; }
-
-#end
-#end
-
- private static final ListGetter<${table.Name}> SELECTOR = new ListGetter<${table.Name}>()
- {
- public List<${table.Name}> getList()
- {
- ${table.Name}SelectorEJB sel = EquandaGlobal.get${table.Name}Selector();
- List<${table.Name}> list = null;
- try
- {
- list = sel.selectEquanda${select.Name}( $select.ParametersListNoLimit );
- }
- catch ( EquandaPersistenceException ee )
- {
- equandaLog.error( ee, ee );
- }
- sel.remove();
- return list;
- }
- };
-
- public ListGetter<${table.Name}> getSelector()
- {
- return SELECTOR;
- }
-}
Deleted: trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.tml.vm 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Selector.tml.vm 2007-12-12 14:51:57 UTC (rev 200)
@@ -1,27 +0,0 @@
-<t:selectlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:parameter name="title">
- <meta http-equiv="Content-Language" content="en"/>
- <title>${table.Name}, ${selector.Name}</title>
- </t:parameter>
- <t:parameter name="context">
- <span id="context">context info</span>
- </t:parameter>
- <t:parameter name="buttons">
- <input t:type="submit" value="Refresh" t:id="refresh" class="defaultSubmit" />
- <input t:type="submit" value="Print" t:id="print"/>
- <input t:type="submit" value="Create" t:id="create"/>
- </t:parameter>
- <t:parameter name="selectors">
-#set( $allSel = ${table.Selectors} )
- <ul>
-#foreach( $sel in $allSel )
-#if( $sel.Name != $selector.Name )
- <li><a t:type="pagelink" t:page="${table.Name}${sel.Name}">${sel.Name}</a></li>
-#end
-#end
- <li><a href="#nowhere-yet">ExternalReference</a></li>
- </ul>
- </t:parameter>
-
- <t:${engine.lowerFirst("$table.Name")}.Select selector="selector" selectedSettings="selectedSettings" />
-</t:selectlayout>
Modified: trunk/equanda-generate/src/main/velocity/t5gui.ini
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui.ini 2007-12-12 14:27:54 UTC (rev 199)
+++ trunk/equanda-generate/src/main/velocity/t5gui.ini 2007-12-12 14:51:57 UTC (rev 200)
@@ -53,10 +53,10 @@
// edit page
-output10=${outputDir}${packageDir}pages/${table}Edit.java
-template10=pages/Edit.java.vm
-output11=${outputDir}${packageDir}pages/${table}Edit.tml
-template11=pages/Edit.tml.vm
+output11=${outputDir}${packageDir}pages/${table}Edit.java
+template11=pages/Edit.java.vm
+output12=${outputDir}${packageDir}pages/${table}Edit.tml
+template12=pages/Edit.tml.vm
[select-not-hidden]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
