Skip to content

Migrate to renderGridCellContents(RenderContext, HtmlWriter) #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
May 19, 2025
Merged

Migrate to renderGridCellContents(RenderContext, HtmlWriter) #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7969,18 +7969,28 @@ private ModelAndView getSourceFilesView(SpectralLibrary specLib, ITargetedMSRun
List<String> spectrumFileNames = getSourceFiles(libSourceFiles, LibSourceFile::getSpectrumSourceFile);
List<String> idFileNames = getSourceFiles(libSourceFiles, LibSourceFile::getIdFile);
view.addView(new HtmlView(DIV(
TABLE(TR(
TD(at(valign, "top", style, "padding:5px;"),
createTable("Spectrum Files", spectrumFileNames)),
TD(at(valign, "top", style, "padding:5px;"),
createTable("Search Results Files", idFileNames)))
))));
TABLE(TR(
TD(
at(valign, "top", style, "padding:5px;"),
createTable("Spectrum Files", spectrumFileNames)
),
TD(
at(valign, "top", style, "padding:5px;"),
createTable("Search Results Files", idFileNames)
)
))
)));
}
}
catch (SpecLibReaderException e)
{
view.addView(new HtmlView(DIV(DIV(cl("labkey-error"), "Error reading library source files."),
DIV(ExceptionUtil.renderException(e)))));
view.addView(new HtmlView(
DIV(DIV(
cl("labkey-error"),
"Error reading library source files."),
DIV(ExceptionUtil.renderException(e))
))
);
}
}
}
Expand Down
53 changes: 30 additions & 23 deletions panoramapublic/src/org/labkey/panoramapublic/view/publish/CatalogEntryWebPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,32 +82,39 @@ public CatalogEntryWebPart(ExperimentAnnotations expAnnotations, User user, @Nul

CatalogEntrySettings settings = CatalogEntryManager.getCatalogEntrySettings();
addView(new HtmlView(
DIV(
TABLE(
TR(
TD(at(style, "padding:0 10px 15px 0; vertical-align:top;"), U("Status:")),
TD(at(style, "vertical-align:top;"),
CatalogEntry.getStatusText(entry.getApproved()),
changeStatusBtn == null ? "" : changeStatusBtn)
DIV(
TABLE(
TR(
TD(
at(style, "padding:0 10px 15px 0; vertical-align:top;"),
U("Status:")
),
TR(
TD(at(style, "padding:0 10px 15px 0; vertical-align:top;"), U("Title:")),
TD(at(style, "vertical-align:top;"), expAnnotations.getTitle())
),
TR(
TD(at(style, "padding:0 10px 15px 0; vertical-align:top;"), U("Description:")),
TD(at(style, "vertical-align:top;"), entry.getDescription())
TD(
at(style, "vertical-align:top;"),
CatalogEntry.getStatusText(entry.getApproved()),
changeStatusBtn == null ? "" : changeStatusBtn
)
),
DIV(IMG(at(src, PanoramaPublicController.getCatalogImageDownloadUrl(expAnnotations, entry.getImageFileName()))
.at(width, settings.getImgWidth()).at(height, settings.getImgHeight())
.at(style, "margin:10px 0 15px 0;border: 1px solid lightgrey;"))),
new ButtonBuilder("Edit").href(editUrl),
HtmlString.NBSP,
new ButtonBuilder("Delete").href(deleteUrl)
.usePost("Are you sure you want to delete the Panorama Public catalog entry for this experiment?"),
returnUrl != null ? DIV(at(style, "margin-top:25px;"), new ButtonBuilder("Back").href(returnUrl))
: HtmlString.EMPTY_STRING
TR(
TD(at(style, "padding:0 10px 15px 0; vertical-align:top;"), U("Title:")),
TD(at(style, "vertical-align:top;"), expAnnotations.getTitle())
),
TR(
TD(at(style, "padding:0 10px 15px 0; vertical-align:top;"), U("Description:")),
TD(at(style, "vertical-align:top;"), entry.getDescription())
)
),
DIV(IMG(
at(src, PanoramaPublicController.getCatalogImageDownloadUrl(expAnnotations, entry.getImageFileName()))
.at(width, settings.getImgWidth()).at(height, settings.getImgHeight())
.at(style, "margin:10px 0 15px 0;border: 1px solid lightgrey;")
)),
new ButtonBuilder("Edit").href(editUrl),
HtmlString.NBSP,
new ButtonBuilder("Delete").href(deleteUrl)
.usePost("Are you sure you want to delete the Panorama Public catalog entry for this experiment?"),
returnUrl != null ? DIV(at(style, "margin-top:25px;"), new ButtonBuilder("Back").href(returnUrl))
: HtmlString.EMPTY_STRING
)));
}
}
Expand Down