From 1fcb22623d5b2f8162c992e7bd98131a82a12400 Mon Sep 17 00:00:00 2001 From: shalul <114448224+shalul@users.noreply.github.com> Date: Fri, 19 Apr 2024 19:28:32 -0400 Subject: [PATCH 1/3] Update ListTypeExcelExporter.java --- .../java/net/geoprism/registry/excel/ListTypeExcelExporter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java b/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java index bf5c905d8..5d5336352 100644 --- a/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java +++ b/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java @@ -269,8 +269,6 @@ private void createMetadataSheet(Workbook workbook) if (this.metadataSource == null || this.metadataSource.equals(ListMetadataSource.LIST)) { this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTORIGINATOR, this.version.getListOriginator()); - this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTLABEL, this.version.getListLabel().getValue()); - this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTDESCRIPTION, this.version.getListDescription().getValue()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTPROCESS, this.version.getListProcess().getValue()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTPROGRESS, this.version.getListProgress()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTACCESSCONSTRAINTS, this.version.getListAccessConstraints().getValue()); From ddc778879c1dec805c7257ed04e53b0edcae31da Mon Sep 17 00:00:00 2001 From: shalul <114448224+shalul@users.noreply.github.com> Date: Fri, 26 Apr 2024 18:36:18 -0400 Subject: [PATCH 2/3] Update ListTypeExcelExporter.java Commented out the label and code so it doesn't show in the display. In addition, it seems as though the developer has missed the .getValue on progress, which is why it may not have been showing. We have added those. --- .../net/geoprism/registry/excel/ListTypeExcelExporter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java b/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java index 5d5336352..4c5b979c0 100644 --- a/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java +++ b/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java @@ -261,8 +261,8 @@ private void createMetadataSheet(Workbook workbook) int rowNumber = 0; - this.createRow(sheet, locale, metadata, rowNumber++, ListType.DISPLAYLABEL, this.list.getDisplayLabel().getValue()); - this.createRow(sheet, locale, metadata, rowNumber++, ListType.CODE, this.list.getCode()); + //this.createRow(sheet, locale, metadata, rowNumber++, ListType.DISPLAYLABEL, this.list.getDisplayLabel().getValue()); + //this.createRow(sheet, locale, metadata, rowNumber++, ListType.CODE, this.list.getCode()); this.createRow(sheet, rowNumber++, LocalizationFacade.localize("masterlist.publishDate"), stripTime(this.version.getPublishDate())); this.createRow(sheet, rowNumber++, LocalizationFacade.localize("masterlist.forDate"), stripTime(this.version.getForDate())); @@ -270,7 +270,7 @@ private void createMetadataSheet(Workbook workbook) { this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTORIGINATOR, this.version.getListOriginator()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTPROCESS, this.version.getListProcess().getValue()); - this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTPROGRESS, this.version.getListProgress()); + this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTPROGRESS, this.version.getListProgress().getValue()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTACCESSCONSTRAINTS, this.version.getListAccessConstraints().getValue()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTUSECONSTRAINTS, this.version.getListUseConstraints().getValue()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTDISCLAIMER, this.version.getListDisclaimer().getValue()); From 9639306b2f1a8414ddaec4ed82d867655b76e6f0 Mon Sep 17 00:00:00 2001 From: elijahcantu Date: Fri, 26 Apr 2024 19:50:46 -0400 Subject: [PATCH 3/3] Revert "Update ListTypeExcelExporter.java" This reverts commit 1fcb22623d5b2f8162c992e7bd98131a82a12400. --- .../java/net/geoprism/registry/excel/ListTypeExcelExporter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java b/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java index 4c5b979c0..8b8d37358 100644 --- a/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java +++ b/georegistry-server/src/main/java/net/geoprism/registry/excel/ListTypeExcelExporter.java @@ -269,6 +269,8 @@ private void createMetadataSheet(Workbook workbook) if (this.metadataSource == null || this.metadataSource.equals(ListMetadataSource.LIST)) { this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTORIGINATOR, this.version.getListOriginator()); + this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTLABEL, this.version.getListLabel().getValue()); + this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTDESCRIPTION, this.version.getListDescription().getValue()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTPROCESS, this.version.getListProcess().getValue()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTPROGRESS, this.version.getListProgress().getValue()); this.createRowForMetadata(sheet, locale, rowNumber++, ListTypeVersion.LISTACCESSCONSTRAINTS, this.version.getListAccessConstraints().getValue());