Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified appointments-1.1-SNAPSHOT.jar
Binary file not shown.
Binary file modified appointments-1.1-SNAPSHOT.omod
Binary file not shown.
4 changes: 2 additions & 2 deletions appointments-1.1-SNAPSHOT/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
Built-By: jenkins
Built-By: shale
Created-By: Apache Maven 3.6.0
Build-Jdk: 1.8.0_292
Build-Jdk: 1.8.0_392

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Generated by Maven
#Mon Aug 23 18:49:07 SAST 2021
#Mon Oct 20 20:42:58 SAST 2025
version=1.1-SNAPSHOT
groupId=org.openmrs.module
artifactId=appointments-api
Binary file modified appointments-1.1-SNAPSHOT/lib/appointments-api-1.1-SNAPSHOT.jar
Binary file not shown.
35 changes: 35 additions & 0 deletions appointments-1.1-SNAPSHOT/liquibase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -407,4 +407,39 @@
</insert>
</changeSet>

<!--||||||||||||||||||||||MISSED SCHEDULER||||||||||||||||||||||||||||-->
<changeSet id="Auto-Mark-Missed-Appointment-Scheduler-20240725-1525" author="Alphonce Raseabi">
<preConditions onFail="MARK_RAN">
<sqlCheck expectedResult="0">
SELECT COUNT(*) FROM scheduler_task_config WHERE name = "Auto Mark Appointment As Missed Task";
</sqlCheck>
</preConditions>
<sql>
INSERT INTO
scheduler_task_config(name, description, schedulable_class, start_time, start_time_pattern, repeat_interval,
start_on_startup, created_by, date_created, uuid)
VALUES
('Auto Mark Appointment As Missed Task', 'Auto mark non consulted patients appointments as Missed',
'org.openmrs.module.appointments.scheduler.tasks.AppointmentsMissedScheduler',
TIMESTAMP(CURDATE()), 'MM/dd/yyyy HH:mm:ss', 86400, TRUE, 1, NOW(), UUID());
</sql>
</changeSet>
<!--||||||||||||||||||||||MISSED WEEKLY SCHEDULER||||||||||||||||||||||||||||-->
<changeSet id="Auto-Mark-Missed-Appointment-Weekly-Scheduler-20240801-2105" author="Alphonce Raseabi">
<preConditions onFail="MARK_RAN">
<sqlCheck expectedResult="0">
SELECT COUNT(*) FROM scheduler_task_config WHERE name = "Auto Mark Appointment As Missed Weekly Task";
</sqlCheck>
</preConditions>
<sql>
INSERT INTO
scheduler_task_config(name, description, schedulable_class, start_time, start_time_pattern, repeat_interval,
start_on_startup, created_by, date_created, uuid)
VALUES
('Auto Mark Appointment As Missed Weekly Task', 'Auto mark non consulted patients appointments as Missed - weekly scheduler',
'org.openmrs.module.appointments.scheduler.tasks.AppointmentsMissedWeeklyScheduler',
TIMESTAMP(CURDATE()), 'MM/dd/yyyy HH:mm:ss', 604800, TRUE, 1, NOW(), UUID());
</sql>
</changeSet>

</databaseChangeLog>
42 changes: 42 additions & 0 deletions appointments-1.1-SNAPSHOT/moduleApplicationContext.xml
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,46 @@
<ref bean="sessionFactory"/>
</property>
</bean>

<!-- Alphonce-->
<bean id="appointmentStatusMarkerDao" class="org.openmrs.module.appointments.dao.impl.AppointmentStatusMarkerDaoImpl">
<property name="sessionFactory">
<ref bean="sessionFactory"/>
</property>
</bean>

<!-- &lt;!&ndash; CagService Bean&ndash;&gt;-->
<!-- <bean id="appointmentStatusMarkerService" class="org.openmrs.module.appointments.service.impl.AppointmentStatusMarkerServiceImpl">-->
<!-- <property name="appointmentStatusMarkerDao" ref="appointmentStatusMarkerDao"/>-->
<!-- </bean>-->

<bean parent="serviceContext">
<property name="moduleService">
<list merge="true">
<value>org.openmrs.module.appointments.service.AppointmentStatusMarkerService</value>
<ref bean="appointmentStatusMarkerService"/>
</list>
</property>
</bean>

<bean id="appointmentStatusMarkerService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
<property name="transactionManager">
<ref bean="transactionManager"/>
</property>
<property name="target">
<bean class="org.openmrs.module.appointments.service.impl.AppointmentStatusMarkerServiceImpl">
<property name="appointmentStatusMarkerDao">
<ref bean="appointmentStatusMarkerDao"/>
</property>
</bean>
</property>
<property name="preInterceptors">
<ref bean="serviceInterceptors"/>
</property>
<property name="transactionAttributeSource">
<ref bean="transactionAttributeSource"/>
</property>
</bean>


</beans>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions classes/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
Built-By: jenkins
Built-By: shale
Created-By: Apache Maven 3.6.0
Build-Jdk: 1.8.0_292
Build-Jdk: 1.8.0_392

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Generated by Maven
#Mon Aug 23 18:49:07 SAST 2021
#Mon Oct 20 20:42:58 SAST 2025
version=1.1-SNAPSHOT
groupId=org.openmrs.module
artifactId=appointments-api
35 changes: 35 additions & 0 deletions classes/liquibase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -407,4 +407,39 @@
</insert>
</changeSet>

<!--||||||||||||||||||||||MISSED SCHEDULER||||||||||||||||||||||||||||-->
<changeSet id="Auto-Mark-Missed-Appointment-Scheduler-20240725-1525" author="Alphonce Raseabi">
<preConditions onFail="MARK_RAN">
<sqlCheck expectedResult="0">
SELECT COUNT(*) FROM scheduler_task_config WHERE name = "Auto Mark Appointment As Missed Task";
</sqlCheck>
</preConditions>
<sql>
INSERT INTO
scheduler_task_config(name, description, schedulable_class, start_time, start_time_pattern, repeat_interval,
start_on_startup, created_by, date_created, uuid)
VALUES
('Auto Mark Appointment As Missed Task', 'Auto mark non consulted patients appointments as Missed',
'org.openmrs.module.appointments.scheduler.tasks.AppointmentsMissedScheduler',
TIMESTAMP(CURDATE()), 'MM/dd/yyyy HH:mm:ss', 86400, TRUE, 1, NOW(), UUID());
</sql>
</changeSet>
<!--||||||||||||||||||||||MISSED WEEKLY SCHEDULER||||||||||||||||||||||||||||-->
<changeSet id="Auto-Mark-Missed-Appointment-Weekly-Scheduler-20240801-2105" author="Alphonce Raseabi">
<preConditions onFail="MARK_RAN">
<sqlCheck expectedResult="0">
SELECT COUNT(*) FROM scheduler_task_config WHERE name = "Auto Mark Appointment As Missed Weekly Task";
</sqlCheck>
</preConditions>
<sql>
INSERT INTO
scheduler_task_config(name, description, schedulable_class, start_time, start_time_pattern, repeat_interval,
start_on_startup, created_by, date_created, uuid)
VALUES
('Auto Mark Appointment As Missed Weekly Task', 'Auto mark non consulted patients appointments as Missed - weekly scheduler',
'org.openmrs.module.appointments.scheduler.tasks.AppointmentsMissedWeeklyScheduler',
TIMESTAMP(CURDATE()), 'MM/dd/yyyy HH:mm:ss', 604800, TRUE, 1, NOW(), UUID());
</sql>
</changeSet>

</databaseChangeLog>
42 changes: 42 additions & 0 deletions classes/moduleApplicationContext.xml
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,46 @@
<ref bean="sessionFactory"/>
</property>
</bean>

<!-- Alphonce-->
<bean id="appointmentStatusMarkerDao" class="org.openmrs.module.appointments.dao.impl.AppointmentStatusMarkerDaoImpl">
<property name="sessionFactory">
<ref bean="sessionFactory"/>
</property>
</bean>

<!-- &lt;!&ndash; CagService Bean&ndash;&gt;-->
<!-- <bean id="appointmentStatusMarkerService" class="org.openmrs.module.appointments.service.impl.AppointmentStatusMarkerServiceImpl">-->
<!-- <property name="appointmentStatusMarkerDao" ref="appointmentStatusMarkerDao"/>-->
<!-- </bean>-->

<bean parent="serviceContext">
<property name="moduleService">
<list merge="true">
<value>org.openmrs.module.appointments.service.AppointmentStatusMarkerService</value>
<ref bean="appointmentStatusMarkerService"/>
</list>
</property>
</bean>

<bean id="appointmentStatusMarkerService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
<property name="transactionManager">
<ref bean="transactionManager"/>
</property>
<property name="target">
<bean class="org.openmrs.module.appointments.service.impl.AppointmentStatusMarkerServiceImpl">
<property name="appointmentStatusMarkerDao">
<ref bean="appointmentStatusMarkerDao"/>
</property>
</bean>
</property>
<property name="preInterceptors">
<ref bean="serviceInterceptors"/>
</property>
<property name="transactionAttributeSource">
<ref bean="transactionAttributeSource"/>
</property>
</bean>


</beans>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion maven-archiver/pom.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Generated by Maven
#Mon Aug 23 18:49:08 SAST 2021
#Mon Oct 20 20:43:00 SAST 2025
version=1.1-SNAPSHOT
groupId=org.openmrs.module
artifactId=appointments-omod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org/openmrs/module/appointments/web/contract/AppointmentPayload.class
org/openmrs/module/appointments/web/controller/SpecialityController.class
org/openmrs/module/appointments/web/contract/AppointmentServiceTypePayload.class
org/openmrs/module/appointments/web/controller/SpecialityController.class
org/openmrs/module/appointments/web/mapper/AppointmentServiceMapper.class
org/openmrs/module/appointments/web/contract/AppointmentsSummary.class
org/openmrs/module/appointments/web/controller/AppointmentServiceController.class
Expand All @@ -12,7 +12,7 @@ org/openmrs/module/appointments/web/contract/AppointmentDefaultResponse.class
org/openmrs/module/appointments/web/contract/AppointmentServiceFullResponse.class
org/openmrs/module/appointments/web/contract/ServiceWeeklyAvailabilityPayload.class
org/openmrs/module/appointments/web/controller/AppointmentServicesController.class
org/openmrs/module/appointments/web/controller/AppointmentController.class
org/openmrs/module/appointments/web/mapper/AppointmentMapper.class
org/openmrs/module/appointments/web/controller/AppointmentController.class
org/openmrs/module/appointments/web/extension/AppointmentResponseExtension.class
org/openmrs/module/appointments/web/contract/AppointmentServiceDefaultResponse.class
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentsController.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentServiceDefaultResponse.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/extension/AppointmentResponseExtension.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentServiceFullResponse.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/mapper/AppointmentServiceMapper.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentQuery.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentsSummary.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentServicesController.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentServiceTypePayload.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/SpecialityController.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentPayload.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentServicePayload.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/ServiceWeeklyAvailabilityPayload.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentDefaultResponse.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentServiceController.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/mapper/AppointmentMapper.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentController.java
/var/lib/jenkins/workspace/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentCount.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentServiceController.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/extension/AppointmentResponseExtension.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentServicePayload.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentServicesController.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentServiceFullResponse.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentCount.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentPayload.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/SpecialityController.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentsSummary.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/ServiceWeeklyAvailabilityPayload.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/mapper/AppointmentMapper.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentQuery.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/mapper/AppointmentServiceMapper.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentServiceDefaultResponse.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentServiceTypePayload.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentsController.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/contract/AppointmentDefaultResponse.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/main/java/org/openmrs/module/appointments/web/controller/AppointmentController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
org/openmrs/module/appointments/web/controller/AppointmentsControllerIT.class
org/openmrs/module/appointments/web/controller/AppointmentsControllerIT$1.class
org/openmrs/module/appointments/web/controller/SpecialityControllerIT.class
org/openmrs/module/appointments/web/controller/AppointmentControllerIT$3.class
org/openmrs/module/appointments/web/controller/SpecialityControllerIT$1.class
org/openmrs/module/appointments/web/controller/AppointmentControllerIT$6.class
org/openmrs/module/appointments/web/controller/AppointmentServiceControllerIT$1.class
org/openmrs/module/appointments/web/BaseWebControllerTest$Parameter.class
org/openmrs/module/appointments/web/controller/AppointmentServicesControllerIT$1.class
org/openmrs/module/appointments/web/controller/AppointmentsControllerTest.class
org/openmrs/module/appointments/web/controller/AppointmentServiceControllerIT$4.class
org/openmrs/module/appointments/web/controller/AppointmentControllerIT$1.class
org/openmrs/module/appointments/web/controller/AppointmentServicesControllerIT.class
org/openmrs/module/appointments/web/controller/AppointmentServiceControllerTest.class
org/openmrs/module/appointments/web/controller/AppointmentControllerIT$2.class
org/openmrs/module/appointments/web/mapper/AppointmentServiceMapperTest.class
org/openmrs/module/appointments/web/controller/AppointmentControllerIT$4.class
org/openmrs/module/appointments/web/controller/AppointmentControllerIT.class
org/openmrs/module/appointments/web/BaseIntegrationTest.class
org/openmrs/module/appointments/web/controller/AppointmentServiceControllerIT.class
org/openmrs/module/appointments/web/controller/AppointmentServiceControllerIT$2.class
org/openmrs/module/appointments/web/BaseWebControllerTest.class
org/openmrs/module/appointments/web/controller/AppointmentControllerIT$5.class
org/openmrs/module/appointments/web/controller/AppointmentControllerTest.class
org/openmrs/module/appointments/web/controller/AppointmentServicesControllerTest.class
org/openmrs/module/appointments/web/controller/AppointmentServiceControllerIT$3.class
org/openmrs/module/appointments/web/mapper/AppointmentMapperTest.class
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/mapper/AppointmentServiceMapperTest.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentControllerTest.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentsControllerTest.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentServiceControllerTest.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/BaseWebControllerTest.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/SpecialityControllerIT.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentControllerIT.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentServicesControllerTest.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/mapper/AppointmentMapperTest.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentServiceControllerIT.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentsControllerIT.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/BaseIntegrationTest.java
/home/shale/Projects/eRegister/openmrs-module-appointments-92/omod/src/test/java/org/openmrs/module/appointments/web/controller/AppointmentServicesControllerIT.java