From ea9df81aa834d976c77579ba06011e984c776325 Mon Sep 17 00:00:00 2001
From: Nathan Dunn <ndunn@me.com>
Date: Wed, 14 Nov 2018 11:59:45 +0100
Subject: [PATCH] added internal ID

---
 .../bbop/apollo/gwt/client/OrganismPanel.java |  5 +++-
 .../apollo/gwt/client/OrganismPanel.ui.xml    | 29 ++++++++++++++-----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/gwt/org/bbop/apollo/gwt/client/OrganismPanel.java b/src/gwt/org/bbop/apollo/gwt/client/OrganismPanel.java
index d6415b6836..2dbf7dab81 100644
--- a/src/gwt/org/bbop/apollo/gwt/client/OrganismPanel.java
+++ b/src/gwt/org/bbop/apollo/gwt/client/OrganismPanel.java
@@ -78,6 +78,8 @@ interface OrganismBrowserPanelUiBinder extends UiBinder<Widget, OrganismPanel> {
     WebApolloSimplePager pager = new WebApolloSimplePager(WebApolloSimplePager.TextLocation.CENTER);
     @UiField
     TextBox nonDefaultTranslationTable;
+    @UiField
+    org.gwtbootstrap3.client.ui.Label organismIdLabel;
 
     boolean creatingNewOrganism = false; // a special flag for handling the clearSelection event when filling out new organism info
     boolean savingNewOrganism = false; // a special flag for handling the clearSelection event when filling out new organism info
@@ -134,7 +136,6 @@ public String asString() {
             }
         });
         dataGrid.addColumn(sequenceColumn, safeHtmlHeader);
-//        dataGrid.addColumn(sequenceColumn, "Ref Sequences");
         dataGrid.setEmptyTableWidget(new Label("No organisms available. Add new organisms using the form field."));
 
 
@@ -226,6 +227,8 @@ public void loadOrganismInfo(OrganismInfo organismInfo) {
         publicMode.setValue(organismInfo.getPublicMode());
         publicMode.setEnabled(isEditable);
 
+        organismIdLabel.setHTML("Internal ID: " +organismInfo.getId());
+
         nonDefaultTranslationTable.setText(organismInfo.getNonDefaultTranslationTable());
         nonDefaultTranslationTable.setEnabled(isEditable);
 
diff --git a/src/gwt/org/bbop/apollo/gwt/client/OrganismPanel.ui.xml b/src/gwt/org/bbop/apollo/gwt/client/OrganismPanel.ui.xml
index 6953183032..478c9a3d33 100644
--- a/src/gwt/org/bbop/apollo/gwt/client/OrganismPanel.ui.xml
+++ b/src/gwt/org/bbop/apollo/gwt/client/OrganismPanel.ui.xml
@@ -3,7 +3,7 @@
              xmlns:b="urn:import:org.gwtbootstrap3.client.ui"
              xmlns:cellview="urn:import:com.google.gwt.user.cellview.client"
              xmlns:wa="urn:import:org.bbop.apollo.gwt.client"
-        >
+>
     <ui:style>
 
         .widgetPanel {
@@ -15,6 +15,7 @@
             margin-top: 10px;
             vertical-align: middle;
         }
+
         .container {
             margin-left: 10px;
             margin-top: 10px;
@@ -24,13 +25,17 @@
             margin-left: 0px;
             margin-right: 10px;
         }
+
         .pager {
             width: 100%;
             margin-left: auto;
             margin-right: auto;
         }
-        .inline-button{
+
+        .inline-button {
             display: inline;
+            margin-left: 5px;
+            margin-right: 5px;
         }
 
     </ui:style>
@@ -94,17 +99,27 @@
                             <b:Column size="XS_12" styleName="{style.widgetPanel}">
                                 <b:InputGroup>
                                     <b:InputGroupAddon>Non-default Translation Table</b:InputGroupAddon>
-                                    <b:TextBox autoComplete="false" ui:field="nonDefaultTranslationTable" enabled="false"/>
+                                    <b:TextBox autoComplete="false" ui:field="nonDefaultTranslationTable"
+                                               enabled="false"/>
                                 </b:InputGroup>
                             </b:Column>
                         </b:Row>
                         <b:Row styleName="{style.row}">
                             <b:Column size="XS_12" styleName="{style.widgetPanel}">
                                 <b:Button ui:field="newButton" text="Add New Organism" enabled="true"/>
-                                <b:Button ui:field="deleteButton" text="Delete Organism" visible="false"/>
-                                <b:Button ui:field="createButton" text="Save New Organism" visible="false"/>
-                                <b:Button ui:field="cancelButton" text="Cancel" visible="false"/>
-                                <b:CheckBox ui:field="publicMode" text="Public" enabled="true" />
+                                <b:Button ui:field="deleteButton" text="Delete Organism" visible="false"
+                                          styleName="{style.inline-button}"
+                                />
+                                <b:Button ui:field="createButton" text="Save New Organism" visible="false"
+                                          styleName="{style.inline-button}"
+                                />
+                                <b:Button ui:field="cancelButton" text="Cancel" visible="false"
+                                          styleName="{style.inline-button}"
+                                />
+                                <b:CheckBox ui:field="publicMode" text="Public" enabled="true"
+                                            styleName="{style.inline-button}"
+                                />
+                                <b:Label ui:field="organismIdLabel"/>
                             </b:Column>
                         </b:Row>
                     </b:Container>