Skip to content
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.

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

Date/time formatting simplifications #5923

Draft
wants to merge 37 commits into
base: develop
Choose a base branch
from
Draft

Conversation

labkey-adam
Copy link
Contributor

@labkey-adam labkey-adam commented Oct 7, 2024

Rationale

Server-side UI changes for https://docs.google.com/document/d/1XcatQe9wRDw1ONLML9x4fFv_fIq9zhXPHoYANBuOykw/edit#heading=h.4rg4h5vuek0

Related Pull Requests

Changes

  • Select date-time formats via drop-down lists holding standard formats (and non-standard, if already set)
  • Add "Inherit" checkboxes to allow inheritance/override of individual properties (allowed previously for a few properties via hidden UI)
  • Fix broken LookAndFeelProperties methods that ostensibly retrieved the stored value but actually retrieved inherited values. (Calling the parent class lookup method with a enum inadvertently walked the hierarchy.) Export and inheritance UI should be correct for all settings now.
  • Simplify SettingsForm / FolderSettingsForm / ProjectSettings hierarchy: remove pointless SettingsForm interface and have ProjectSettings extend FolderSettings to reduce boilerplate
  • Update saveProjectSettings() to take a form instead of JSON

labkey-adam and others added 6 commits October 12, 2024 09:00
# Conflicts:
#	biologics/package-lock.json
#	biologics/package.json
#	inventory/package-lock.json
#	inventory/package.json
#	sampleManagement/package-lock.json
#	sampleManagement/package.json
api/src/org/labkey/api/data/Container.java Outdated Show resolved Hide resolved
api/src/org/labkey/api/data/Container.java Outdated Show resolved Hide resolved
api/src/org/labkey/api/settings/LookAndFeelProperties.java Outdated Show resolved Hide resolved
core/src/org/labkey/core/admin/AdminController.java Outdated Show resolved Hide resolved
core/src/org/labkey/core/admin/lookAndFeelProperties.jsp Outdated Show resolved Hide resolved
Comment on lines 530 to 533
// TODO: Delete this block - just for testing
Set<String> set = new LinkedHashSet<>(options);
set.add(type == DateDisplayFormatType.Date ? "MM-dd-yyyy" : "kk:mm"); // non-standard
set.add("xyz"); // invalid
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just adding a note here to make sure this is removed after testing / before merge.

@labkey-adam labkey-adam marked this pull request as draft October 16, 2024 20:59
# Conflicts:
#	biologics/package-lock.json
#	biologics/package.json
#	inventory/package-lock.json
#	inventory/package.json
#	sampleManagement/package-lock.json
#	sampleManagement/package.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants