Removed MD5 for tabular file displays when the UNF is displayed. [ref #…

…2192 #1665 #2503 #2504 #2465]
IQSS · Sep 14, 2015 · e2781a8 · e2781a8
1 parent 72ca330
commit e2781a8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -857,7 +857,7 @@ file.MD5.exists.tip=A file with this MD5 already exists in the dataset.
 file.selectedThumbnail=Thumbnail
 file.selectedThumbnail.tip=The thumbnail for this file is used as the default thumbnail for the dataset. Click 'Advanced Options' button of another file to select that file.
 
-file.metaData.dataFile.dataTab.variables=Variables,
+file.metaData.dataFile.dataTab.variables=Variables
 file.metaData.dataFile.dataTab.observations=Observations
 file.metaData.viewOnWorldMap=View on WorldMap
 file.addDescription=Add file description...

diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
@@ -156,7 +156,7 @@
             </div>
             <!-- UNF + Variables, Obsersvations -->
             <div class="text-muted small" jsf:rendered="#{fileMetadata.dataFile.tabularData}">
-                <h:outputText id="fileNumVars" value="#{fileMetadata.dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']} " rendered="#{fileMetadata.dataFile.tabularData}"/>
+                <h:outputText id="fileNumVars" value="#{fileMetadata.dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']}, " rendered="#{fileMetadata.dataFile.tabularData}"/>
                 <h:outputText id="fileNumObs" value="#{fileMetadata.dataFile.dataTable.caseQuantity} #{bundle['file.metaData.dataFile.dataTab.observations']} #{!empty fileMetadata.dataFile.unf ? ' - ' : ''}" rendered="#{fileMetadata.dataFile.tabularData}"/>
                 <h:outputText id="fileUNF" value="#{fileMetadata.dataFile.unf}" rendered="#{!empty fileMetadata.dataFile.unf}"/>
             </div>

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -195,10 +195,16 @@
                                     <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(FilePage.fileMetadata.dataFile.id)}"/>
                                 </h:outputFormat>
 
-                                <div class="mD5-block">
+                                <div class="mD5-block" jsf:rendered="#{!FilePage.file.tabularData}">
                                     <h:outputText id="fileMD5" value="#{FilePage.file.tabularData ? bundle['file.MD5.origal'] : bundle['file.MD5']}: #{FilePage.file.md5};"
                                                   rendered="#{!(empty FilePage.file.md5)}"/>
                                 </div>
+
+                                <div class="text-muted" jsf:rendered="#{FilePage.file.tabularData}">
+                                    <h:outputText id="fileNumVars" value="#{FilePage.file.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']}, " rendered="#{FilePage.file.tabularData}"/>
+                                    <h:outputText id="fileNumObs" value="#{FilePage.file.dataTable.caseQuantity} #{bundle['file.metaData.dataFile.dataTab.observations']} #{!empty FilePage.file.unf ? ' - ' : ''}" rendered="#{FilePage.file.tabularData}"/>
+                                    <h:outputText id="fileUNF" value="#{FilePage.file.unf}" rendered="#{!empty FilePage.file.unf}"/>
+                                </div>
                             </div>
                         </div>
                         <div jsf:rendered="#{FilePage.fileMetadata.description}">
@@ -234,7 +240,7 @@
                                         </ui:remove>
                                         <div class="form-group" jsf:rendered="#{!(empty FilePage.file.md5)}">
                                             <label class="col-sm-3 control-label" for="metadata_md5">
-                                               #{bundle['file.metadataTab.fileMetadata.md5.label']}
+                                               #{FilePage.file.tabularData ? bundle['file.MD5.origal'] : bundle['file.MD5']}
                                             </label>
                                             <div class="col-sm-9">
                                                 <h:outputText value="#{FilePage.file.md5}"/>
@@ -264,6 +270,22 @@
                                                 <h:outputText value="#{FilePage.file.friendlyType}"/>
                                             </div>
                                         </div>
+                                        <div class="form-group" jsf:rendered="#{!(empty FilePage.file.dataTable.varQuantity)}">
+                                            <label class="col-sm-3 control-label" for="metadata_variables">
+                                               #{bundle['file.metaData.dataFile.dataTab.variables']}
+                                            </label>
+                                            <div class="col-sm-9">
+                                                <h:outputText value="#{FilePage.file.dataTable.varQuantity}"/>
+                                            </div>
+                                        </div>
+                                        <div class="form-group" jsf:rendered="#{!(empty FilePage.file.dataTable.caseQuantity)}">
+                                            <label class="col-sm-3 control-label" for="metadata_observations">
+                                               #{bundle['file.metaData.dataFile.dataTab.observations']}
+                                            </label>
+                                            <div class="col-sm-9">
+                                                <h:outputText value="#{FilePage.file.dataTable.caseQuantity}"/>
+                                            </div>
+                                        </div>
                                         <div class="form-group" jsf:rendered="#{!(empty FilePage.file.description)}">
                                             <label class="col-sm-3 control-label" for="metadata_description">
                                                #{bundle['file.metadataTab.fileMetadata.description.label']}

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -86,7 +86,7 @@
                                                    actionListener="#{DatasetPage.refreshCategoriesByName()}"
                                                    update=":datasetForm:fileTagsPopup"
                                                    oncomplete="fileTagsPopup.show();bind_bsui_components();">
-                                        #{bundle['file.editTags']}
+                                        Tags
                                     </p:commandLink>
                                 </li>
                             </ul>
@@ -303,13 +303,13 @@
                     <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDataFileId(fileMetadata.dataFile.id)}"/>
                 </h:outputFormat>
 
-                <div class="mD5-block">
-                    <h:outputText id="fileMD5" value="#{fileMetadata.dataFile.tabularData ? bundle['file.MD5.origal'] : bundle['file.MD5']}: #{fileMetadata.dataFile.md5};" rendered="#{!(empty fileMetadata.dataFile.md5) and ((DatasetPage.editMode != 'FILE' and DatasetPage.editMode != 'CREATE') or !DatasetPage.isDuplicate(fileMetadata))}"/>
+                <div class="mD5-block" jsf:rendered="#{!fileMetadata.dataFile.tabularData}">
+                    <h:outputText id="fileMD5" value="#{bundle['file.MD5']}: #{fileMetadata.dataFile.md5};" rendered="#{!(empty fileMetadata.dataFile.md5) and ((DatasetPage.editMode != 'FILE' and DatasetPage.editMode != 'CREATE') or !DatasetPage.isDuplicate(fileMetadata))}"/>
                 </div>
             </div>
             <!-- UNF + Variables, Obsersvations -->
             <div class="text-muted small" jsf:rendered="#{fileMetadata.dataFile.tabularData}">
-                <h:outputText id="fileNumVars" value="#{fileMetadata.dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']} " rendered="#{fileMetadata.dataFile.tabularData}"/>
+                <h:outputText id="fileNumVars" value="#{fileMetadata.dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']}, " rendered="#{fileMetadata.dataFile.tabularData}"/>
                 <h:outputText id="fileNumObs" value="#{fileMetadata.dataFile.dataTable.caseQuantity} #{bundle['file.metaData.dataFile.dataTab.observations']} #{!empty fileMetadata.dataFile.unf ? ' - ' : ''}" rendered="#{fileMetadata.dataFile.tabularData}"/>
                 <h:outputText id="fileUNF" value="#{fileMetadata.dataFile.unf}" rendered="#{!empty fileMetadata.dataFile.unf}"/>
             </div>