profile
viewpoint
Vinkesh Banka vinkesh Thoughtworks Bangalore , India

Bahmni/emr-functional-tests 4

emr functional tests

Bahmni/bahmni-java-utils 3

This repository has various functional utilities needed by bahmni.

Bahmni/bahmni-docker-old 2

DEPRECATED - This repository contains the relevant docker configuration for setting up Bahmni

Bahmni/bahmni-reports 1

Reports web application for the Bahmni project

Bahmni/clojure_test_datasetup 1

Setup and Tear Down test data sets for integration tests in clojure

Bahmni/jss-config 1

[DEPRECATED - Moved to JSS GitHub organization (https://github.com/JanSwasthyaSahyog/jss-config) JSS Hospital specific configuration, scripts and data.

Bahmni/openmrs-data 1

Demo OpenMRS data for Bahmni.

Bahmni/openmrs-distro-bahmni 1

Generates distro for bahmni

Bahmni/openmrs-module-idgen-webservices 1

Rest services for openmrs idgen api

Pull request review commentBahmni/bahmni-java-utils

BAH-1127|Buvaneswari|OpenElis not syncing with OpenMRS

 public HttpRequestDetails getRequestDetails(URI uri) {      @Override     public HttpRequestDetails refreshRequestDetails(URI uri) {-        DefaultHttpClient httpClient = new DefaultHttpClient();         try {+             CookieStore cookieStore = new BasicCookieStore();             HttpContext httpContext = new BasicHttpContext();-            httpContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore);--            httpClient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, authenticationDetails.getReadTimeout());-            httpClient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, authenticationDetails.getConnectionTimeout());-+            httpContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore);             HttpPost httpPost = new HttpPost(uri);              logger.info(String.format("Executing request: %s", httpPost.getRequestLine()));+            RequestConfig requestConfig = RequestConfig.custom()+                    .setConnectTimeout(authenticationDetails.getReadTimeout())+                    .setSocketTimeout(60000)

@buvaneswari-arun can we have constant defined here instead of hardcoding the value

buvaneswari-arun

comment created time in 34 minutes

pull request commentopenmrs/openmrs-module-fhir2

FM2-307: Implementing Condition Resource for OpenMRS 2.1 And Below

@ibacher any Update on this ??

mozzy11

comment created time in 2 hours

Pull request review commentopenmrs/openmrs-module-fhir2

FM2-307: Implementing Condition Resource for OpenMRS 2.1 And Below

+/*+ * This Source Code Form is subject to the terms of the Mozilla Public License,+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.+ *+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS+ * graphic logo is a trademark of OpenMRS Inc.+ */+package org.openmrs.module.fhir2.api.dao.impl;++import static org.hibernate.criterion.Restrictions.and;+import static org.hibernate.criterion.Restrictions.eq;+import static org.hibernate.criterion.Restrictions.ge;+import static org.hibernate.criterion.Restrictions.le;+import static org.hibernate.criterion.Restrictions.not;+import static org.hibernate.criterion.Subqueries.propertyIn;++import javax.annotation.Nonnull;++import java.math.BigDecimal;+import java.time.Duration;+import java.time.LocalDateTime;+import java.time.Period;+import java.time.ZoneId;+import java.time.temporal.ChronoUnit;+import java.time.temporal.TemporalAmount;+import java.time.temporal.TemporalUnit;+import java.util.Date;+import java.util.List;+import java.util.Optional;++import ca.uhn.fhir.rest.param.DateRangeParam;+import ca.uhn.fhir.rest.param.ParamPrefixEnum;+import ca.uhn.fhir.rest.param.QuantityAndListParam;+import ca.uhn.fhir.rest.param.QuantityParam;+import ca.uhn.fhir.rest.param.ReferenceAndListParam;+import ca.uhn.fhir.rest.param.TokenAndListParam;+import lombok.AccessLevel;+import lombok.Setter;+import org.hibernate.Criteria;+import org.hibernate.SessionFactory;+import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.DetachedCriteria;+import org.hibernate.criterion.Projections;+import org.openmrs.Obs;+import org.openmrs.Retireable;+import org.openmrs.Voidable;+import org.openmrs.annotation.Authorized;+import org.openmrs.annotation.OpenmrsProfile;+import org.openmrs.module.fhir2.FhirConstants;+import org.openmrs.module.fhir2.api.dao.FhirConditionDao;+import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;+import org.openmrs.module.fhir2.api.util.LocalDateTimeFactory;+import org.openmrs.util.PrivilegeConstants;+import org.springframework.beans.factory.annotation.Autowired;+import org.springframework.beans.factory.annotation.Qualifier;+import org.springframework.stereotype.Component;++@Component+@Setter(AccessLevel.PUBLIC)+@OpenmrsProfile(openmrsPlatformVersion = "2.0.5 - 2.1.*")+public class FhirConditionDaoImpl extends BaseFhirDao<Obs> implements FhirConditionDao<Obs> {+	+	@Qualifier("sessionFactory")+	@Autowired+	private SessionFactory sessionFactory;+	+	private final boolean isRetireable;+	+	private final boolean isVoidable;+	+	protected FhirConditionDaoImpl() {+		this.isRetireable = Retireable.class.isAssignableFrom(typeToken.getRawType());+		this.isVoidable = Voidable.class.isAssignableFrom(typeToken.getRawType());+	};+	+	private LocalDateTimeFactory localDateTimeFactory;+	+	@Override+	@Authorized(PrivilegeConstants.GET_OBS)+	public Obs get(@Nonnull String uuid) {+		return super.get(uuid);+	}+	+	@Override+	@Authorized(PrivilegeConstants.EDIT_OBS)+	public Obs createOrUpdate(@Nonnull Obs newEntry) {+		return super.createOrUpdate(newEntry);+	}+	+	@Override+	@Authorized(PrivilegeConstants.DELETE_OBS)+	public Obs delete(@Nonnull String uuid) {+		return super.delete(uuid);+	}+	+	@Override+	@Authorized(PrivilegeConstants.GET_OBS)+	public List<String> getSearchResultUuids(@Nonnull SearchParameterMap theParams) {+		Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Obs.class);+		criteria.add(eq("concept.conceptId", FhirConstants.CONDITION_OBSERVATION_CONCEPT_ID));+		+		DetachedCriteria detachedCriteria = DetachedCriteria.forClass(Obs.class);+		Criteria detachedExecutableCriteria = detachedCriteria.getExecutableCriteria(sessionFactory.getCurrentSession());+		+		if (isVoidable) {+			handleVoidable(detachedExecutableCriteria);+		} else if (isRetireable) {+			handleRetireable(detachedExecutableCriteria);+		}+		+		setupSearchParams(detachedExecutableCriteria, theParams);+		handleSort(detachedExecutableCriteria, theParams.getSortSpec());+		+		detachedCriteria.setProjection(Projections.property("uuid"));+		+		criteria.add(propertyIn("uuid", detachedCriteria));+		criteria.setProjection(Projections.groupProperty("uuid"));+		+		@SuppressWarnings("unchecked")+		List<String> results = criteria.list();+		+		return results;+	}+	+	@Override+	@Authorized(PrivilegeConstants.GET_OBS)+	public List<Obs> getSearchResults(@Nonnull SearchParameterMap theParams, @Nonnull List<String> matchingResourceUuids,+	        int firstResult, int lastResult) {+		return super.getSearchResults(theParams, matchingResourceUuids, firstResult, lastResult);+	}+	+	private Optional<Criterion> handleAgeByDateProperty(@Nonnull String datePropertyName, @Nonnull QuantityParam age) {

sure , i did that

mozzy11

comment created time in 2 hours

pull request commentopenmrs/openmrs-module-fhir2

FM2-332: Map Encounter Type Field

Codecov Report

Merging #320 (70a4bde) into master (24c4a9b) will decrease coverage by 0.03%. The diff coverage is 73.33%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #320      +/-   ##
============================================
- Coverage     84.47%   84.44%   -0.03%     
- Complexity     1977     1980       +3     
============================================
  Files           173      173              
  Lines          5029     5044      +15     
  Branches        569      571       +2     
============================================
+ Hits           4248     4259      +11     
- Misses          458      461       +3     
- Partials        323      324       +1     
Impacted Files Coverage Δ Complexity Δ
.../api/translators/impl/BaseEncounterTranslator.java 82.61% <66.67%> (-17.39%) 7.00 <2.00> (+2.00) :arrow_down:
.../api/translators/impl/EncounterTranslatorImpl.java 100.00% <100.00%> (ø) 8.00 <0.00> (+1.00)

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 24c4a9b...70a4bde. Read the comment docs.

pmanko

comment created time in 4 hours

PR opened openmrs/openmrs-module-fhir2

FM2-332: Map Encounter Type Field

<!--- Add a pull request title above in this format --> <!--- real example: 'FM2-8: Implement the Person Resource' --> <!--- 'FM2-JiraIssueNumber: JiraIssueTitle' -->

Description of what I changed

<!--- Describe your changes in detail --> <!--- It can simply be your commit message, which you must have --> Added support for translating between the Encounter.type field (https://www.hl7.org/fhir/encounter-definitions.html#Encounter.type) and an OpenMRS EncounterType object.

Issue I worked on

<!--- This project only accepts pull requests related to open issues --> <!--- Want a new feature or change? Discuss it in an issue first --> <!--- Found a bug? Point us to the issue/or create one so we can reproduce it --> <!--- Just add the issue number at the end: --> see https://issues.openmrs.org/browse/FM2-332

Checklist: I completed these to help reviewers :)

<!--- Put an x in the box if you did the task --> <!--- If you forgot a task please follow the instructions below -->

  • [x] My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • [x] I have added tests to cover my changes. (If you refactored existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • [x] I ran mvn clean package right before creating this pull request and added all formatting changes to my commit.

    No? -> execute above command

  • [ ] All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • [x] My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

+62 -16

0 comment

3 changed files

pr created time in 4 hours

Pull request review commentBahmni/default-config

BAH-1125 - Swati/Praveena - Hide 'Join teleconsultation' button on non-teleconsultation Appointments

 angular.module('bahmni.common.displaycontrol.custom')             var jitsiMeetingId = $scope.upcomingAppointmentsUUIDs[appointmentIndex];             appService.setTeleConsultationVars(jitsiMeetingId, true);         };+        $scope.showJoinTeleconsultationOption = function (appointmentIndex) {

Please refrain from hard-coding texts. 'Scheduled' - please pull it from config.

praveenadayanand

comment created time in 5 hours

push eventopenmrs/openmrs-module-htmlformentry

openmrs-bot

commit sha 7a1e271b78c4e870a27870204ca082a26d9aa594

committing translations from transifex

view details

push time in 5 hours

Pull request review commentopenmrs/openmrs-module-fhir2

FM2-337: Implement Group resource

+<?xml version="1.0" encoding="UTF-8" ?>+<!--+    This Source Code Form is subject to the terms of the Mozilla Public License,+    v. 2.0. If a copy of the MPL was not distributed with this file, You can+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.++    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS+    graphic logo is a trademark of OpenMRS Inc.+-->+<dataset>+    <cohort cohort_id="1" name="John's patientList" description="cohort voided" creator="1" date_created="2005-01-01 00:00:00.0" voided="true" voided_by="1" date_voided="2005-01-01 00:00:00.0" void_reason="This is voided" uuid="985ff1a2-c2ef-49fd-836f-8a1d936d9ef9"/>+    <cohort cohort_id="2" name="Covid19 patients" description="Covid19 patients" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="1d64befb-3b2e-48e5-85f5-353d43e23e46"/>+</dataset>
</dataset>

corneliouzbett

comment created time in 8 hours

Pull request review commentopenmrs/openmrs-module-fhir2

FM2-337: Implement Group resource

 	@Override 	Patient get(@Nonnull String uuid); 	+	List<Patient> getByIds(Set<Integer> ids);

Is there a reason to prefer Set over Collection here?

corneliouzbett

comment created time in 8 hours

Pull request review commentopenmrs/openmrs-module-fhir2

FM2-337: Implement Group resource

+/*+ * This Source Code Form is subject to the terms of the Mozilla Public License,+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.+ *+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS+ * graphic logo is a trademark of OpenMRS Inc.+ */+package org.openmrs.module.fhir2.api.translators.impl;++import static org.apache.commons.lang3.Validate.notNull;++import javax.annotation.Nonnull;++import lombok.AccessLevel;+import lombok.Setter;+import lombok.extern.slf4j.Slf4j;+import org.hl7.fhir.r4.model.Group;+import org.hl7.fhir.r4.model.Period;+import org.openmrs.CohortMembership;+import org.openmrs.Patient;+import org.openmrs.annotation.OpenmrsProfile;+import org.openmrs.module.fhir2.api.dao.FhirPatientDao;+import org.openmrs.module.fhir2.api.translators.GroupMemberTranslator;+import org.openmrs.module.fhir2.api.translators.PatientReferenceTranslator;+import org.openmrs.module.fhir2.api.translators.PatientTranslator;+import org.springframework.beans.factory.annotation.Autowired;+import org.springframework.stereotype.Component;++@Slf4j+@Component+@Setter(AccessLevel.MODULE)+@OpenmrsProfile(openmrsPlatformVersion = "2.1.* - 2.*")+public class GroupMemberTranslatorImpl_2_1 implements GroupMemberTranslator<CohortMembership> {+	+	@Autowired+	private PatientReferenceTranslator patientReferenceTranslator;+	+	@Autowired+	private FhirPatientDao patientDao;+	+	@Autowired+	private PatientTranslator patientTranslator;+	+	@Override+	public Group.GroupMemberComponent toFhirResource(@Nonnull CohortMembership cohortMember) {+		notNull(cohortMember, "CohortMember object should not be null");+		Group.GroupMemberComponent groupMemberComponent = new Group.GroupMemberComponent();+		groupMemberComponent.setId(cohortMember.getUuid());+		groupMemberComponent.setInactive(!cohortMember.isActive());+		+		Patient patient = patientDao.getPatientById(cohortMember.getPatientId());+		if (patient != null) {+			groupMemberComponent.setEntityTarget(patientTranslator.toFhirResource(patient));

I'm not sure I quite understand what this gives us that we don't get from the next line.

corneliouzbett

comment created time in 8 hours

Pull request review commentopenmrs/openmrs-module-fhir2

FM2-337: Implement Group resource

 	@Autowired 	private SearchQuery<org.openmrs.Patient, Patient, FhirPatientDao, PatientTranslator, SearchQueryInclude<Patient>> searchQuery; 	+	@Override+	public List<Patient> getByIds(Set<Integer> ids) {+		List<Patient> patients = new ArrayList<>();+		ids.forEach(id -> patients.add(translator.toFhirResource(dao.getPatientById(id))));

I'd suggest that it's probably better to create a dao.getPatientsByIds() method that will directly take the collection of ids and return the matching result. That would generally be a lot more performant for the normal case.

corneliouzbett

comment created time in 8 hours

Pull request review commentopenmrs/openmrs-module-fhir2

FM2-337: Implement Group resource

+/*+ * This Source Code Form is subject to the terms of the Mozilla Public License,+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.+ *+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS+ * graphic logo is a trademark of OpenMRS Inc.+ */+package org.openmrs.module.fhir2.api.translators.impl;++import static org.apache.commons.lang3.Validate.notNull;++import javax.annotation.Nonnull;++import lombok.AccessLevel;+import lombok.Setter;+import lombok.extern.slf4j.Slf4j;+import org.hl7.fhir.r4.model.Group;+import org.hl7.fhir.r4.model.Period;+import org.openmrs.CohortMembership;+import org.openmrs.Patient;+import org.openmrs.annotation.OpenmrsProfile;+import org.openmrs.module.fhir2.api.dao.FhirPatientDao;+import org.openmrs.module.fhir2.api.translators.GroupMemberTranslator;+import org.openmrs.module.fhir2.api.translators.PatientReferenceTranslator;+import org.openmrs.module.fhir2.api.translators.PatientTranslator;+import org.springframework.beans.factory.annotation.Autowired;+import org.springframework.stereotype.Component;++@Slf4j+@Component+@Setter(AccessLevel.MODULE)+@OpenmrsProfile(openmrsPlatformVersion = "2.1.* - 2.*")+public class GroupMemberTranslatorImpl_2_1 implements GroupMemberTranslator<CohortMembership> {+	+	@Autowired+	private PatientReferenceTranslator patientReferenceTranslator;+	+	@Autowired+	private FhirPatientDao patientDao;+	+	@Autowired+	private PatientTranslator patientTranslator;+	+	@Override+	public Group.GroupMemberComponent toFhirResource(@Nonnull CohortMembership cohortMember) {+		notNull(cohortMember, "CohortMember object should not be null");+		Group.GroupMemberComponent groupMemberComponent = new Group.GroupMemberComponent();+		groupMemberComponent.setId(cohortMember.getUuid());+		groupMemberComponent.setInactive(!cohortMember.isActive());+		+		Patient patient = patientDao.getPatientById(cohortMember.getPatientId());+		if (patient != null) {+			groupMemberComponent.setEntityTarget(patientTranslator.toFhirResource(patient));+			groupMemberComponent.setEntity(patientReferenceTranslator.toFhirResource(patient));+		}+		+		Period period = new Period();+		period.setStart(cohortMember.getStartDate());+		period.setEnd(cohortMember.getEndDate());+		groupMemberComponent.setPeriod(period);+		+		return groupMemberComponent;+	}+	+	@Override+	public CohortMembership toOpenmrsType(@Nonnull Group.GroupMemberComponent groupMemberComponent) {+		notNull(groupMemberComponent, "GroupMemberComponent object should not be null");+		return toOpenmrsType(new CohortMembership(), groupMemberComponent);+	}+	+	@Override+	public CohortMembership toOpenmrsType(@Nonnull CohortMembership existingCohort,+	        @Nonnull Group.GroupMemberComponent groupMemberComponent) {+		notNull(groupMemberComponent, "GroupMemberComponent object should not be null");+		notNull(existingCohort, "ExistingCohort object should not be null");+		+		if (groupMemberComponent.hasEntity()) {+			existingCohort+			        .setPatientId(patientReferenceTranslator.toOpenmrsType(groupMemberComponent.getEntity()).getPatientId());+		}+		+		if (groupMemberComponent.hasPeriod()) {+			existingCohort.setStartDate(groupMemberComponent.getPeriod().getStart());+			existingCohort.setEndDate(groupMemberComponent.getPeriod().getEnd());+		}+		+		if (groupMemberComponent.hasInactive()) {+			existingCohort.setVoided(groupMemberComponent.getInactive());

I think we also need to set the voidReason value when voiding a value.

corneliouzbett

comment created time in 8 hours

Pull request review commentopenmrs/openmrs-module-fhir2

FM2-337: Implement Group resource

 	@Override 	Patient get(@Nonnull String uuid); 	+	List<Patient> getByIds(Set<Integer> ids);

We should probably have a @Nonnull here too.

corneliouzbett

comment created time in 8 hours

Pull request review commentopenmrs/openmrs-module-fhir2

FM2-337: Implement Group resource

+/*+ * This Source Code Form is subject to the terms of the Mozilla Public License,+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.+ *+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS+ * graphic logo is a trademark of OpenMRS Inc.+ */+package org.openmrs.module.fhir2.api.translators.impl;++import static org.apache.commons.lang3.Validate.notNull;++import javax.annotation.Nonnull;++import java.util.Collection;++import lombok.AccessLevel;+import lombok.Setter;+import lombok.extern.slf4j.Slf4j;+import org.hl7.fhir.r4.model.Group;+import org.openmrs.Cohort;+import org.openmrs.CohortMembership;+import org.openmrs.annotation.OpenmrsProfile;+import org.openmrs.module.fhir2.api.translators.GroupMemberTranslator;+import org.openmrs.module.fhir2.api.translators.GroupTranslator;+import org.springframework.beans.factory.annotation.Autowired;+import org.springframework.context.annotation.Primary;+import org.springframework.stereotype.Component;++@Slf4j+@Primary+@Component+@Setter(AccessLevel.MODULE)+@OpenmrsProfile(openmrsPlatformVersion = "2.1.* - 2.*")+public class GroupTranslatorImpl_2_1 extends BaseGroupTranslator implements GroupTranslator {+	+	@Autowired+	private GroupMemberTranslator<CohortMembership> groupMemberTranslator;+	+	@Override+	public Group toFhirResource(@Nonnull Cohort cohort) {+		notNull(cohort, "Cohort object should not be null");+		Group group = super.toFhirResource(cohort);+		+		Collection<CohortMembership> memberships = cohort.getMemberships();+		log.info("Number of members " + memberships.size());
		log.info("Number of members {}", memberships.size());
corneliouzbett

comment created time in 8 hours

pull request commentopenmrs/openmrs-module-uiframework

UIFR-217: Problem with ConfigurationResourceProvider running on Windows

I always forget about Windows...

mogoodrich

comment created time in 9 hours

create barnchopenmrs/openmrs-module-uiframework

branch : UIFR-217

created branch time in 9 hours

delete branch openmrs/openmrs-module-fhir2

delete branch : dependabot/maven/integration-tests-2.2/com.fasterxml.jackson.core-jackson-databind-2.9.10.7

delete time in 9 hours

pull request commentopenmrs/openmrs-module-fhir2

Bump jackson-databind from 2.9.0 to 2.9.10.7 in /integration-tests-2.2

OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting @dependabot ignore this major version or @dependabot ignore this minor version.

If you change your mind, just re-open this PR and I'll resolve any conflicts on it.

dependabot[bot]

comment created time in 9 hours

PR closed openmrs/openmrs-module-fhir2

Bump jackson-databind from 2.9.0 to 2.9.10.7 in /integration-tests-2.2 dependencies

Bumps jackson-databind from 2.9.0 to 2.9.10.7. <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/FasterXML/jackson/commits">compare view</a></li> </ul> </details> <br />

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
  • @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
  • @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
  • @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
  • @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language

You can disable automated security fix PRs for this repo from the Security Alerts page.

</details>

+1 -1

1 comment

1 changed file

dependabot[bot]

pr closed time in 9 hours

push eventopenmrs/openmrs-module-htmlformentry

Michael Seaton

commit sha cd91a682906822815c6b5c275f79ce7e9e2fa6be

Committing new French translations from transifex.

view details

push time in 9 hours

push eventopenmrs/openmrs-module-smartonfhir

Ankit kumar

commit sha 995f2f4695e4634fc6bddf99ed20ad592b938900

OPTIONS Method added in CORS filter (#7)

view details

push time in 11 hours

PR merged openmrs/openmrs-module-smartonfhir

Reviewers
OPTIONS Method added in CORS filter

@ibacher @VaishSiddharth i've made the changes PTAL.

+12 -5

0 comment

1 changed file

theanandankit

pr closed time in 11 hours

push eventopenmrs/openmrs-module-dhisconnector

Anjula Shanaka

commit sha 5093dbd7d9e59bd32864aba2e6e6bebf553c0f31

DCM:15: Create a six monthly picker in run report (#22)

view details

push time in 14 hours

PR merged openmrs/openmrs-module-dhisconnector

DCM-15: Create a six monthly picker in run report

The issue I worked on

See https://issues.openmrs.org/projects/DCM/issues/DCM-15?filter=allopenissues

Description of what I changed:

Create a six monthly picker in run report

image

+65 -0

0 comment

2 changed files

anjula-sack

pr closed time in 14 hours

push eventopenmrs/openmrs-module-dhisconnector

Piumal Rathnayake

commit sha d09c829720601065dcc49ac170fad37e765bc82a

DCM-32: Support SixMonthly April period type in automation (#24)

view details

push time in 15 hours

PR merged openmrs/openmrs-module-dhisconnector

DCM-32: Support SixMonthly April period type in automation

The issue I worked on

See https://issues.openmrs.org/browse/DCM-32

Description of what I changed:

Added SixMonthly April period type support for automation by updating the following method: src/main/java/org/openmrs/module/dhisconnector/api/impl/DHISConnectorServiceImpl.java:transformToDHISPeriod Added SixMonthly April to supported period types array.

+25 -1

1 comment

2 changed files

Piumal1999

pr closed time in 15 hours

Pull request review commentopenmrs/openmrs-module-oauth2login

OA-21: First authentication to create new OpenMRS user with roles from identity provider

 public User toOpenmrsUser(Properties props) { 	 * @return The corresponding value from the JSON, an empty String if none is found. 	 */ 	public static String get(String userInfoJson, String propertyKey, Properties props, String defaultValue) {-		String propertyValue = props.getProperty(propertyKey);+		String propertyValue = props.getProperty(propertyKey, null); 		String res = defaultValue; 		if (!StringUtils.isEmpty(propertyValue)) { 			res = JsonPath.read(userInfoJson, "$." + propertyValue); 		} 		return res; 	} 	+	/**+	 * Return a roles list based on the OAuth 2 properties mappings.+	 * +	 * @param props The mappings between the user info fields and the corresponding OpenMRS+	 *            user/person properties.+	 * @return The list of roles+	 */+	public List<String> getRoles(Properties props) {++		String rolesName = get(userInfoJson, MAPPINGS_PFX + PROP_ROLES, props,+				null);+		if (rolesName != null) {+			return Arrays.asList(rolesName.split(","));+		} else {+			return new ArrayList<>();+		}+	}

Done

icrc-loliveira

comment created time in 15 hours

push eventopenmrs/openmrs-module-htmlformentry

Michael Seaton

commit sha 815195e19271235ff209e6754590995aea6cb266

Fix to properly translate select label attribute on drugOrder tag.

view details

push time in 16 hours

more