Skip to content

Discard forms #560

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-martyp merged 2 commits into from
Jul 22, 2025
Merged

Discard forms #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
433abde
Add discard option
labkey-martyp Jul 21, 2025
001caf5
update clinremarks etl
labkey-martyp Jul 21, 2025
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
3 changes: 1 addition & 2 deletions nirc_ehr/resources/queries/dbo/q_clinremarks.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ SELECT anmEvt.ANIMAL_EVENT_ID
WHEN (trim(anmEvt.STAFF_ID.STAFF_FIRST_NAME) IS NULL OR trim(anmEvt.STAFF_ID.STAFF_LAST_NAME) IS NULL) THEN 'unknown'
ELSE (trim(anmEvt.STAFF_ID.STAFF_FIRST_NAME)
|| '|' || trim(anmEvt.STAFF_ID.STAFF_LAST_NAME)) END) AS performedby,
anmEvt.DIAGNOSIS AS vetreview,
anmCmt.TEXT AS remark,
('Note: ' || COALESCE(anmCmt.TEXT, 'None') || '; Diagnosis: ' || COALESCE(anmEvt.DIAGNOSIS, 'None')) AS remark,
'Clinical' AS category,
CASE WHEN anmEvt.ATTACHMENT_PATH IS NOT NULL THEN
('C:\Program Files\Labkey\labkey\files\NIRC\EHR\@files\attachments'
Expand Down
1 change: 0 additions & 1 deletion nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBaseTaskFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ protected List<String> getMoreActionButtonConfigs()
{
List<String> configs = super.getMoreActionButtonConfigs();
configs.remove("REVIEW");
configs.remove("DISCARD");
return configs;
}
}
8 changes: 8 additions & 0 deletions nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehaviorRoundsFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,12 @@ protected List<String> getButtonConfigs()

return ret;
}

@Override
protected List<String> getMoreActionButtonConfigs()
{
List<String> configs = super.getMoreActionButtonConfigs();
configs.remove("DISCARD");
return configs;
}
}
8 changes: 8 additions & 0 deletions nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCBehavioralCasesFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,12 @@ protected List<String> getButtonConfigs()

return ret;
}

@Override
protected List<String> getMoreActionButtonConfigs()
{
List<String> configs = super.getMoreActionButtonConfigs();
configs.remove("DISCARD");
return configs;
}
}
8 changes: 8 additions & 0 deletions nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCCasesFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,12 @@ protected List<String> getButtonConfigs()

return ret;
}

@Override
protected List<String> getMoreActionButtonConfigs()
{
List<String> configs = super.getMoreActionButtonConfigs();
configs.remove("DISCARD");
Copy link
Contributor

@labkey-jeckels labkey-jeckels Jul 21, 2025

Choose a reason for hiding this comment

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

I would love to have constants for this and other actions. However, I know this is long-standing and widespread to use hard-coded strings.

Copy link
Contributor Author

@labkey-martyp labkey-martyp Jul 22, 2025

Choose a reason for hiding this comment

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

Yeah that could be a future EHR improvement

return configs;
}
}
8 changes: 8 additions & 0 deletions nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCClinicalRoundsFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,12 @@ protected List<String> getButtonConfigs()

return ret;
}

@Override
protected List<String> getMoreActionButtonConfigs()
{
List<String> configs = super.getMoreActionButtonConfigs();
configs.remove("DISCARD");
return configs;
}
}
8 changes: 8 additions & 0 deletions nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCDeathNecropsyFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,12 @@ else if (isVetTech)
}
return defaultButtons;
}

@Override
protected List<String> getMoreActionButtonConfigs()
{
List<String> configs = super.getMoreActionButtonConfigs();
configs.remove("DISCARD");
return configs;
}
}