Skip to content

Spike on modularisation #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gigix wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Spike on modularisation #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b70d5f
XJ - in the middle of moving child register to its own folder
gigix Feb 12, 2015
acebd0f
XJ - moved all java files about child register to its own folder
gigix Feb 12, 2015
7b1eb67
XJ - moved everything about child register to its own folder
gigix Feb 12, 2015
04e341e
XJ - in middle of hiding unavailable registers
gigix Feb 12, 2015
ba647be
XJ - each implementation profile can choose to hide unavailable regis…
gigix Feb 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dristhi-app/assets/app-extra.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AVAILABLE_REGISTERS=WAIT_FOR_VALUE
48 changes: 0 additions & 48 deletions dristhi-app/assets/www/child_detail.html
View file
Open in desktop

This file was deleted.

151 changes: 149 additions & 2 deletions dristhi-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,72 @@
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<executions>
<execution>
<id>copy-assets</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/assets</outputDirectory>
<resources>
<resource>
<directory>${basedir}/assets</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-res</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/res</outputDirectory>
<resources>
<resource>
<directory>${basedir}/res</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>${basedir}/target/assets/app-extra.properties</file>
<replacements>
<replacement>
<token>WAIT_FOR_VALUE</token>
<value>${availableRegisters}</value>
</replacement>
</replacements>
</configuration>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
<assetsDirectory>${project.basedir}/assets</assetsDirectory>
<resourceDirectory>${project.basedir}/res</resourceDirectory>
<assetsDirectory>${project.basedir}/target/assets</assetsDirectory>
<resourceDirectory>${project.basedir}/target/res</resourceDirectory>
<nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
<sdk>
<platform>16</platform>
Expand Down Expand Up @@ -164,6 +222,95 @@
</plugins>
</build>
<profiles>
<profile>
<id>bangladesh</id>
<properties>
<availableRegisters>EC:FP:ANC:PNC:CHILD</availableRegisters>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<executions>
<execution>
<id>copy-extra-assets</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/assets</outputDirectory>
<resources>
<resource>
<directory>${basedir}/registers/child/assets</directory>
</resource>
</resources>
<overwrite>false</overwrite>
</configuration>
</execution>
<execution>
<id>copy-extra-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/res</outputDirectory>
<resources>
<resource>
<directory>${basedir}/registers/child/res</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>registers/child/src/main/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pakistan</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>registers/child/src/main/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>sign</id>
<build>
Expand Down
0 ...p/assets/template/child_detail.handlebars → ...d/assets/template/child_detail.handlebars
View file
Open in desktop
File renamed without changes.
48 changes: 48 additions & 0 deletions dristhi-app/registers/child/assets/www/child_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!DOCTYPE HTML>
<html>
<head>
<link href="../../../../assets/css/bootstrap.css" rel="stylesheet">
<link href="../../../../assets/css/custom.css" rel="stylesheet">
<link href="../../../../assets/css/timeline.css" rel="stylesheet">

<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
</head>

<body>

<div class="page">
<div id="mainpanel" class="mainpanel"></div>
</div>

</body>

<script src="../../../../assets/js/lib/jquery.min.js"></script>
<script src="../../../../assets/js/lib/jquery-ui-1.8.23.custom.min.js"></script>
<script src="../../../../assets/js/lib/bootstrap.min.js"></script>
<script src="../../../../assets/js/lib/handlebars.runtime.js"></script>

<script src="../../../../assets/js/custom.ui.js"></script>
<script src="../../../../assets/template/templates.js"></script>
<script src="../../../../assets/js/modal.js"></script>
<script src="../../../../assets/js/international_text.js"></script>
<script src="../../../../assets/js/page_view.js"></script>
<script src="../../../../assets/js/form_context.js"></script>

<script src="../../../../assets/js/child_detail.js"></script>
<script>
$(document).ready(function () {
var child = new Child(new ChildBridge(), new FormBridge());
child.populateInto("#mainpanel");
child.bindEveryItemToForm(".modal-row");
child.bindToCamera("#childPhoto");
child.bindPhoto("#childPhoto");

pageView.onReloadPhoto(function (caseId, photoPath) {
child.reloadPhoto("#childPhoto", caseId, photoPath);
});

new Modal().bindToClick();
});
</script>

</html>
0 ...-app/assets/www/form/child_close/form.xml → ...hild/assets/www/form/child_close/form.xml
View file
Open in desktop
File renamed without changes.
0 ...www/form/child_close/form_definition.json → ...www/form/child_close/form_definition.json
View file
Open in desktop
File renamed without changes.
0 ...app/assets/www/form/child_close/model.xml → ...ild/assets/www/form/child_close/model.xml
View file
Open in desktop
File renamed without changes.
0 ...pp/assets/www/form/child_illness/form.xml → ...ld/assets/www/form/child_illness/form.xml
View file
Open in desktop
File renamed without changes.
0 ...w/form/child_illness/form_definition.json → ...w/form/child_illness/form_definition.json
View file
Open in desktop
File renamed without changes.
0 ...p/assets/www/form/child_illness/model.xml → ...d/assets/www/form/child_illness/model.xml
View file
Open in desktop
File renamed without changes.
0 ...ets/www/form/child_immunizations/form.xml → ...ets/www/form/child_immunizations/form.xml
View file
Open in desktop
File renamed without changes.
0 .../child_immunizations/form_definition.json → .../child_immunizations/form_definition.json
View file
Open in desktop
File renamed without changes.
0 ...ts/www/form/child_immunizations/model.xml → ...ts/www/form/child_immunizations/model.xml
View file
Open in desktop
File renamed without changes.
0 ...s/www/form/child_registration_ec/form.xml → ...s/www/form/child_registration_ec/form.xml
View file
Open in desktop
File renamed without changes.
0 ...hild_registration_ec/form_definition.json → ...hild_registration_ec/form_definition.json
View file
Open in desktop
File renamed without changes.
0 .../www/form/child_registration_ec/model.xml → .../www/form/child_registration_ec/model.xml
View file
Open in desktop
File renamed without changes.
0 ...s/www/form/child_registration_oa/form.xml → ...s/www/form/child_registration_oa/form.xml
View file
Open in desktop
File renamed without changes.
0 ...hild_registration_oa/form_definition.json → ...hild_registration_oa/form_definition.json
View file
Open in desktop
File renamed without changes.
0 .../www/form/child_registration_oa/model.xml → .../www/form/child_registration_oa/model.xml
View file
Open in desktop
File renamed without changes.
42 changes: 21 additions & 21 deletions ...ts/www/smart_registry/child_register.html → ...ts/www/smart_registry/child_register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<!doctype html>
<html ng-app="smartRegistry">
<head>
<link href="../../css/smart_registry/reset.css" media="all" rel="stylesheet" type="text/css"/>
<link href="../../css/smart_registry/styles.css" media="all" rel="stylesheet" type="text/css"/>
<link href="../../css/smart_registry/smart_registry.css" media="all" rel="stylesheet" type="text/css"/>
<link href="../../css/flat-bootstrap.css" rel="stylesheet">
<link href="../../css/custom.css" rel="stylesheet">
<script src="../../js/lib/angular.min.js" type="text/javascript"></script>
<script src="../../js/lib/ui-bootstrap-tpls-0.3.0.min.js"></script>
<script src="../../js/page_view.js"></script>
<script src="../../js/village.js"></script>
<script src="../../js/anmNavigation.js" type="text/javascript"></script>
<script src="../../js/form_context.js" type="text/javascript"></script>
<script src="../../js/smart_registry/app.js" type="text/javascript"></script>
<script src="../../js/smart_registry/smart_filters.js" type="text/javascript"></script>
<script src="../../js/smart_registry/smart_helper_service.js" type="text/javascript"></script>
<script src="../../js/smart_registry/smart_directives.js" type="text/javascript"></script>
<script src="../../js/smart_registry/debounce_service.js" type="text/javascript"></script>
<script src="../../js/smart_registry/child_service.js" type="text/javascript"></script>
<script src="../../js/smart_registry/list_view_controller.js" type="text/javascript"></script>
<script src="../../js/smart_registry/child_registry_bridge.js" type="text/javascript"></script>
<script src="../../js/smart_registry/anm_location_bridge.js" type="text/javascript"></script>
<script src="../../js/smart_registry/child_register_app.js" type="text/javascript"></script>
<link href="../../../../../assets/css/smart_registry/reset.css" media="all" rel="stylesheet" type="text/css"/>
<link href="../../../../../assets/css/smart_registry/styles.css" media="all" rel="stylesheet" type="text/css"/>
<link href="../../../../../assets/css/smart_registry/smart_registry.css" media="all" rel="stylesheet" type="text/css"/>
<link href="../../../../../assets/css/flat-bootstrap.css" rel="stylesheet">
<link href="../../../../../assets/css/custom.css" rel="stylesheet">
<script src="../../../../../assets/js/lib/angular.min.js" type="text/javascript"></script>
<script src="../../../../../assets/js/lib/ui-bootstrap-tpls-0.3.0.min.js"></script>
<script src="../../../../../assets/js/page_view.js"></script>
<script src="../../../../../assets/js/village.js"></script>
<script src="../../../../../assets/js/anmNavigation.js" type="text/javascript"></script>
<script src="../../../../../assets/js/form_context.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/app.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/smart_filters.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/smart_helper_service.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/smart_directives.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/debounce_service.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/child_service.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/list_view_controller.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/child_registry_bridge.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/anm_location_bridge.js" type="text/javascript"></script>
<script src="../../../../../assets/js/smart_registry/child_register_app.js" type="text/javascript"></script>
</head>
<body ng-controller="childRegisterController">
<div ng-controller="listViewController">
Expand Down
0 ...ut/child_register_client_last_service.xml → ...ut/child_register_client_last_service.xml
View file
Open in desktop
File renamed without changes.
0 ...out/child_register_client_sick_status.xml → ...out/child_register_client_sick_status.xml
View file
Open in desktop
File renamed without changes.
0 ...r_immunization0to9_service_mode_views.xml → ...r_immunization0to9_service_mode_views.xml
View file
Open in desktop
File renamed without changes.
0 ..._immunization9plus_service_mode_views.xml → ..._immunization9plus_service_mode_views.xml
View file
Open in desktop
File renamed without changes.
0 ..._register_overview_service_mode_views.xml → ..._register_overview_service_mode_views.xml
View file
Open in desktop
File renamed without changes.
0 ...ayout/child_smart_register_id_details.xml → ...ayout/child_smart_register_id_details.xml
View file
Open in desktop
File renamed without changes.
61 changes: 61 additions & 0 deletions dristhi-app/registers/child/src/main/java/org/ei/drishti/AllConstantsForChildRegister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package org.ei.drishti;

public class AllConstantsForChildRegister {
public class ChildRegistrationECFields {
public static final String BCG_DATE = "bcgDate";
public static final String MEASLES_DATE = "measlesDate";
public static final String MEASLESBOOSTER_DATE = "measlesboosterDate";
public static final String OPV_0_DATE = "opv0Date";
public static final String OPV_1_DATE = "opv1Date";
public static final String OPV_2_DATE = "opv2Date";
public static final String OPV_3_DATE = "opv3Date";
public static final String OPVBOOSTER_DATE = "opvboosterDate";
public static final String DPTBOOSTER_1_DATE = "dptbooster1Date";
public static final String DPTBOOSTER_2_DATE = "dptbooster2Date";
public static final String PENTAVALENT_1_DATE = "pentavalent1Date";
public static final String PENTAVALENT_2_DATE = "pentavalent2Date";
public static final String PENTAVALENT_3_DATE = "pentavalent3Date";
public static final String HEPB_BIRTH_DOSE_DATE = "hepb0Date";
public static final String SHOULD_CLOSE_MOTHER = "shouldCloseMother";
public static final String MMR_DATE = "mmrDate";
public static final String JE_DATE = "jeDate";
}

public class ChildRegistrationFields {
public static final String MOTHER_ID = "motherId";
public static final String CHILD_ID = "childId";
public static final String DATE_OF_BIRTH = "dateOfBirth";
public static final String WEIGHT = "weight";
public static final String IMMUNIZATIONS_GIVEN = "immunizationsGiven";
public static final String GENDER = "gender";
public static final String NAME = "name";
public static final String HIGH_RISK_REASON = "childHighRiskReason";
public static final String IS_CHILD_HIGH_RISK = "isChildHighRisk";
}

public class ChildRegistrationOAFields {
public static final String CHILD_ID = "id";
public static final String DATE_OF_BIRTH = "dateOfBirth";
public static final String WEIGHT = "weight";
public static final String IMMUNIZATIONS_GIVEN = "immunizationsGiven";
public static final String NAME = "name";
public static final String THAYI_CARD_NUMBER = "thayiCardNumber";
}

public class ChildImmunizationsFields {
public static final String PREVIOUS_IMMUNIZATIONS_GIVEN = "previousImmunizations";
public static final String IMMUNIZATIONS_GIVEN = "immunizationsGiven";
public static final String IMMUNIZATION_DATE = "immunizationDate";
}

public class ChildIllnessFields {
public static final String CHILD_SIGNS = "childSigns";
public static final String CHILD_SIGNS_OTHER = "childSignsOther";
public static final String SICK_VISIT_DATE = "sickVisitDate";
public static final String REPORT_CHILD_DISEASE = "reportChildDisease";
public static final String REPORT_CHILD_DISEASE_OTHER = "reportChildDiseaseOther";
public static final String REPORT_CHILD_DISEASE_DATE = "reportChildDiseaseDate";
public static final String REPORT_CHILD_DISEASE_PLACE = "reportChildDiseasePlace";
public static final String CHILD_REFERRAL = "childReferral";
}
}
4 changes: 2 additions & 2 deletions ...ain/java/org/ei/drishti/domain/Child.java → ...ain/java/org/ei/drishti/domain/Child.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import java.util.Map;

import static org.ei.drishti.AllConstants.BOOLEAN_TRUE;
import static org.ei.drishti.AllConstants.ChildRegistrationFields.HIGH_RISK_REASON;
import static org.ei.drishti.AllConstants.ChildRegistrationFields.IS_CHILD_HIGH_RISK;
import static org.ei.drishti.AllConstantsForChildRegister.ChildRegistrationFields.HIGH_RISK_REASON;
import static org.ei.drishti.AllConstantsForChildRegister.ChildRegistrationFields.IS_CHILD_HIGH_RISK;
import static org.ei.drishti.AllConstants.SPACE;

public class Child {
Expand Down
0 ...g/ei/drishti/domain/ChildServiceType.java → ...g/ei/drishti/domain/ChildServiceType.java
View file
Open in desktop
File renamed without changes.
0 ...er/ChildSmartRegisterClientsProvider.java → ...er/ChildSmartRegisterClientsProvider.java
View file
Open in desktop
File renamed without changes.
0 ...i/drishti/repository/ChildRepository.java → ...i/drishti/repository/ChildRepository.java
View file
Open in desktop
File renamed without changes.
Loading