Site properties configuration (#22)

src/main/java/org/openhds/config/DaoApplicationContext.java → src/main/java/org/openhds/config/DaoConfig.java

@@ -59,9 +59,9 @@
 
 @Configuration
 @EnableTransactionManagement
-@Import({DomainApplicationContext.class} )
+@Import({DomainConfig.class} )
 @PropertySource({"classpath:database.properties"})
-public class DaoApplicationContext {
+public class DaoConfig {
 
 	@Autowired
 	private Environment env;

src/main/java/org/openhds/config/DatabaseConfig.java

@@ -1,7 +1,6 @@
 package org.openhds.config;
 
 
-import org.openhds.constraint.AppContextAware;
 import org.openhds.service.JsfService;
 import org.openhds.web.beans.DatabaseConfigBean;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/org/openhds/config/DomainApplicationContext.java → src/main/java/org/openhds/config/DomainConfig.java

@@ -17,7 +17,7 @@
 
 @Configuration
 @ComponentScan(basePackages = "org.openhds.domain")
-public class DomainApplicationContext {
+public class DomainConfig {
 	@Bean
 	public Jaxb2Marshaller jaxb2Marshaller()
 	{

src/main/java/org/openhds/config/IdGenerationConfiguration.java → src/main/java/org/openhds/config/IdGenConfig.java

@@ -22,7 +22,7 @@
 @Configuration
 @PropertySource({"classpath:site-config.properties"})
 @ComponentScan(basePackages= {"org.openhds.idgeneration"})
-public class IdGenerationConfiguration {
+public class IdGenConfig {
 	@Autowired
 	Environment env;
 

src/main/java/org/openhds/config/ServiceApplicationContext.java → src/main/java/org/openhds/config/ServiceConfig.java

@@ -22,9 +22,9 @@
 
 
 @Configuration
-@Import({DomainApplicationContext.class,  DaoApplicationContext.class})
+@Import({DomainConfig.class,  DaoConfig.class})
 @ComponentScan(basePackages= {"org.openhds.service"})
-public class ServiceApplicationContext {
+public class ServiceConfig {
 
 
 	@Bean
@@ -156,16 +156,12 @@ public SettingsService settingsService(SitePropertiesService siteProperties, Dao
 		return new SettingsServiceImpl(siteProperties, asyncTask, formService, fieldworkerService);
 	}
 
-	@Bean
-	public SitePropertiesService siteProperties() {
-		return new SitePropertiesServiceImpl();
-	}
 
 	@Bean
 	public SiteConfigService siteConfigService() {
 		return new SiteConfigServiceImpl();
 	}
-
+	  
 	@Bean
 	public SocialGroupService socialGroupService(GenericDao dao, IndividualService individualService, EntityService entityService, 
 			SocialGroupGenerator sgGenerator) {

src/main/java/org/openhds/config/SitePropertiesConfig.java

@@ -0,0 +1,208 @@
+package org.openhds.config;
+
+import org.openhds.service.JsfService;
+import org.openhds.service.SiteConfigService;
+import org.openhds.service.SitePropertiesService;
+import org.openhds.service.impl.SitePropertiesServiceImpl;
+import org.openhds.web.beans.SitePropertiesConfigBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@PropertySource({"classpath:codes.properties", "classpath:site-config.properties"})
+public class SitePropertiesConfig {
+
+	@Value("${locale}")
+	String locale;
+
+	@Value("${dateFormat}")
+	String dateFormat;
+
+	@Value("${autocomplete}")
+	String autocomplete;
+
+	@Value("${unknownIdentifier}")
+	String unknownIdentifier;
+
+	@Value("${inmigration}")
+	String inmigrationCode;
+
+	@Value("${outmigration}")
+	String outmigrationCode;
+
+	@Value("${birth}")
+	String birthCode;
+
+	@Value("${death}")
+	String deathCode;
+
+	@Value("${deathOfHOH}")
+	String deathOfHOHCode;
+
+	@Value("${enumeration}")
+	String enumerationCode;
+
+	@Value("${marriage}")
+	String marriageCode;
+
+	@Value("${divorceSeparation}")
+	String divorceSeparationCode;
+
+	@Value("${notApplicable}")
+	String notApplicableCode;
+
+	@Value("${liveBirth}")
+	String liveBirthCode;
+
+	@Value("${stillBirth}")
+	String stillBirthCode;
+
+	@Value("${miscarriage}")
+	String miscarriageCode;
+
+	@Value("${abortion}")
+	String abortionCode;
+
+	@Value("${male}")
+	String maleCode;
+
+	@Value("${female}")
+	String femaleCode;
+
+	@Value("${dataStatusWarning}")
+	String dataStatusWarningCode;
+
+	@Value("${dataStatusValid}")
+	String dataStatusValidCode;
+
+	@Value("${dataStatusFatal}")
+	String dataStatusFatalCode;
+
+	@Value("${dataStatusVoid}")
+	String dataStatusVoidCode;
+
+	@Value("${dataStatusPending}")
+	String dataStatusPendingCode;
+
+	@Value("${dataStatusClosed}")
+	String dataStatusClosedCode;
+
+	@Value("${minAgeOfParenthood}")
+	String minimumAgeOfParents;
+
+	@Value("${minAgeOfHouseholdHead}")
+	String minimumAgeOfHouseholdHead;
+
+	@Value("${minAgeOfMarriage}")
+	String minimumAgeOfMarriage;
+
+	@Value("${minAgeOfPregnancy}")
+	String minimumAgeOfPregnancy;
+
+	@Value("${yesResponse}")
+	String yesResponse;
+
+	@Value("${noResponse}")
+	String noResponse;
+
+	@Value("${earliestEnumerationDate}")
+	String earliestEnumerationDate;
+
+	@Value("${earliestEventDate}")
+	String earliestEventDate;
+
+	@Value("${specialStudyLocation}")
+	String specialStudyLocation;
+
+	@Value("${visitAt}")
+	String visitAt;
+
+	@Value("${ethiopianCalendar}")
+	String ethiopianCalendar;
+
+	@Bean
+	public SitePropertiesService siteProperties() {
+		SitePropertiesServiceImpl properties = new SitePropertiesServiceImpl();
+		properties.setLocale(locale);
+		properties.setDateFormat(dateFormat);
+		properties.setAutocomplete(Boolean.parseBoolean(autocomplete));
+		properties.setUnknownIdentifier(unknownIdentifier);
+		properties.setInmigrationCode(inmigrationCode);
+		properties.setOutmigrationCode(outmigrationCode);
+		properties.setBirthCode(birthCode);
+		properties.setDeathCode(deathCode);
+		properties.setDeathOfHOHCode(deathOfHOHCode);
+		properties.setEnumerationCode(enumerationCode);
+		properties.setMarriageCode(marriageCode);
+		properties.setDivorceSeparationCode(divorceSeparationCode);
+		properties.setNotApplicableCode(notApplicableCode);
+		properties.setLiveBirthCode(liveBirthCode);
+		properties.setStillBirthCode(stillBirthCode);
+		properties.setMiscarriageCode(miscarriageCode);
+		properties.setAbortionCode(abortionCode);
+		properties.setMaleCode(femaleCode);
+		properties.setFemaleCode(femaleCode);
+		properties.setDataStatusWarningCode(dataStatusWarningCode);
+		properties.setDataStatusValidCode(dataStatusValidCode);
+		properties.setDataStatusFatalCode(dataStatusFatalCode);
+		properties.setDataStatusVoidCode(dataStatusVoidCode);
+		properties.setDataStatusClosedCode(dataStatusClosedCode);
+		properties.setMinimumAgeOfHouseholdHead(Integer.parseInt(minimumAgeOfHouseholdHead));
+		properties.setMinimumAgeOfMarriage(Integer.parseInt(minimumAgeOfMarriage));
+		properties.setMinimumAgeOfParents(Integer.parseInt(minimumAgeOfParents));
+		properties.setMinimumAgeOfPregnancy(Integer.parseInt(minimumAgeOfPregnancy));
+		properties.setYesResponse(yesResponse);
+		properties.setNoResponse(noResponse);
+		properties.setEarliestEnumerationDate(earliestEnumerationDate);
+		properties.setEarliestEventDate(earliestEventDate);
+		properties.setSpecialStudyLocation(specialStudyLocation);
+		properties.setVisitAt(visitAt);
+		properties.setEthiopianCalendar(Boolean.parseBoolean(ethiopianCalendar));
+		return properties;
+	}
+
+	@Bean
+	public SitePropertiesConfigBean sitePropertiesConfigBean(JsfService jsfService, SiteConfigService siteConfigService, SitePropertiesService siteProperties) {
+		SitePropertiesConfigBean config = new SitePropertiesConfigBean();
+		config.setJsfService(jsfService);
+		config.setSiteConfigService(siteConfigService);
+		config.setSitePropertiesService(siteProperties);
+		config.setLocale(locale);
+		config.setDateFormat(dateFormat);
+		config.setAutocomplete(autocomplete);
+		config.setUnknownIdentifier(unknownIdentifier);
+		config.setInmigration(inmigrationCode);
+		config.setOutmigration(outmigrationCode);
+		config.setBirth(birthCode);
+		config.setDeath(deathCode);
+		config.setDeathOfHOH(deathOfHOHCode);
+		config.setEnumeration(enumerationCode);
+		config.setMarriage(marriageCode);
+		config.setDivorceSeparation(divorceSeparationCode);
+		config.setNotApplicable(notApplicableCode);
+		config.setLiveBirth(liveBirthCode);
+		config.setStillBirth(stillBirthCode);
+		config.setMiscarriage(miscarriageCode);
+		config.setAbortion(abortionCode);
+		config.setMale(femaleCode);
+		config.setFemale(femaleCode);
+		config.setDataStatusWarning(dataStatusWarningCode);
+		config.setDataStatusValid(dataStatusValidCode);
+		config.setDataStatusFatal(dataStatusFatalCode);
+		config.setDataStatusVoid(dataStatusVoidCode);
+		config.setDataStatusClosed(dataStatusClosedCode);
+		config.setMinAgeOfHouseholdHead(Integer.parseInt(minimumAgeOfHouseholdHead));
+		config.setMinAgeOfMarriage(Integer.parseInt(minimumAgeOfMarriage));
+		config.setMinAgeOfParenthood(Integer.parseInt(minimumAgeOfParents));
+		config.setMinAgeOfPregnancy(Integer.parseInt(minimumAgeOfPregnancy));
+		config.setYesResponse(yesResponse);
+		config.setNoResponse(noResponse);
+		config.setEarliestEnumerationDate(earliestEnumerationDate);
+		config.setEarliestEventDate(earliestEventDate);
+		config.setVisitAt(visitAt);
+		config.setEthiopianCalendar(ethiopianCalendar);
+		return config;
+	}
+}

src/main/java/org/openhds/config/TaskApplicationContext.java → src/main/java/org/openhds/config/TaskConfig.java

@@ -11,7 +11,7 @@
 @Configuration
 @EnableAsync()
 @ComponentScan(basePackages= {"org.openhds.task"})
-public class TaskApplicationContext {
+public class TaskConfig {
 	@Bean
 	public Executor taskExecutor() {
 		ThreadPoolTaskExecutor task = new ThreadPoolTaskExecutor();

src/main/java/org/openhds/config/WebApplicationContext.java → src/main/java/org/openhds/config/WebConfig.java

@@ -136,8 +136,8 @@
 @SuppressWarnings(value = { "unchecked", "rawtypes" })
 @Configuration
 @ComponentScan(basePackages= {"org.openhds.web", "org.openhds.converter"})
-public class WebApplicationContext {
-	Logger logger = LoggerFactory.getLogger(WebApplicationContext.class);
+public class WebConfig {
+	Logger logger = LoggerFactory.getLogger(WebConfig.class);
 
 	@Autowired
 	private Environment env;

src/main/resources/codes.properties

@@ -35,3 +35,4 @@ dataStatusPending=P
 locale=English
 visitAt=location
 ethiopianCalendar=0
+specialStudyLocation=/specialstudy

src/main/resources/site-config.properties

@@ -123,3 +123,5 @@ openhds.fwFirstNameLength=1
 openhds.fwLastNameLength=1
 # use the provided field worker generator? if not, you must enter the id yourself
 openhds.fwIdUseGenerator=true
+
+openhds.specialStudyLocation=/specialstudy