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%.

@@             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

Description of what I changed

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

see https://issues.openmrs.org/browse/FM2-332

Checklist: I completed these to help reviewers :)

[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

1 commit in IsantePlus/openmrs-module-fhir2/tree/fm2-332-encounter-type openmrs/openmrs-module-fhir2/tree/master

0 comment

3 changed files

pr created time in 4 hours

PR opened Bahmni/openmrs-module-bahmni.ie.apps

BAH-1128|Buvaneswari|Imported forms not saved properly.

+14 -12

1 commit in buvaneswari-arun/openmrs-module-bahmni.ie.apps/tree/BAH-1128 Bahmni/openmrs-module-bahmni.ie.apps/tree/master

0 comment

1 changed file

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