Skip to content

Commit 65507d8

Browse files
Show helper box only in the header cells of all sample and measurement excel templates (#978)
* Remove helperbox from all cells except cells in header row * Remove unnecessary semi colon
1 parent 411491f commit 65507d8

6 files changed

+2
-73
lines changed

user-interface/src/main/java/life/qbic/datamanager/templates/measurement/NGSMeasurementEditTemplate.java

-12
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,6 @@ public byte[] getContent() {
189189
DEFAULT_GENERATED_ROW_COUNT - 1,
190190
sequencingReadTypeArea);
191191

192-
for (NGSMeasurementEditColumn column : NGSMeasurementEditColumn.values()) {
193-
column.getFillHelp().ifPresent(
194-
helper -> XLSXTemplateHelper.addInputHelper(sheet,
195-
column.columnIndex(),
196-
startIndex,
197-
column.columnIndex(),
198-
DEFAULT_GENERATED_ROW_COUNT - 1,
199-
helper.exampleValue(),
200-
helper.description())
201-
);
202-
}
203-
204192
setAutoWidth(sheet);
205193
workbook.setActiveSheet(0);
206194

user-interface/src/main/java/life/qbic/datamanager/templates/measurement/NGSMeasurementRegisterTemplate.java

-11
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,6 @@ public byte[] getContent() {
122122
DEFAULT_GENERATED_ROW_COUNT - 1,
123123
sequencingReadTypeArea);
124124

125-
for (NGSMeasurementRegisterColumn column : NGSMeasurementRegisterColumn.values()) {
126-
column.getFillHelp().ifPresent(
127-
helper -> XLSXTemplateHelper.addInputHelper(sheet,
128-
column.columnIndex(),
129-
startIndex,
130-
column.columnIndex(),
131-
DEFAULT_GENERATED_ROW_COUNT - 1,
132-
helper.exampleValue(),
133-
helper.description()));
134-
}
135-
136125
// add property information order of columns matters!!
137126
for (NGSMeasurementRegisterColumn column : Arrays.stream(
138127
NGSMeasurementRegisterColumn.values())

user-interface/src/main/java/life/qbic/datamanager/templates/measurement/ProteomicsMeasurementEditTemplate.java

+1-13
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public byte[] getContent() {
111111
}
112112

113113
try (Workbook workbook = new XSSFWorkbook();
114-
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();) {
114+
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
115115

116116
CellStyle readOnlyHeaderStyle = XLSXTemplateHelper.createReadOnlyHeaderCellStyle(workbook);
117117
CellStyle boldStyle = createBoldCellStyle(workbook);
@@ -193,18 +193,6 @@ public byte[] getContent() {
193193
DEFAULT_GENERATED_ROW_COUNT - 1,
194194
digestionMethodArea);
195195

196-
for (ProteomicsMeasurementEditColumn column : ProteomicsMeasurementEditColumn.values()) {
197-
column.getFillHelp().ifPresent(
198-
helper -> XLSXTemplateHelper.addInputHelper(sheet,
199-
column.columnIndex(),
200-
startIndex,
201-
column.columnIndex(),
202-
DEFAULT_GENERATED_ROW_COUNT - 1,
203-
helper.exampleValue(),
204-
helper.description())
205-
);
206-
}
207-
208196
setAutoWidth(sheet);
209197
workbook.setActiveSheet(0);
210198

user-interface/src/main/java/life/qbic/datamanager/templates/measurement/ProteomicsMeasurementRegisterTemplate.java

+1-13
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private static void setAutoWidth(Sheet sheet) {
6262
@Override
6363
public byte[] getContent() {
6464
try (Workbook workbook = new XSSFWorkbook();
65-
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();) {
65+
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
6666

6767
CellStyle readOnlyHeaderStyle = XLSXTemplateHelper.createReadOnlyHeaderCellStyle(workbook);
6868
CellStyle boldStyle = createBoldCellStyle(workbook);
@@ -135,18 +135,6 @@ public byte[] getContent() {
135135
DEFAULT_GENERATED_ROW_COUNT - 1,
136136
digestionMethodArea);
137137

138-
for (ProteomicsMeasurementRegisterColumn column : ProteomicsMeasurementRegisterColumn.values()) {
139-
column.getFillHelp().ifPresent(
140-
helper -> XLSXTemplateHelper.addInputHelper(sheet,
141-
column.columnIndex(),
142-
startIndex,
143-
column.columnIndex(),
144-
DEFAULT_GENERATED_ROW_COUNT - 1,
145-
helper.exampleValue(),
146-
helper.description())
147-
);
148-
}
149-
150138
setAutoWidth(sheet);
151139

152140
workbook.setActiveSheet(0);

user-interface/src/main/java/life/qbic/datamanager/templates/sample/SampleBatchRegistrationTemplate.java

-12
Original file line numberDiff line numberDiff line change
@@ -159,18 +159,6 @@ public static XSSFWorkbook createRegistrationTemplate(List<String> conditions,
159159
MAX_ROW_INDEX_TO,
160160
specimenOptions);
161161

162-
for (var column : RegisterColumn.values()) {
163-
column.getFillHelp().ifPresent(
164-
helper -> XLSXTemplateHelper.addInputHelper(sheet,
165-
column.columnIndex(),
166-
startIndex,
167-
column.columnIndex(),
168-
MAX_ROW_INDEX_TO,
169-
helper.exampleValue(),
170-
helper.description())
171-
);
172-
}
173-
174162
setColumnAutoWidth(sheet, 0, RegisterColumn.maxColumnIndex());
175163
// Auto width ignores cell validation values (e.g. a list of valid entries). So we need
176164
// to set them explicit

user-interface/src/main/java/life/qbic/datamanager/templates/sample/SampleBatchUpdateTemplate.java

-12
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,6 @@ public static XSSFWorkbook createUpdateTemplate(List<Sample> samples, List<Strin
155155
MAX_ROW_INDEX_TO,
156156
specimenOptions);
157157

158-
for (var column : EditColumn.values()) {
159-
column.getFillHelp().ifPresent(
160-
helper -> XLSXTemplateHelper.addInputHelper(sheet,
161-
column.columnIndex(),
162-
startIndex,
163-
column.columnIndex(),
164-
MAX_ROW_INDEX_TO,
165-
helper.exampleValue(),
166-
helper.description())
167-
);
168-
}
169-
170158
setColumnAutoWidth(sheet, 0, EditColumn.maxColumnIndex());
171159
workbook.setActiveSheet(0);
172160
lockSheet(hiddenSheet);

0 commit comments

Comments
 (0)