Data, data, everywhere!

devopsgroup-io · Jun 20, 2017 · ccf47be · ccf47be
1 parent d4a27b4
commit ccf47be
Show file tree

Hide file tree

Showing 38 changed files with 94 additions and 96 deletions.
diff --git a/README.md b/README.md
diff --git a/data/4ventavis.com.png b/data/4ventavis.com.png
diff --git a/data/adcirca.com.png b/data/adcirca.com.png
diff --git a/data/arava.com.png b/data/arava.com.png
diff --git a/data/bevespi.com.png b/data/bevespi.com.png
diff --git a/data/celebrex.com.png b/data/celebrex.com.png
diff --git a/data/crestor.com.png b/data/crestor.com.png
diff --git a/data/cyramza.com.png b/data/cyramza.com.png
diff --git a/data/daliresp.com.png b/data/daliresp.com.png
diff --git a/data/enbrel.com.png b/data/enbrel.com.png
diff --git a/data/erbitux.com.png b/data/erbitux.com.png
diff --git a/data/exelonpatch.com.png b/data/exelonpatch.com.png
diff --git a/data/gliadel.com-patient.png b/data/gliadel.com-patient.png
diff --git a/data/humira.com.png b/data/humira.com.png
diff --git a/data/kevzara.com.png b/data/kevzara.com.png
diff --git a/data/letairis.com.png b/data/letairis.com.png
diff --git a/data/lipitor.com.png b/data/lipitor.com.png
diff --git a/data/livalorx.com.png b/data/livalorx.com.png
diff --git a/data/mysymbicort.com.png b/data/mysymbicort.com.png
diff --git a/data/namenda.com.png b/data/namenda.com.png
diff --git a/data/namzaric.com.png b/data/namzaric.com.png
diff --git a/data/opsumit.com.png b/data/opsumit.com.png
diff --git a/data/orencia.bmscustomerconnect.com.png b/data/orencia.bmscustomerconnect.com.png
diff --git a/data/orenitram.com.png b/data/orenitram.com.png
diff --git a/data/remicade.com-rheumatoid-arthritis.png b/data/remicade.com-rheumatoid-arthritis.png
diff --git a/data/remodulin.com.png b/data/remodulin.com.png
diff --git a/data/repatha.com.png b/data/repatha.com.png
diff --git a/data/revatio.com.png b/data/revatio.com.png
diff --git a/data/startwithanoro.com.png b/data/startwithanoro.com.png
diff --git a/data/stivarga-us.com.png b/data/stivarga-us.com.png
diff --git a/data/tracleer.com.png b/data/tracleer.com.png
diff --git a/data/tyvaso.com.png b/data/tyvaso.com.png
diff --git a/data/uptravi.com.png b/data/uptravi.com.png
diff --git a/data/us.afinitor.com-sega-tuberous-sclerosis.png b/data/us.afinitor.com-sega-tuberous-sclerosis.png
diff --git a/data/veletri.com.png b/data/veletri.com.png
diff --git a/data/vimovo.com.png b/data/vimovo.com.png
diff --git a/data/zaltrap.com.png b/data/zaltrap.com.png
diff --git a/moai.py b/moai.py
@@ -514,12 +514,11 @@ def dict_constructor(loader, node):
     print('\n' + indication + '\n==============================').upper()
 
     content += '\n<tr>'
-    content += '<td colspan="8"><strong>' + str(indication) + '</strong></td>'
+    content += '<td colspan="7"><strong>' + str(indication) + '</strong></td>'
     content += '</tr>'
     content += '\n<tr>'
-    content += '<td>Drug<br/>generic<br/>company</td>'
-    content += '<td><img src="https://placehold.it/15/cc4c02?text=+"> Regulatory code</td>'
-    content += '<td><img src="https://placehold.it/15/fe9929?text=+"> HTTPS<br/><img src="https://placehold.it/15/fee391?text=+"> server<br/><img src="https://placehold.it/15/ffffe5?text=+"> ASN</td>'
+    content += '<td>Drug<br/>Generic<br/>Company<br/><img src="https://placehold.it/15/cc4c02?text=+"> Regulatory code</td>'
+    content += '<td><img src="https://placehold.it/15/fe9929?text=+"> HTTPS<br/><img src="https://placehold.it/15/fee391?text=+"> Server<br/><img src="https://placehold.it/15/ffffe5?text=+"> ASN</td>'
     content += '<td>:iphone:<br/><img src="https://placehold.it/15/014636?text=+"></td>'
     content += '<td>:wheelchair:<br/><img src="https://placehold.it/15/016c59?text=+"></td>'
     content += '<td>:computer:<br/><img src="https://placehold.it/15/02818a?text=+"></td>'
@@ -533,7 +532,7 @@ def dict_constructor(loader, node):
         print('\n' + website + '\n------------------------------').upper()
 
         # set the figure size
-        ax = plt.figure(figsize=(18,1), dpi=60)
+        ax = plt.figure(figsize=(20,1), dpi=60)
         # set the font size
         matplotlib.rcParams.update({'font.size': 8})
         # qualitative color palette picker
@@ -682,8 +681,7 @@ def dict_constructor(loader, node):
                 break
 
         content += '\n<tr>'
-        content += '<td><a href="http://{0}" target="_blank">{0}</a><br/><sub>{1}</sub><br/><sub>{2}</sub></td>'.format( website , data[indication][website]['drug']['generic'] , data[indication][website]['drug']['company'] )
-        content += '<td><sub>{0}</sub></td>'.format( code )
+        content += '<td><a href="http://{0}" target="_blank">{0}</a><br/><sub>{1}</sub><br/><sub>{2}</sub><br/><sub>{3}</sub></td>'.format( website , data[indication][website]['drug']['generic'] , data[indication][website]['drug']['company'] , code )
         content += '<td><a href="https://www.ssllabs.com/ssltest/analyze.html?d={0}" target="_blank">{1}</a><br/><sub>{2}</sub><br/><sub>{3}</sub></td>'.format( website , https, server, asn )
         content += '<td><a href="https://developers.google.com/speed/pagespeed/insights/?url={0}&tab=mobile" target="_blank"><sub>{1}</sub></a></td>'.format( website , google_psi_mobile )
         content += '<td><a href="https://developers.google.com/speed/pagespeed/insights/?url={0}&tab=mobile" target="_blank"><sub>{1}</sub></a></td>'.format( website , google_psi_mobile_usability )
@@ -692,7 +690,7 @@ def dict_constructor(loader, node):
         content += '<td><sub>{0}</sub></td>'.format( moz_rank )
         content += '</tr>'
         content += '\n<tr>'
-        content += '<td colspan="8"><img src="data/{0}.png"/></td>'.format( website.replace("/","-") )
+        content += '<td colspan="7"><img src="data/{0}.png"/></td>'.format( website.replace("/","-") )
         content += '</tr>'
 
 content += '\n</table>'