(#2833) Add email addresses to Waiting for Approval page

Also fix icon alignment

Author: squaregoldfish

WebApp/WebContent/dataset/for_approval_list.xhtml

@@ -173,7 +173,9 @@
            <f:facet name="header">
              <h:outputText value="Owner" />
            </f:facet>
-           <h:outputText value="#{dataSetsBean.getOwnerName(dataset)}" />
+           <h:outputText value="#{dataSetsBean.getOwnerName(dataset)}"/>
+           <br/>
+           (<h:outputText value="#{dataSetsBean.getOwnerEmail(dataset)}"/>)
          </p:column>
          <p:column>
            <f:facet name="header">
@@ -218,12 +220,16 @@
                      title="Sensor Offsets" />
                  </p:commandLink>
                </ui:fragment>
-                <ui:fragment rendered="#{not dataset.instrument.fixedPosition()}">
-                  <p:commandLink onclick="goToPositionQc(#{dataset.id})">
-                    <h:graphicImage value="/resources/image/position.svg"
-                      styleClass="actionIcon" alt="Position QC" title="Position QC" />
-                  </p:commandLink>
-                </ui:fragment>
+              <ui:fragment rendered="#{not dataset.instrument.hasSensorGroups()}">
+                <h:graphicImage value="/resources/image/spacer.svg" alt="" title=""
+                  styleClass="actionIcon"/>
+              </ui:fragment>
+               <ui:fragment rendered="#{not dataset.instrument.fixedPosition()}">
+                 <p:commandLink onclick="goToPositionQc(#{dataset.id})">
+                   <h:graphicImage value="/resources/image/position.svg"
+                     styleClass="actionIcon" alt="Position QC" title="Position QC" />
+                 </p:commandLink>
+               </ui:fragment>
               <ui:fragment rendered="#{dataset.instrument.fixedPosition()}">
                 <h:graphicImage value="/resources/image/spacer.svg" alt="" title=""
                   styleClass="actionIcon"/>

WebApp/src/uk/ac/exeter/QuinCe/web/datasets/DataSetsBean.java

@@ -583,6 +583,11 @@ public String getOwnerName(DataSet dataSet) {
     return owner.getSurname() + ", " + owner.getGivenName();
   }
 
+  public String getOwnerEmail(DataSet dataSet) {
+    return getInstrument(dataSet.getInstrumentId()).getOwner()
+      .getEmailAddress();
+  }
+
   private void setCurrentView(String view) {
     getSession().setAttribute(CURRENT_VIEW_ATTR, view);
   }