MK: ErrorTrace merger; Person Relationship merger; Multimedia merger;…

… Drug and DrugOrder improvement Merger;

assets/config/opensrp.properties

@@ -1,3 +1,12 @@
+sms.can.be.sent=false
+number.of.audit.messages=1000
+mcts.phone.number=8762963816
+mcts-report-delay-in-days=10
+mcts.poll.time.interval.in.minutes=10
+
+multimedia.directory.name==/multimedia
+multimedia.datastore.directory=D:/testopensrp
+
 form.poll.time.interval=2
 js.directory.name=/ziggy
 form.directory.name=/form
@@ -6,6 +15,8 @@ form.download.files=form.xml, model.xml, form_definition.json
 # scheduler properties
 schedule.config.path=/schedules/schedule-config.xls
 preferred.time=7
+
+admin.task.token=2928392302302930293029302
 openmrs.scheduletracker.syncer.interval-min=2
 
 # OpenMRS configuration
@@ -24,7 +35,7 @@ couchdb.opensrp-db.revision-limit=1
 jdbc.backend=mysql
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.username=root
-jdbc.password=passw
+jdbc.password=password
 #jdbc url with server and port but without database
 jdbc.url-wo-db=jdbc:mysql://localhost:3306
 

assets/config/quartz.properties

@@ -1,17 +1,17 @@
-org.quartz.scheduler.instanceName = MotechScheduler
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 3
+org.quartz.scheduler.instanceName=MotechScheduler
+org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount=3
 
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-org.quartz.jobStore.dataSource = motechDS
-org.quartz.jobStore.tablePrefix = QRTZ_
+org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
+org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+org.quartz.jobStore.dataSource=motechDS
+org.quartz.jobStore.tablePrefix=QRTZ_
 
-org.quartz.dataSource.motechDS.db = etbmotechquartz
-org.quartz.dataSource.motechDS.driver = com.mysql.jdbc.Driver
-org.quartz.dataSource.motechDS.URL = jdbc:mysql://localhost:3306/etbmotechquartz
-org.quartz.dataSource.motechDS.user = root
-org.quartz.dataSource.motechDS.password = password
-org.quartz.dataSource.motechDS.maxConnections = 30
+org.quartz.dataSource.motechDS.db=motechquartz
+org.quartz.dataSource.motechDS.driver=com.mysql.jdbc.Driver
+org.quartz.dataSource.motechDS.URL=jdbc:mysql://localhost:3306/motechquartz
+org.quartz.dataSource.motechDS.user=root
+org.quartz.dataSource.motechDS.password=password
+org.quartz.dataSource.motechDS.maxConnections=30
 
-#org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
+#org.quartz.jobStore.class=org.quartz.simpl.RAMJobStore

build/maven.properties

@@ -1,9 +1,17 @@
 #database configuration that is compiled on maven build time and is not likely to change unless massive refactoring  
-couchdb.db.opensrp=etb-opensrp
-couchdb.db.form=etb-opensrp-form
-couchdb.db.atomfeed=etb-atomfeed
-couchdb.db.mcts=etb-opensrp-mcts
-couchdb.db.error=etb-opensrp-errortrace
+couchdb.db.opensrp=opensrp
+couchdb.db.client=opensrp-client
+couchdb.db.event=opensrp-event
+couchdb.db.alert=opensrp-alert
+couchdb.db.action=opensrp-action
+couchdb.db.drugorder=opensrp-drugorder
+couchdb.db.location=opensrp-location
+couchdb.db.multimedia=opensrp-multimedia
+couchdb.db.provider=opensrp-provider
+couchdb.db.form=opensrp-form
+couchdb.db.atomfeed=atomfeed
+couchdb.db.mcts=opensrp-mcts
+couchdb.db.error=opensrp-errortrace
 
 db.reporting=opensrp
 db.reporting.report=report

opensrp-api/src/main/java/org/opensrp/api/domain/Drug.java

@@ -0,0 +1,146 @@
+package org.opensrp.api.domain;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.ektorp.support.TypeDiscriminator;
+import org.joda.time.LocalDate;
+import org.motechproject.model.MotechBaseDataObject;
+
+@TypeDiscriminator("doc.type === 'Drug'")
+public class Drug extends BaseDataObject {
+	@JsonProperty
+	private String drugName;
+	@JsonProperty
+	private String drugBaseName;
+	@JsonProperty
+	private Map<String, String> codes;
+	@JsonProperty
+	private String route;
+	@JsonProperty
+	private String id;
+	@JsonProperty
+	private String creator;
+	@JsonProperty
+	private String doseStrength;
+	@JsonProperty
+	private String units;
+	@JsonProperty
+	private String maximumDailyDose;
+	@JsonProperty
+	private String minimumDailyDose;
+	@JsonProperty
+	private String description;
+
+
+	@JsonProperty
+	private String combination;
+
+
+	protected Drug() {
+
+	}
+
+	public Drug(String baseEntityId) {
+
+	}
+	public Drug(String drugName,String drugBaseName, Map<String, String> codes,
+			String route, String creator, String doseStrenght
+			, String units, String maxDailyDose,String miniDailyDose,String Description,String combination) {
+	this.drugName=drugName;
+	this.drugBaseName=drugBaseName;
+	this.codes=codes;
+	this.creator=creator;
+	this.doseStrength=doseStrenght;
+	this.route=route;
+	this.maximumDailyDose=maxDailyDose;
+	this.minimumDailyDose=miniDailyDose;
+	this.description=Description;
+	this.combination=combination;
+
+
+	}
+	@Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this, "id");
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }              
+	public String getDoseStrength() {
+		return doseStrength;
+	}
+
+	public void setDoseStrength(String doseStrength) {
+		this.doseStrength = doseStrength;
+	}
+
+	public String getUnits() {
+		return units;
+	}
+
+	public void setUnits(String units) {
+		this.units = units;
+	}
+
+	public String getMaximumDailyDose() {
+		return maximumDailyDose;
+	}
+
+	public void setMaximumDailyDose(String maximumDailyDose) {
+		this.maximumDailyDose = maximumDailyDose;
+	}
+
+	public String getMinimumDailyDose() {
+		return minimumDailyDose;
+	}
+
+	public void setMinimumDailyDose(String minimumDailyDose) {
+		this.minimumDailyDose = minimumDailyDose;
+	}
+
+	public String getRoute() {
+		return route;
+	}
+
+	public void setRoute(String route) {
+		this.route = route;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+
+	public String getCreatorName() {
+		return creator;
+	}
+
+	public void setCreatorName(String creator) {
+		this.creator = creator;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getCombination() {
+		return combination;
+	}
+
+	public void setCombination(String combination) {
+		this.combination = combination;
+	}	
+}