Report-870

.github/workflows/maven.yml

@@ -0,0 +1,39 @@
+# this build is designed to replicate the Travis CI workflow
+name: Build with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        platform: [ ubuntu-latest ]
+        java-version: [ 8 ]
+        profile: [ 1.10, 1.11, 1.12, 2.0, 2.1, 2.2, 2.3, 2.4 ]
+
+    runs-on: ${{ matrix.platform }}
+    env:
+      PLATFORM: ${{ matrix.platform }}
+      JAVA_VERSION: ${{ matrix.java-version }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java-version }}
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: mvn clean install -P ${{ matrix.profile }} --batch-mode --show-version --file pom.xml
+

README.md

@@ -18,15 +18,15 @@ Requirements
 ================
 OpenMRS 1.5.2 or higher
 
-###Required Modules:
+### Required Modules:
 1. HTML Widgets 1.5.5
 2. Serialization XStream 0.1.8.1
 3. Calculation 1.2
 
-###Recommended modules:
+### Recommended modules:
 1. Reporting Compatibility 1.5.0.3
 
-View, download or fork source code: on GitHub
+View, download or fork source code on GitHub
 
 
 Installation
@@ -41,9 +41,9 @@ Upgrade
 To upgrade from Reporting Module 0.3.x:
   1. Check to make sure that you have all of the Required Modules installed on your system.
   2. Log into OpenMRS
-  3. Navigate to Admin > Manage Modules.
+  3. Navigate to `Admin` > `Manage Modules`.
   4. Click the trash icon next to Reporting 0.3.x to remove the module from your system.
-  5. Navigate to the newer omod on your system using the browse button and click Upload.
+  5. Navigate to the newer omod on your system using the browse button and click `Upload`.
 
 
 Privileges

api-1.10/.gitignore

@@ -0,0 +1,4 @@
+/.settings
+/.classpath
+/.project
+/target

api-1.10/pom.xml

@@ -0,0 +1,88 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.openmrs.module</groupId>
+        <artifactId>reporting</artifactId>
+        <version>1.27.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>reporting-api-1.10</artifactId>
+    <packaging>jar</packaging>
+    <name>reporting Module api 1.10</name>
+    <description>1.10 api project for reporting</description>
+
+    <properties>
+        <openMRSVersion>1.10.6</openMRSVersion>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>${project.parent.artifactId}-api</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>${project.parent.artifactId}-api-tests</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type> 
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openmrs.api</groupId>
+            <artifactId>openmrs-api</artifactId>
+            <version>${openMRSVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openmrs.api</groupId>
+            <artifactId>openmrs-api</artifactId>
+            <type>test-jar</type>            
+            <version>${openMRSVersion}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openmrs.test</groupId>
+            <artifactId>openmrs-test</artifactId>
+            <version>${openMRSVersion}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <excludes>
+                    <exclude>**/*.properties</exclude>
+                    <exclude>**/*.xml</exclude>
+                </excludes>
+                <filtering>false</filtering>
+            </testResource>
+        </testResources>
+    </build>
+
+</project>

api-1.10/src/main/java/org/openmrs/module/reporting/cohort/definition/DrugOrderCohortDefinition.java

@@ -0,0 +1,194 @@
+/**
+ * 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.reporting.cohort.definition;
+
+import org.openmrs.Concept;
+import org.openmrs.CareSetting;
+import org.openmrs.Drug;
+
+import org.openmrs.module.reporting.common.Match;
+import org.openmrs.module.reporting.common.Localized;
+import org.openmrs.module.reporting.definition.configuration.ConfigurationProperty;
+import org.openmrs.module.reporting.definition.configuration.ConfigurationPropertyCachingStrategy;
+import org.openmrs.module.reporting.evaluation.caching.Caching;
+
+import java.util.Date;
+import java.util.List;
+
+@Caching(strategy = ConfigurationPropertyCachingStrategy.class)
+@Localized("reporting.DrugOrderCohortDefinition")
+public class DrugOrderCohortDefinition extends BaseCohortDefinition {
+
+    public static final long serialVersionUID = 1L;
+
+    @ConfigurationProperty(group = "which")
+    private Match which;
+
+    @ConfigurationProperty(value = "drugConcepts")
+    private List<Concept> drugConcepts;
+
+    @ConfigurationProperty(value = "drugSets")
+    private List<Concept> drugSets;
+
+    @ConfigurationProperty(value = "activatedOnOrBefore")
+    private Date activatedOnOrBefore;
+
+    @ConfigurationProperty(value = "activatedOnOrAfter")
+    private Date activatedOnOrAfter;
+
+    @ConfigurationProperty(value = "activeOnOrBefore")
+    private Date activeOnOrBefore;
+
+    @ConfigurationProperty(value = "activeOnOrAfter")
+    private Date activeOnOrAfter;
+
+    @ConfigurationProperty(value = "activeOnDate")
+    private Date activeOnDate;
+
+    @ConfigurationProperty(value = "careSetting")
+    private CareSetting careSetting;
+
+    @ConfigurationProperty(value = "drugs")
+    private List<Drug> drugs;    
+
+    public DrugOrderCohortDefinition() {
+    }
+
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Patients ");
+
+        if (this.which != null) {
+            builder.append(" taking " + this.which.toString() + " of the drugs ");
+        }
+
+        if (this.getDrugConcepts() != null && this.getDrugConcepts().size() > 0) {
+            builder.append("taking generic drugs, or drugs with ingredients ");
+            for (Concept concept : this.getDrugConcepts()) {
+                builder.append(concept.getDisplayString() + " ");
+            }
+        }
+        if (this.getDrugSets() != null && this.getDrugSets().size() > 0) {
+            for (Concept concept : this.getDrugSets()) {
+                builder.append(concept.getDisplayString() + " ");
+            }
+        }
+
+        if (this.getDrugs() != null && this.getDrugs().size() > 0) {
+        	for (Drug drug : this.getDrugs()) {
+                builder.append(drug.getDisplayName() + " ");
+            }
+
+        }
+
+        if (this.getActivatedOnOrBefore() != null) {
+            builder.append("activated on or before " + this.getActivatedOnOrBefore() + " ");
+        }
+        if (this.getActivatedOnOrAfter() != null) {
+            builder.append("activated on or after " + this.getActivatedOnOrAfter() + " ");
+        }
+
+        if (this.getActiveOnOrBefore() != null) {
+            builder.append("been active on or before " + this.getActiveOnOrBefore() + " ");
+        }
+        if (this.getActiveOnOrAfter() != null) {
+            builder.append("been active on or before " + this.getActiveOnOrAfter() + " ");
+        }
+        if (this.getActiveOnDate() != null) {
+        	builder.append("active by " + this.getActiveOnDate() + " ");
+        }
+        if (this.careSetting != null) {
+            builder.append("with care setting of " + this.careSetting + " ");
+        }
+        return builder.toString();
+    }
+
+    public Match getWhich() {
+        return this.which;
+    }
+
+    public void setWhich(Match which) {
+        this.which = which;
+    }
+
+    public List<Concept> getDrugConcepts() {
+        return drugConcepts;
+    }
+
+    public void setDrugConcepts(List<Concept> drugConcepts) {
+        this.drugConcepts = drugConcepts;
+    }
+
+    public List<Concept> getDrugSets() {
+        return drugSets;
+    }
+
+    public void setDrugSets(List<Concept> drugSets) {
+        this.drugSets = drugSets;
+    }
+
+    public List<Drug> getDrugs() {
+        return drugs;
+    }
+
+    public void setDrugs(List<Drug> drugs) {
+        this.drugs = drugs;
+    }
+
+    public Date getActivatedOnOrBefore() {
+        return activatedOnOrBefore;
+    }
+
+    public void setActivatedOnOrBefore(Date activatedOnOrBefore) {
+        this.activatedOnOrBefore = activatedOnOrBefore;
+    }
+
+    public Date getActivatedOnOrAfter() {
+        return activatedOnOrAfter;
+    }
+
+    public void setActivatedOnOrAfter(Date activatedOnOrAfter) {
+        this.activatedOnOrAfter = activatedOnOrAfter;
+    }
+
+    public Date getActiveOnOrBefore() {
+        return activeOnOrBefore;
+    }
+
+    public void setActiveOnOrBefore(Date activeOnOrBefore) {
+        this.activeOnOrBefore = activeOnOrBefore;
+    }
+
+    public Date getActiveOnOrAfter() {
+        return activeOnOrAfter;
+    }
+
+    public void setActiveOnOrAfter(Date activeOnOrAfter) {
+        this.activeOnOrAfter = activeOnOrAfter;
+    }
+
+    public Date getActiveOnDate() {
+        return activeOnDate;
+    }
+
+    public void setActiveOnDate(Date activeOnDate) {
+        this.activeOnDate = activeOnDate;
+    }
+
+    public CareSetting getCareSetting() {
+        return careSetting;
+    }
+
+    public void setCareSetting(CareSetting careSetting) {
+        this.careSetting = careSetting;
+    }
+
+}