Update diagram

diff --git a/tests/server/diagram/timeside.dot b/tests/server/diagram/timeside.dot
index 98bda6fb7b91036686c7b5ef1ef849d176ac2c53..2f044819ded189bcc41ea21d866343b95c026e29 100644 (file)
--- a/tests/server/diagram/timeside.dot
+++ b/tests/server/diagram/timeside.dot
@@ -17,71 +17,71 @@ digraph model_graph {
 
 
 
-  timeside_models_BaseResource [label=<
+  timeside_models_DocBaseResource [label=<
     <TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
     <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
     <FONT FACE="Helvetica Bold" COLOR="white">
-    BaseResource
+    DocBaseResource<BR/>&lt;<FONT FACE="Helvetica Italic">BaseResource</FONT>&gt;
     </FONT></TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">date_added</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">date_added</FONT>
     </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">DateTimeField</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">DateTimeField</FONT>
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">date_modified</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">date_modified</FONT>
     </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">DateTimeField</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">DateTimeField</FONT>
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">uuid</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">description</FONT>
+    </TD><TD ALIGN="LEFT">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">TextField</FONT>
+    </TD></TR>
+  
+    <TR><TD ALIGN="LEFT" BORDER="0">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">title</FONT>
     </TD><TD ALIGN="LEFT">
     <FONT COLOR="#7B7B7B" FACE="Helvetica ">CharField</FONT>
     </TD></TR>
   
+    <TR><TD ALIGN="LEFT" BORDER="0">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">uuid</FONT>
+    </TD><TD ALIGN="LEFT">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">CharField</FONT>
+    </TD></TR>
+  
     </TABLE>
     >]
 
-  timeside_models_DocBaseResource [label=<
+  timeside_models_BaseResource [label=<
     <TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
     <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
     <FONT FACE="Helvetica Bold" COLOR="white">
-    DocBaseResource<BR/>&lt;<FONT FACE="Helvetica Italic">BaseResource</FONT>&gt;
+    BaseResource
     </FONT></TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">date_added</FONT>
-    </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">DateTimeField</FONT>
-    </TD></TR>
-  
-    <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">date_modified</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">date_added</FONT>
     </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">DateTimeField</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">DateTimeField</FONT>
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">description</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">date_modified</FONT>
     </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">TextField</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">DateTimeField</FONT>
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">title</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">uuid</FONT>
     </TD><TD ALIGN="LEFT">
     <FONT COLOR="#7B7B7B" FACE="Helvetica ">CharField</FONT>
     </TD></TR>
   
-    <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">uuid</FONT>
-    </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Italic">CharField</FONT>
-    </TD></TR>
-  
     </TABLE>
     >]
 
@@ -263,7 +263,7 @@ digraph model_graph {
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">is_preset</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">is_public</FONT>
     </TD><TD ALIGN="LEFT">
     <FONT COLOR="#7B7B7B" FACE="Helvetica ">BooleanField</FONT>
     </TD></TR>
@@ -311,6 +311,40 @@ digraph model_graph {
     </TABLE>
     >]
 
+  timeside_models_Preset [label=<
+    <TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+    <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
+    <FONT FACE="Helvetica Bold" COLOR="white">
+    Preset
+    </FONT></TD></TR>
+  
+    <TR><TD ALIGN="LEFT" BORDER="0">
+    <FONT FACE="Helvetica Bold">id</FONT>
+    </TD><TD ALIGN="LEFT">
+    <FONT FACE="Helvetica Bold">AutoField</FONT>
+    </TD></TR>
+  
+    <TR><TD ALIGN="LEFT" BORDER="0">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Bold">processor</FONT>
+    </TD><TD ALIGN="LEFT">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Bold">ForeignKey (id)</FONT>
+    </TD></TR>
+  
+    <TR><TD ALIGN="LEFT" BORDER="0">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">is_public</FONT>
+    </TD><TD ALIGN="LEFT">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">BooleanField</FONT>
+    </TD></TR>
+  
+    <TR><TD ALIGN="LEFT" BORDER="0">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">parameters</FONT>
+    </TD><TD ALIGN="LEFT">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">TextField</FONT>
+    </TD></TR>
+  
+    </TABLE>
+    >]
+
   timeside_models_Result [label=<
     <TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
     <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
@@ -331,7 +365,7 @@ digraph model_graph {
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Bold">parameters</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica Bold">preset</FONT>
     </TD><TD ALIGN="LEFT">
     <FONT COLOR="#7B7B7B" FACE="Helvetica Bold">ForeignKey (id)</FONT>
     </TD></TR>
@@ -381,40 +415,6 @@ digraph model_graph {
     </TABLE>
     >]
 
-  timeside_models_Parameters [label=<
-    <TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
-    <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
-    <FONT FACE="Helvetica Bold" COLOR="white">
-    Parameters
-    </FONT></TD></TR>
-  
-    <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT FACE="Helvetica Bold">id</FONT>
-    </TD><TD ALIGN="LEFT">
-    <FONT FACE="Helvetica Bold">AutoField</FONT>
-    </TD></TR>
-  
-    <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Bold">processor</FONT>
-    </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica Bold">ForeignKey (id)</FONT>
-    </TD></TR>
-  
-    <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">is_preset</FONT>
-    </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">BooleanField</FONT>
-    </TD></TR>
-  
-    <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">parameters</FONT>
-    </TD><TD ALIGN="LEFT">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">TextField</FONT>
-    </TD></TR>
-  
-    </TABLE>
-    >]
-
   timeside_models_Task [label=<
     <TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
     <TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
@@ -501,8 +501,8 @@ digraph model_graph {
   timeside_models_Experience -> django_contrib_auth_models_User
   [label="author (experiences)"] [arrowhead=none, arrowtail=dot, dir=both];
 
-  timeside_models_Experience -> timeside_models_Processor
-  [label="processors (experiences)"] [arrowhead=dot arrowtail=dot, dir=both];
+  timeside_models_Experience -> timeside_models_Preset
+  [label="presets (experiences)"] [arrowhead=dot arrowtail=dot, dir=both];
 
   timeside_models_Experience -> timeside_models_Experience
   [label="experiences (other_experiences)"] [arrowhead=dot arrowtail=dot, dir=both];
@@ -510,18 +510,18 @@ digraph model_graph {
   timeside_models_Experience -> timeside_models_DocBaseResource
   [label="abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
 
+  timeside_models_Preset -> timeside_models_Processor
+  [label="processor (preset)"] [arrowhead=none, arrowtail=dot, dir=both];
+
   timeside_models_Result -> timeside_models_Item
   [label="item (results)"] [arrowhead=none, arrowtail=dot, dir=both];
 
-  timeside_models_Result -> timeside_models_Parameters
-  [label="parameters (results)"] [arrowhead=none, arrowtail=dot, dir=both];
+  timeside_models_Result -> timeside_models_Preset
+  [label="preset (results)"] [arrowhead=none, arrowtail=dot, dir=both];
 
   timeside_models_Result -> timeside_models_BaseResource
   [label="abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both];
 
-  timeside_models_Parameters -> timeside_models_Processor
-  [label="processor (parameters)"] [arrowhead=none, arrowtail=dot, dir=both];
-
   timeside_models_Task -> timeside_models_Experience
   [label="experience (task)"] [arrowhead=none, arrowtail=dot, dir=both];
 

diff --git a/tests/server/diagram/timeside.pdf b/tests/server/diagram/timeside.pdf
index 69293f228f3eed570842e0e6ecb81fae08e4782c..9f72baeb459846e55d64d1d52e5329de3d81c386 100644 (file)
Binary files a/tests/server/diagram/timeside.pdf and b/tests/server/diagram/timeside.pdf differ