dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02612
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 883: add date format label for jquery date picker
------------------------------------------------------------
revno: 883
committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
branch nick: trunk
timestamp: Mon 2009-10-19 14:07:13 +0700
message:
add date format label for jquery date picker
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/dataentrystatus/action/DefaultDataEntryStatusAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/dataentrystatus/action/ListDataEntryStatusAction.java
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-portal/pom.xml
--
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.
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2009-09-20 17:27:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2009-10-19 07:07:13 +0000
@@ -7,6 +7,7 @@
format.time.label = hh:mm
format.datetime = yyyy-MM-dd HH:mm
format.datetime.label = yyyy-mm-dd hh:mm
+format.date.label.jquery = yy-mm-dd
#-- dhis-wp -------------------------------------------------------------------#
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties 2009-09-18 07:09:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties 2009-10-19 07:07:13 +0000
@@ -6,6 +6,7 @@
format.time.label = hh:mm
format.datetime = dd-MM-yyyy HH:mm
format.datetime.label = dd-mm-yyyy hh:mm
+format.date.label.jquery = dd-mm-yy
#-- dhis-wp -------------------------------------------------------------------#
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/dataentrystatus/action/DefaultDataEntryStatusAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/dataentrystatus/action/DefaultDataEntryStatusAction.java 2009-10-16 09:22:36 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/dataentrystatus/action/DefaultDataEntryStatusAction.java 2009-10-19 07:07:13 +0000
@@ -172,7 +172,7 @@
if ( organisationUnit != null )
{
- TimeUtils.start();
+
dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBySource( organisationUnit ) );
if ( !currentUserService.currentUserIsSuper() )
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/dataentrystatus/action/ListDataEntryStatusAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/dataentrystatus/action/ListDataEntryStatusAction.java 2009-09-17 15:02:10 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/dataentrystatus/action/ListDataEntryStatusAction.java 2009-10-19 07:07:13 +0000
@@ -60,8 +60,6 @@
private UserStore userStore;
- private OrganisationUnitSelectionManager selectionManager;
-
private DataSetService dataSetService;
// -------------------------------------------------
@@ -79,11 +77,6 @@
this.dataSetService = dataSetService;
}
- public void setSelectionManager( OrganisationUnitSelectionManager selectionManager )
- {
- this.selectionManager = selectionManager;
- }
-
public void setUserStore( UserStore userStore )
{
this.userStore = userStore;
@@ -107,29 +100,24 @@
public String execute()
throws Exception
{
- if ( selectionManager.getSelectedOrganisationUnit() != null )
+ List<DataSet> dataSets = new ArrayList<DataSet>( dataSetService.getAllDataSets() );
+
+ if ( !currentUserService.currentUserIsSuper() )
{
-
- List<DataSet> dataSets = new ArrayList<DataSet>( dataSetService.getDataSetsBySource( selectionManager
- .getSelectedOrganisationUnit() ) );
-
- if ( !currentUserService.currentUserIsSuper() )
+ UserCredentials userCredentials = userStore.getUserCredentials( currentUserService.getCurrentUser() );
+
+ Set<DataSet> dataSetUserAuthorityGroups = new HashSet<DataSet>();
+
+ for ( UserAuthorityGroup userAuthorityGroup : userCredentials.getUserAuthorityGroups() )
{
- UserCredentials userCredentials = userStore.getUserCredentials( currentUserService.getCurrentUser() );
-
- Set<DataSet> dataSetUserAuthorityGroups = new HashSet<DataSet>();
-
- for ( UserAuthorityGroup userAuthorityGroup : userCredentials.getUserAuthorityGroups() )
- {
- dataSetUserAuthorityGroups.addAll( userAuthorityGroup.getDataSets() );
- }
-
- dataSets.retainAll( dataSetUserAuthorityGroups );
+ dataSetUserAuthorityGroups.addAll( userAuthorityGroup.getDataSets() );
}
- dataStatus = new ArrayList<DataEntryStatus>( reportService.getDataEntryStatusDefaultByDataSets( dataSets ) );
-
- }
+ dataSets.retainAll( dataSetUserAuthorityGroups );
+ }
+
+ dataStatus = new ArrayList<DataEntryStatus>( reportService.getDataEntryStatusDefaultByDataSets( dataSets ) );
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-10-18 22:44:41 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-10-19 07:07:13 +0000
@@ -452,9 +452,7 @@
scope="prototype">
<property name="reportService" ref="org.hisp.dhis.reportexcel.ReportExcelService" />
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- <property name="userStore" ref="org.hisp.dhis.user.UserStore" />
- <property name="selectionManager"
- ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
+ <property name="userStore" ref="org.hisp.dhis.user.UserStore" />
<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
</bean>
=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml 2009-10-01 08:28:21 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2009-10-19 07:07:13 +0000
@@ -107,8 +107,8 @@
<artifactId>dhis-web-dashboard-integration</artifactId>
<version>${version}</version>
<type>war</type>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-mapping</artifactId>
<version>${version}</version>
@@ -152,16 +152,15 @@
-->
<!-- Vietnam modules -->
-
- <!--
+ <!--
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-gis</artifactId>
<version>${version}</version>
<type>war</type>
- </dependency>
- -->
-
+ </dependency>
+ -->
<!-- South Africa modules -->
<!--
