Skip to content

Use WritablePropertyMap #761

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
Oct 2, 2024
Merged

Use WritablePropertyMap #761

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
8 changes: 4 additions & 4 deletions snprc_ehr/src/org/labkey/snprc_ehr/domain/NewAnimalData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,25 +220,25 @@ public JSONObject toJSON(Container c, User u)
@Nullable
public String birthDateToString()
{
return DateUtil.formatDateISO8601(getBirthDate());
return DateUtil.formatIsoDate(getBirthDate());
}

@Nullable
public String acqDateToString()
{
return DateUtil.formatDateISO8601(getAcqDate());
return DateUtil.formatIsoDate(getAcqDate());
}

@Nullable
public String modifiedDateToString()
{
return DateUtil.formatDateISO8601(getModified());
return DateUtil.formatIsoDate(getModified());
}

@Nullable
public String createdDateToString()
{
return DateUtil.formatDateISO8601(getCreated());
return DateUtil.formatIsoDate(getCreated());
}

public String getId()
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/src/org/labkey/snprc_ehr/notification/SSRSConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
import org.labkey.api.data.PropertyManager;
import org.labkey.api.data.PropertyManager.WritablePropertyMap;
import org.labkey.api.data.PropertyStore;

import java.net.MalformedURLException;
Expand Down Expand Up @@ -81,7 +82,7 @@ public void setProperties(@NotNull Container c, @Nullable String user, @Nullable
new URL(baseURL);

PropertyStore store = PropertyManager.getEncryptedStore();
PropertyManager.PropertyMap map = store.getWritableProperties(c, SSRS_PROPERTY_CATEGORY, true);
WritablePropertyMap map = store.getWritableProperties(c, SSRS_PROPERTY_CATEGORY, true);
map.put(SSRS_USER_NAME_PROPERTY, user);
map.put(SSRS_PASSWORD_PROPERTY, password);
map.put(SSRS_BASE_URL, baseURL);
Expand Down
8 changes: 4 additions & 4 deletions snprc_scheduler/src/org/labkey/snprc_scheduler/domains/Timeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public Date getStartDate()
public String startDateToString()
{

return DateUtil.formatDateISO8601(getStartDate());
return DateUtil.formatIsoDate(getStartDate());
}

public void setStartDate(Date startDate)
Expand All @@ -204,7 +204,7 @@ public Date getEndDate()
public String endDateToString()
{

return DateUtil.formatDateISO8601(getEndDate());
return DateUtil.formatIsoDate(getEndDate());
}

public void setEndDate(Date endDate)
Expand Down Expand Up @@ -265,13 +265,13 @@ public void setCreated(Date created)
@Nullable
public String modifiedDateToString()
{
return DateUtil.formatDateISO8601(getModified());
return DateUtil.formatIsoDate(getModified());
}

@Nullable
public String createdDateToString()
{
return DateUtil.formatDateISO8601(getCreated());
return DateUtil.formatIsoDate(getCreated());
}

public Date getModified()
Expand Down