[Equanda-svn-commit] SF.net SVN: equanda: [204] trunk/equanda-generate/src/main

[<tri...@us...>]

Revision: 204
          http://equanda.svn.sourceforge.net/equanda/?rev=204&view=rev
Author:   triathlon98
Date:     2007-12-14 00:35:37 -0800 (Fri, 14 Dec 2007)

Log Message:
-----------
EQ-99 more fixes in generation

Modified Paths:
--------------
    trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
    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/pages.tml.vm
    trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
    trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm

Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java	2007-12-13 21:45:10 UTC (rev 203)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java	2007-12-14 08:35:37 UTC (rev 204)
@@ -914,6 +914,49 @@
     }
 
     /**
+     * Get type used to template specification (specific)
+     *
+     * @return java field type
+     */
+    public String getT5guiSpecificType()
+    {
+        switch ( type )
+        {
+            case TYPE_STRING:
+                return "type.string";
+            case TYPE_BOOLEAN:
+                return "type.boolean";
+            case TYPE_DATE:
+                return "type.date";
+            case TYPE_TIMESTAMP:
+                return "type.timestamp";
+            case TYPE_INT:
+                return "type.int";
+            case TYPE_DOUBLE:
+                return "type.double";
+            case TYPE_BLOB:
+                return "type.blob";
+            case TYPE_CLOB:
+                return "type.clob";
+            case TYPE_LINK:
+                return multiple ? "type.link." + linkTable + ".list" : "type.link." + linkTableName + ".one";
+            default:
+                return "Unknown";
+        }
+    }
+
+    /**
+     * Get type used to template specification (generic)
+     *
+     * @return java field type
+     */
+    public String getT5guiGenericType()
+    {
+        if ( type == TYPE_LINK ) return multiple ? "type.link.list" : "type.link.one";
+        return "";
+    }
+
+    /**
      * Get wrapping field type for field
      *
      * @return java wrapping field type
@@ -1693,7 +1736,7 @@
                 if ( sroot != null ) sroot.addSuggestSelect( suggest.getField() );
             }
         }
-        if ( !(isString() || isClob()) && ( ( isReference() || isDescription() ) ) )
+        if ( !( isString() || isClob() ) && ( ( isReference() || isDescription() ) ) )
         {
             err( "only string or clob fields can be is-reference or is-description" );
         }

Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm	2007-12-13 21:45:10 UTC (rev 203)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm	2007-12-14 08:35:37 UTC (rev 204)
@@ -3,17 +3,8 @@
 #set( $renderfirst = "" )
 ## no yet #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.FieldType}.list" )
-    #set( $generictype = "type.link.list" )
-#else
-    #set( $specifictype = "type.${field.FieldType}.one" )
-    #set( $generictype = "type.link.one" )
-#end
-#end
+#set( $specifictype = "${field.T5guiSpecificType}" )
+#set( $generictype = "${field.T5guiGenericType}" )
 #render( "$renderfirst" "field.${field.Name}" "$specifictype" "$generictype" )
 <br/></div>
 #end

Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm	2007-12-13 21:45:10 UTC (rev 203)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm	2007-12-14 08:35:37 UTC (rev 204)
@@ -1,5 +1,5 @@
 #if( !$group.isHidden() )
-#if( "x$group.Renderer" != "x" )
+#if( "x$!group.Renderer" != "x" )
 #render( "$group.Renderer" "" "" "" )
 #else
 <fieldset>

Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm	2007-12-13 21:45:10 UTC (rev 203)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm	2007-12-14 08:35:37 UTC (rev 204)
@@ -1,6 +1,6 @@
 <span t:type="equanda/Tabs">
 ## page titles
-#set( $pageindex = "1" )
+#set( $pageindex = 1 )
 #foreach( $page in $table.Pages )
 #if( !$page.isHidden() )
 #if( $page.Name != "ALL" )
@@ -13,8 +13,27 @@
 #end## foreach page
 
 ## page contents
-#set( $pageindex = "1" )
+#set( $pageindex = 1 )
 #foreach( $page in $table.Pages )
 #render( "page" "" "" "" )
 #end
+
+    <t:parameter name="title$pageindex">Metadata</t:parameter>
+    <t:parameter name="content$pageindex">
+        <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>

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-13 21:45:10 UTC (rev 203)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm	2007-12-14 08:35:37 UTC (rev 204)
@@ -17,7 +17,7 @@
 #foreach( $select in $table.LinkedSelects )
             <li><a href="nowhere">Find By $select.Name</a></li>
 #end
-        <ul>
+        </ul>
         <hr/>
 #end
 #if( !$table.MoreLinkedSelects.isEmpty() )

Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm	2007-12-13 21:45:10 UTC (rev 203)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm	2007-12-14 08:35:37 UTC (rev 204)
@@ -1,7 +1,7 @@
 <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>
+        <title>${table.Name}, ${select.Name}</title>
     </t:parameter>
     <t:parameter name="context">
         <span id="context">context info</span>
@@ -15,7 +15,7 @@
 #set( $allSel = ${table.Selectors} )
         <ul>
 #foreach( $sel in $allSel )
-#if( $sel.Name != $selector.Name )
+#if( $sel.Name != $select.Name )
             <li><a t:type="pagelink" t:page="${table.Name}${sel.Name}">${sel.Name}</a></li>
 #end
 #end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.