-
Notifications
You must be signed in to change notification settings - Fork 222
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
BAH-408 Maharjun, Saikumar | #794 | Missed and cancelled appointments should … #10
Merged
ShruthiPitta
merged 1 commit into
Bahmni:master
from
maharjunm:colors-for-list-view-appointments
Jan 30, 2018
Merged
BAH-408 Maharjun, Saikumar | #794 | Missed and cancelled appointments should … #10
ShruthiPitta
merged 1 commit into
Bahmni:master
from
maharjunm:colors-for-list-view-appointments
Jan 30, 2018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…have configured colors in listView
vishalreddysarasani
pushed a commit
to vishalreddysarasani/default-config
that referenced
this pull request
Oct 12, 2021
…Appointments Weekly View (Bahmni#10) * Sowmika, Raju | [Weekly View] | add dao method to search appointments in a date range * Sowmika, Raju | [Weekly View] | add search method in appointmentService * Sowmika, Raju | [Weekly View] | add appointments search controller for a date range * Sowmika, Raju | [Weekly View] | Remove Adding 1 day for endDate(Handled in frontEnd by passing end of day) * Sowmika | [Weekly View] | Refactor based on review comments
vishalreddysarasani
pushed a commit
to vishalreddysarasani/default-config
that referenced
this pull request
Oct 12, 2021
* Alekhya, Siva | MOBN-48 | Add appointment recurring pattern model * Alekhya, Siva | MOBN-48 | Add DAO layer for patient appointment recurring pattern * Alekhya, Siva | MOBN-48 | Add helper to create recurring appointments * Alekhya, Siva | MOBN-48 | Add recurring appointments service * Alekhya, Siva | MOBN-48 | Add controller for creating recurring appointments using recurring pattern * Siva | MOBN-48 | Remove unused code in daily recurring appointments * Siva | MOBN-48 | Add recurring pattern validator * Alekhya | MOBN-38 | Add tests to mapper, helper and controller classes in appointments-omod * Alekhya | MOBN-38 | Change branch and line coverage ratio in appointments-omod * Siva, Alekhya | MOBN-48 | Make recurring type as Enum and refactor the code * Alekhya, Vinay | MOBN-453 | Code modifications to calculate appointment dates for slots with inter-date(starts and ends on different date) and add test cases for the code modifications * Bindu, Vinay | MOBN-49 | Support creation of recurring appointments with End Date (for Daily) * Sowmika, Vinay | MOBN-50 | Remove unused code * Sowmika, Vinay | MOBN-50 | Increase daysOfWeek column size in patient_appointment_recurring_time * Sowmika, Vinay | MOBN-50 | Validations for weekly recurring appointments * Sowmika, Vinay | MOBN-50 | Transform days of week from List to String * Sowmika, Vinay | MOBN-50 | Weekly recurring appointments generation and refactor appointments generation * Sowmika, Vinay | MOBN-50 | Integration tests for Weekly recurring appointments * Sowmika, Alekhya | MOBN-501 | Add unique parameter in Recurring pattern hbm * Sowmika, Alekhya | MOBN-501 | Add helper class for appointment service * Sowmika, Alekhya | MOBN-501 | Refactor recurring appointments validation and creation * Sowmika, Vineela | MOBN-456 | Change int to Integer to support null for frequency when end date is given in recurring pattern * Sowmika, Vineela | MOBN-456 | Map recurring pattern to appointment response * Add missing validation in appointment * Sowmika, Vineela | MOBN-88 | Update single appointment when applyForAll is false * Sowmika, Vineela | MOBN-88 | Update start and end time of all recurring appointments when applyForAll is true * Sowmika, Vineela | MOBN-88 | Change applyForAll from request param to requestBody * Sowmika, Vineela | MOBN-88 | Add Edit Validator for editing appointment * Sowmika, Vineela | MOBN-88 | Integrate validate method from EditAppointmentValidator in AppointmentService and RecurringAppointmentService * Sowmika, Vineela | MOBN-88 | Change applyForAll parameter from optional Boolean to Boolean * Sowmika, Vineela | MOBN-88 | Add IT tests for update of appointment * Sowmika, Vinay | MOBN-88 | Handle time zone conflict while updating the recurring appointments * Sowmika, Vinay | MOBN-88 | Update only scheduled recurring appointments * Sowmika, Vinay | MOBN-88 | Revert error log mistake * Sowmika, Sneha, Vineela | MOBN-498 | Filter out voided appointment providers in appointments * Sowmika, Alekhya | MOBN-98 | Fix issue of adding the voided appointment provider to appointment * Vineela, Vinay | MOBN-87 | Update changeStatus service to support cancel all recurring appointments * Vineela, Vinay | MOBN-87 | Replace highestStatusSequence with applicableStatusList * Vineela, Vinay | MOBN-87 | Change from sequence to status in applicableStatusList * Vineela, Vinay | MOBN-87 | Code refactoring and test * Vineela, Vinay | MOBN-87 | Code refactoring, Extract validate status change conditions and test * Sowmika, Bindu, Alekhya | MOBN-422 | Add methods to update metadata for recurring appointments * Alekhya | MOBN-422 | Handle when all providers are removed while editing all recurring appointments * Sneha, Alekhya | MOBN-576 | Alter appointment table to add related appointment column * Sneha, Alekhya | MOBN-576 | Refactor and create AppointmentRecurringPatternMapper, abstract out validate & save in appointment service * Sneha, Alekhya | MOBN-576 | Refactor Appointment save in controller * Alekhya | MOBN-422 | Refactor appointment providers mapping for recurring apointments * Alekhya | MOBN-422 | Return empty list instead of null for cloning providers * Sneha, Alekhya | MOBN-576 | Refactor validators, abstract audit log method * Vineela, Sneha Bagri| MOBN-576 | Refactorand create single and all recurring appointment mapper abstraction * Vineela, Sneha Bagri | MOBN-576 | Write method to get AppointmentRecurringPattern from appointment request for Single Recurring Appointment * Vineela, Sneha Bagri | MOBN-576 | Write test to make sure old appointment is voided when new single RecurringAppointment is created from request * Vineela, Sneha Bagri | MOBN-576 | Rename RecurringAppointmentService to AppointmentRecurringPatternService * Sneha Bagri | MOBN-576 | Should not recreate related appointment, when appointment in request already has one * Vineela, Sneha Bagri | MOBN-576 | Should return the related or current appointment as required when edit a single recurring appt * Vineela, Sneha Bagri | MOBN-576 | Validate appointment request * Vineela, Sneha Bagri | MOBN-576 | Add audit log to single recurring appt to be updated * Vineela, Sneha Bagri | MOBN-576 | Call the update service for single recurring appointment * Vineela, Sneha Bagri | MOBN-576 | Replace == with equals method in editAppointment from AppointmentController * Vineela, Sneha Bagri | MOBN-576 | Add a new method to get active appointments from AppointmentRecurringPattern * Sneha Bagri| Fix issues with appointment recurrig pattern update and fix test for SingleAppointmentRecurringPatternMapperTest * Vinay, Vineela | MOBN-576 | Add IntegrationTest for maintaining the actual recurring appointment information after edit * Vineela, Vinay | MOBN-576 | Make validation common for all scenarios in edit appointment * Vineela, Vinay | MOBN-576 | Refactor test cases * Vineela, Vinay | MOBN-576 | Merge conflicts resolved * Sowmika, Bindu, Alekhya | MOBN-422 | Add methods to update metadata for recurring appointments * Alekhya | MOBN-422 | Handle when all providers are removed while editing all recurring appointments * Sneha, Alekhya | MOBN-576 | Alter appointment table to add related appointment column * Sneha, Alekhya | MOBN-576 | Refactor and create AppointmentRecurringPatternMapper, abstract out validate & save in appointment service * Sneha, Alekhya | MOBN-576 | Refactor Appointment save in controller * Sneha, Alekhya | MOBN-576 | Refactor validators, abstract audit log method * Vineela, Sneha Bagri| MOBN-576 | Refactorand create single and all recurring appointment mapper abstraction * Vineela, Sneha Bagri | MOBN-576 | Write method to get AppointmentRecurringPattern from appointment request for Single Recurring Appointment * Vineela, Sneha Bagri | MOBN-576 | Write test to make sure old appointment is voided when new single RecurringAppointment is created from request * Vineela, Sneha Bagri | MOBN-576 | Rename RecurringAppointmentService to AppointmentRecurringPatternService * Sneha Bagri | MOBN-576 | Should not recreate related appointment, when appointment in request already has one * Vineela, Sneha Bagri | MOBN-576 | Should return the related or current appointment as required when edit a single recurring appt * Vineela, Sneha Bagri | MOBN-576 | Validate appointment request * Vineela, Sneha Bagri | MOBN-576 | Add audit log to single recurring appt to be updated * Vineela, Sneha Bagri | MOBN-576 | Call the update service for single recurring appointment * Vineela, Sneha Bagri | MOBN-576 | Replace == with equals method in editAppointment from AppointmentController * Vineela, Sneha Bagri | MOBN-576 | Add a new method to get active appointments from AppointmentRecurringPattern * Sneha Bagri| Fix issues with appointment recurrig pattern update and fix test for SingleAppointmentRecurringPatternMapperTest * Vinay, Vineela | MOBN-576 | Add IntegrationTest for maintaining the actual recurring appointment information after edit * Vineela, Vinay | MOBN-576 | Make validation common for all scenarios in edit appointment * Vineela, Vinay | MOBN-576 | Refactor test cases * Vineela | MOBN-576 | Refactor and move timezone validation to AllAppointmentRecurringPatternMapper * Vineela | Remove unnecessary code from editAppointment in AppointmentController * Vineela, Bindu | MOBN-460 | Change number of occurences to number of appointments * Vineela, Bindu | MOBN-460 | Remove recurring appointments when frequency or end date is decreased while editing * Vineela, Bindu | MOBN-460 | Extend recurring appointments when frequency or end date is increased while editing * Vineela, Bindu | MOBN-460 | Add integration test for edit recurring pattern of recurring appointment * Vineela, Bindu | MOBN-460 | Remove try and catch to throw the exception * Vineela | MOBN-460 | Modify test cases to cover the scenarios with frequency as null * Sowmika | MOBN-657 | Extract save of recurring appointments to seperate controller * Sowmika, Bindu | MOBN-657 | Move Recurring pattern validator to seperate class and implement validator using spring validator * Sowmika, Bindu | MOBN-657 | Add RecurringPatternMapper to convert request to db object * Sowmika | MOBN-657 | Add RecurringAppointmentMapper to convert db to response object * Sowmika | MOBN-657 | Remove redundant null check * Sowmika | MOBN-657 | Remove recurring pattern from default response and add new response model for recurring appointment response * Sowmika, Bindu | MOBN-657 | Remove constructors for Weekly and Daily generation service and pass them as parameters * Sowmika, Bindu | MOBN-657 | Remove appointment recurring pattern parameter to getAppointments in daily and weekly recurring appointments generation service * Sowmika, Bindu | MOBN-657 | Add new RecurringAppointmentRequest model and change the input model in controller and move edit to recurring appointmentsController * Sowmika, Bindu | MOBN-657 | Rename RecurringPatternHelper to RecurringAppointmentsService and refactor * Sowmika, Bindu | MOBN-657 | Refactor Daily and weekly appointments generation service * Sowmika, Bindu | MOBN-657 | Add getAppointmentByUuid in RecurringAppointmentsController * Sowmika | MOBN-657 | Add isRecurring to response * Sowmika, Bindu | MOBN-657 | Move creation of AppointmentRecurringPattern to service * Sowmika, Bindu | MOBN-657 | Move duplicate code to DateUtil * Sowmika, Bindu | MOBN-657 | Remove unused code * Sowmika, Bindu | MOBN-657 | Rename RecurringPatternMapper to service * Sowmika, Bindu | MOBN-657 | Change validator for edit request of recurring appointments * Sowmika, Bindu | MOBN-657 | Remove unused validators and rename package * Sowmika, Bindu | MOBN-657 | Add test case for save recurring appointments when validator throws error * Sowmika, Bindu | MOBN-657 | Throw exception if uuid in appointment request is null or invalid uuid * Sowmika, Bindu | MOBN-657 | Remove setting appointmentAudit and appointment number in omod * Sowmika, Bindu | MOBN-657 | Refactor AllAppointmentRecurringPatternUpdateService * Revert "Sowmika, Bindu | MOBN-657 | Move creation of AppointmentRecurringPattern to service" This reverts commit 0f0813767f7ddd4df1e444ea731ce4a4d493d1b0. * Sowmika, Bindu | MOBN-657 | Move getUpdatedAppointments to RecurringAppointmentsService * Sowmika, Bindu | MOBN-657 | Move update services from mapper to service folder * Sowmika, Bindu | MOBN-657 | Added validation, AuditLog for Appointment update in API * Sowmika, Bindu | MOBN-657 | Fix failing ITs * Sowmika, Bindu | MOBN-657 | Add update method for Single recurring appointment in API * Sowmika, Bindu | MOBN-657 | Refactor SingleRecurringAppointmentUpdateService * Sowmika, Bindu | MOBN-657 | Remove AppointmentRecurringPatternUpdateService interface * Sowmika, Bindu | MOBN-657 | Add ChangeStatus method in Recurring Appointment Controller * Sowmika, Bindu | MOBN-657 | Refactor remove appointments * Sowmika, Bindu | MOBN-657 | Remove unused code in AppointmentsService * Sowmika, Bindu | MOBN-657 | Return updated appointments for changeStatus * Sowmika, Bindu | MOBN-657 | Added TimeZoneValidator in Recurring Appointment Controller * Sowmika, Bindu | MOBN-657 | Change return type for validateAndSave in api * Sowmika, Bindu | MOBN-657 | Remove redundant null check * Sowmika, Bindu | MOBN-657 | Remove redundant code in RecurringAppointmentRequest * Sowmika, Bindu | MOBN-657 | Add pending tests to a method in RecurringPatternMapper * Sowmika, Bindu | MOBN-657 | Fix issue with update of recurring appointments * Bindu, Sowmika | MOBN-657 | Change returnType for single recurring appointment type to list for edit * BAH-663 | API to get appointments for a date range which is used for Appointments Weekly View (Bahmni#10) * Sowmika, Raju | [Weekly View] | add dao method to search appointments in a date range * Sowmika, Raju | [Weekly View] | add search method in appointmentService * Sowmika, Raju | [Weekly View] | add appointments search controller for a date range * Sowmika, Raju | [Weekly View] | Remove Adding 1 day for endDate(Handled in frontEnd by passing end of day) * Sowmika | [Weekly View] | Refactor based on review comments # Conflicts: # api/src/main/java/org/openmrs/module/appointments/service/AppointmentsService.java # api/src/main/java/org/openmrs/module/appointments/service/impl/AppointmentsServiceImpl.java # api/src/test/java/org/openmrs/module/appointments/service/impl/AppointmentsServiceImplTest.java * BAH-913 | Sowmika | Reset appointment status (Bahmni#12) * Sowmika, Saikumar | [Reset Appointment Status] | Allow status change from any status to scheduled * Sowmika, Saikumar | [Reset Appointment Status] | [Reformat] commit * Sowmika, Saikumar | [Reset Appointment Status] | Authenticate user to reset status to scheduled * Sowmika, Saikumar | [Reset Appointment Status] | [Refactor and Reformat] commit * Sowmika, Saikumar | [Reset Apointment Status] | IT for reset appointment status to scheduled from any status * Saikumar, Sowmika | [Reset Appointment status] | Add IT to check privilege to reset appointment status to scheduled * Saikumar, Sowmika | [Reset Appointment status] | Migration script to add Reset Appointment Status privilege * Saikumar, Sowmika | [Reset appointment status] | [Refactor] Status validator to support resest functionality * Sowmika, Saikumar | [Reset Appointment Status] | [Refactor] commit * Sowmika, Saikumar | [Reset Appointment Status] | Add new endpoint status-change in AppointmentsController (Same as chanegStatus in AppointmentController) * Sowmika | [Reset Appointment Status] | Changes from PR review * Sowmika | [Reset Appointment Status] | Changes from PR review # Conflicts: # api/src/main/java/org/openmrs/module/appointments/service/impl/AppointmentsServiceImpl.java # api/src/main/resources/liquibase.xml # api/src/test/java/org/openmrs/module/appointments/service/impl/AppointmentsServiceImplTest.java # omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentController.java # omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentControllerIT.java # omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentControllerTest.java * Vinay, Alekhya | MOBN-462,643 | Add new conflicts end points in both recurring & normal appointments * Vinay, Alekhya | MOBN-462,643 | Add service unavailability and patient double booking conflicts * Vinay, Alekhya | MOBN-462,643 | Add logic for service unavialability conflict * Vinay, Alekhya | MOBN-462,643 | Add method in appointments service for calculating conflicts * Vinay, Alekhya | MOBN-643 | Add patient double booking conflict logic * Vinay, Alekhya | MOBN-643 | Use appointments dao instead of service in patient double booking * Vinay, Alekhya | MOBN-462 | Add error codes for validators * Vinay, Alekhya | MOBN-462,643 | Add integration tests & tests for appointments service * Vinay, Alekhya | MOBN-643 | Refactor to avoid lazy loading * Alekhya | MOBN-462,643 | Use enum in conflicts map and extract validations into separate methods in controller * Vinay, Alekhya | MOBN-426,643 | Change the interface and enum names and refactor methods * Vinay, Alekhya | MOBN-462,643 | Move the conflict type eunm to model package * Fix breaking tests * Fix liquibase migration after merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…have configured colors in listView
https://bahmni.atlassian.net/browse/BAH-408