Merge authors: Long <thanhlongngo1988> ------------------------------------------------------------ revno: 1916 [merge] committer: Abyot Asalefew Gizaw <[email protected]> branch nick: cbhis-mobile timestamp: Fri 2010-09-24 13:12:49 +0200 message: work in progress.... - server side for gprs mobile reporting - activity exchange with mobiles in serialized format removed: dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormsResource.java added: dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/consumer/ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/consumer/ActivityValueConsumer.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/consumer/DataSetValueConsumer.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/AbstractModel.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/AbstractModelList.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityValue.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSetValue.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataValue.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ISerializable.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Program.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ProgramStage.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/AbstractModelListProvider.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityPlanProvider.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/DataSetProvider.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ProgramProvider.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityPlanResource.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetResource.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormResource.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ProgramResource.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityValueService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataSetService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataValueService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultPeriodService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultProgramService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IActivityPlanService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IActivityValueService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IDataSetService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IDataValueService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IPeriodService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IProgramService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/utils/ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/utils/LocaleUtil.java modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/ActivityPlanService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java dhis-2/dhis-services/dhis-service-core/pom.xml dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nUtils.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/DefaultPeriodService.java dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java dhis-2/dhis-web/dhis-web-api/pom.xml dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Activity.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityPlan.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Beneficiary.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataElement.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Task.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/ProgramStageService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/mapping/ActivityPlanItemMapper.java dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_en_GB.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm The size of the diff (3617 lines) is larger than your specified limit of 1000 lines
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
