configurable appadmin graphs, thanks Jose

VERSION

@@ -1 +1 @@
-Version 2.4.1-alpha.2+timestamp.2013.01.27.09.58.34
+Version 2.4.1-alpha.2+timestamp.2013.01.27.10.24.17

applications/admin/controllers/appadmin.py

@@ -515,11 +515,32 @@ def table_template(table):
 
 
 def bg_graph_model():
-    graph = pgv.AGraph(layout='dot', directed=True, strict=False, rankdir='LR')
+    graph = pgv.AGraph(layout='dot',  directed=True,  strict=False,  rankdir='LR')
+    
+    subgraphs = dict()    
     for tablename in db.tables:
+        if hasattr(db[tablename],'_meta_graphmodel'):
+            meta_graphmodel = db[tablename]._meta_graphmodel
+        else:
+            meta_graphmodel = dict(group='Undefined', color='#ECECEC')
+        
+        group = meta_graphmodel['group'].replace(' ', '') 
+        if not subgraphs.has_key(group):
+            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
+            subgraphs[group]['tables'].append(tablename)
+        else:
+            subgraphs[group]['tables'].append(tablename)        
+      
         graph.add_node(tablename, name=tablename, shape='plaintext',
                        label=table_template(tablename))
     
+    for n, key in enumerate(subgraphs.iterkeys()):        
+        graph.subgraph(nbunch=subgraphs[key]['tables'],
+                    name='cluster%d' % n,
+                    style='filled',
+                    color=subgraphs[key]['meta']['color'],
+                    label=subgraphs[key]['meta']['group'])   
+
     for tablename in db.tables:
         for field in db[tablename]:
             f_type = field.type
@@ -532,7 +553,15 @@ def bg_graph_model():
                 graph.add_edge(n1, n2, color="#4C4C4C", label='')
 
     graph.layout()
-    return graph.draw(format='png', prog='dot')
+    #return graph.draw(format='png', prog='dot')
+    if not request.args:
+        return graph.draw(format='png', prog='dot')
+    else:       
+        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
+        if request.args(0) == 'dot':        
+            return graph.string()
+        else:
+            return graph.draw(format=request.args(0), prog='dot')
 
 def graph_model():    
     return dict(databases=databases, pgv=pgv)

applications/admin/views/appadmin.html

@@ -230,6 +230,20 @@
   {{elif not databases:}}
     {{=T("No databases in this application")}}
   {{else:}}	   
+    <div class="btn-group">
+      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+        <i class="icon-download"></i> {{=T('Save model as...')}}
+        <span class="caret"></span>
+      </a>
+      <ul class="dropdown-menu">
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>          
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>                                   
+      </ul>
+    </div>
+    <br />
     {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
   {{pass}}
 {{pass}}

applications/examples/controllers/appadmin.py

@@ -515,11 +515,32 @@ def table_template(table):
 
 
 def bg_graph_model():
-    graph = pgv.AGraph(layout='dot', directed=True, strict=False, rankdir='LR')
+    graph = pgv.AGraph(layout='dot',  directed=True,  strict=False,  rankdir='LR')
+    
+    subgraphs = dict()    
     for tablename in db.tables:
+        if hasattr(db[tablename],'_meta_graphmodel'):
+            meta_graphmodel = db[tablename]._meta_graphmodel
+        else:
+            meta_graphmodel = dict(group='Undefined', color='#ECECEC')
+        
+        group = meta_graphmodel['group'].replace(' ', '') 
+        if not subgraphs.has_key(group):
+            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
+            subgraphs[group]['tables'].append(tablename)
+        else:
+            subgraphs[group]['tables'].append(tablename)        
+      
         graph.add_node(tablename, name=tablename, shape='plaintext',
                        label=table_template(tablename))
     
+    for n, key in enumerate(subgraphs.iterkeys()):        
+        graph.subgraph(nbunch=subgraphs[key]['tables'],
+                    name='cluster%d' % n,
+                    style='filled',
+                    color=subgraphs[key]['meta']['color'],
+                    label=subgraphs[key]['meta']['group'])   
+
     for tablename in db.tables:
         for field in db[tablename]:
             f_type = field.type
@@ -532,7 +553,15 @@ def bg_graph_model():
                 graph.add_edge(n1, n2, color="#4C4C4C", label='')
 
     graph.layout()
-    return graph.draw(format='png', prog='dot')
+    #return graph.draw(format='png', prog='dot')
+    if not request.args:
+        return graph.draw(format='png', prog='dot')
+    else:       
+        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
+        if request.args(0) == 'dot':        
+            return graph.string()
+        else:
+            return graph.draw(format=request.args(0), prog='dot')
 
 def graph_model():    
     return dict(databases=databases, pgv=pgv)

applications/examples/views/appadmin.html

@@ -230,6 +230,20 @@
   {{elif not databases:}}
     {{=T("No databases in this application")}}
   {{else:}}	   
+    <div class="btn-group">
+      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+        <i class="icon-download"></i> {{=T('Save model as...')}}
+        <span class="caret"></span>
+      </a>
+      <ul class="dropdown-menu">
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>          
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>                                   
+      </ul>
+    </div>
+    <br />
     {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
   {{pass}}
 {{pass}}

applications/welcome/controllers/appadmin.py

@@ -515,11 +515,32 @@ def table_template(table):
 
 
 def bg_graph_model():
-    graph = pgv.AGraph(layout='dot', directed=True, strict=False, rankdir='LR')
+    graph = pgv.AGraph(layout='dot',  directed=True,  strict=False,  rankdir='LR')
+    
+    subgraphs = dict()    
     for tablename in db.tables:
+        if hasattr(db[tablename],'_meta_graphmodel'):
+            meta_graphmodel = db[tablename]._meta_graphmodel
+        else:
+            meta_graphmodel = dict(group='Undefined', color='#ECECEC')
+        
+        group = meta_graphmodel['group'].replace(' ', '') 
+        if not subgraphs.has_key(group):
+            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
+            subgraphs[group]['tables'].append(tablename)
+        else:
+            subgraphs[group]['tables'].append(tablename)        
+      
         graph.add_node(tablename, name=tablename, shape='plaintext',
                        label=table_template(tablename))
     
+    for n, key in enumerate(subgraphs.iterkeys()):        
+        graph.subgraph(nbunch=subgraphs[key]['tables'],
+                    name='cluster%d' % n,
+                    style='filled',
+                    color=subgraphs[key]['meta']['color'],
+                    label=subgraphs[key]['meta']['group'])   
+
     for tablename in db.tables:
         for field in db[tablename]:
             f_type = field.type
@@ -532,7 +553,15 @@ def bg_graph_model():
                 graph.add_edge(n1, n2, color="#4C4C4C", label='')
 
     graph.layout()
-    return graph.draw(format='png', prog='dot')
+    #return graph.draw(format='png', prog='dot')
+    if not request.args:
+        return graph.draw(format='png', prog='dot')
+    else:       
+        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
+        if request.args(0) == 'dot':        
+            return graph.string()
+        else:
+            return graph.draw(format=request.args(0), prog='dot')
 
 def graph_model():    
     return dict(databases=databases, pgv=pgv)

applications/welcome/views/appadmin.html

@@ -230,6 +230,20 @@
   {{elif not databases:}}
     {{=T("No databases in this application")}}
   {{else:}}	   
+    <div class="btn-group">
+      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+        <i class="icon-download"></i> {{=T('Save model as...')}}
+        <span class="caret"></span>
+      </a>
+      <ul class="dropdown-menu">
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>          
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>                                   
+      </ul>
+    </div>
+    <br />
     {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
   {{pass}}
 {{pass}}