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.

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

Jump to bottom

Add Events Widget to Animal History Page #657

Merged
merged 43 commits into from
Dec 19, 2023
Merged

Add Events Widget to Animal History Page #657

merged 43 commits into from
Dec 19, 2023

Conversation

jallentxbiomed
Copy link
Collaborator

@jallentxbiomed jallentxbiomed commented Dec 18, 2023 •
edited
Loading

jallentxbiomed and others added 30 commits November 30, 2023 09:18
@jallentxbiomed
updated eventswidget page
c9afba5
@jallentxbiomed
added widget grid to as react component
bf4e640
@jallentxbiomed
added procedure entry to widget page
4077cb9
@jallentxbiomed
merge changes
a1dd457
@labkey-martyp @jallentxbiomed
Display html and edit button
9b012ce
@jallentxbiomed
added webpart to animal history
88c8c9a
@jallentxbiomed
added panel to animal history
d0eeac0
@jallentxbiomed
fixed styling
6f086f3
@labkey-martyp
Grid paging
3cf9ed8
@labkey-martyp @jallentxbiomed
Grid paging
d4f595f
@jallentxbiomed
fix conflicts
2a74511
@jallentxbiomed
updated eventswidget page
656a555
@jallentxbiomed
added widget grid to as react component
60eaf0b
@jallentxbiomed
added procedure entry to widget page
6bf7926
@jallentxbiomed
merge changes
5719b83
@labkey-martyp @jallentxbiomed
Display html and edit button
8971a4e
@jallentxbiomed
added webpart to animal history
6bb9b32
@jallentxbiomed
added panel to animal history
12aa5da
@jallentxbiomed
fixed styling
cf1d716
@labkey-martyp @jallentxbiomed
Grid paging
c65b618
@jallentxbiomed
added eventDate to getActiveProjects
5026861
@jallentxbiomed
disable create new button when subjectID count other than 1
b636fd2
@jallentxbiomed
merge conflict fix
66b62a8
@jallentxbiomed
merge conflict fix
ac4ded1
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
300851e 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
ab752c4 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
5ab9211 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
a04e8e2 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
23704f6 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
b55e618 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
36374ea 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
50fa9ee 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
2bd4343 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
f73f4dc 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed
Merge branch '23.11_fb_addEventsWidgetToAnimalHistory' of https://git…
007cc20 
…hub.com/LabKey/snprcEHRModules into 23.11_fb_addEventsWidgetToAnimalHistory
@jallentxbiomed jallentxbiomed self-assigned this Dec 18, 2023
@spamhurts spamhurts self-requested a review December 18, 2023 17:12
@jallentxbiomed jallentxbiomed mentioned this pull request Dec 18, 2023
Merged
spamhurts
spamhurts reviewed Dec 18, 2023
View reviewed changes
snprc_ehr/package-lock.json Outdated Show resolved Hide resolved
snprc_ehr/resources/views/EventsWidget.html Outdated Show resolved Hide resolved
snprc_ehr/resources/views/EventsWidget.html Outdated Show resolved Hide resolved
snprc_ehr/resources/web/snprc_ehr/snprcReports.js Show resolved Hide resolved
@jallentxbiomed jallentxbiomed merged commit 09e59c2 into release23.11-SNAPSHOT Dec 19, 2023
4 checks passed
@jallentxbiomed jallentxbiomed deleted the 23.11_fb_addEventsWidgetToAnimalHistory branch December 19, 2023 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spamhurts spamhurts spamhurts approved these changes

@RameshRapa RameshRapa RameshRapa approved these changes

Assignees

@jallentxbiomed jallentxbiomed

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jallentxbiomed @spamhurts @RameshRapa @labkey-martyp