dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15059
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5287: Merge NRHM Report module from 2.3 to trunk
------------------------------------------------------------
revno: 5287
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-12-05 11:26:00 +0530
message:
Merge NRHM Report module from 2.3 to trunk
modified:
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElement.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElementOptions.java
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListOption.java
local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSAction.java
local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSThirdPartyAction.java
local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/CreateMobileAppAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportFormAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/AddReportAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/GetReportAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/UpdateReportAction.java
local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-reports-national/src/main/resources/org/hisp/dhis/reports/i18n_module.properties
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/addReportForm.vm
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/editReportForm.vm
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reportManagement.js
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/llBulkReportSucess.vm
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/reportsList.vm
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/responseReportManagementObject.vm
--
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 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElement.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElement.java 2011-04-01 09:57:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElement.java 2011-12-05 05:56:00 +0000
@@ -31,11 +31,12 @@
import java.util.ArrayList;
import java.util.Collection;
-import org.hisp.dhis.common.AbstractIdentifiableObject;
+//import org.hisp.dhis.common.AbstractIdentifiableObject;
@SuppressWarnings("serial")
+//public class LineListElement extends AbstractIdentifiableObject
public class LineListElement
- extends AbstractIdentifiableObject
+
implements Serializable
{
public static final String TYPE_STRING = "string";
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElementOptions.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElementOptions.java 2011-04-01 09:57:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListElementOptions.java 2011-12-05 05:56:00 +0000
@@ -1,7 +1,7 @@
package org.hisp.dhis.linelisting;
import java.io.Serializable;
-import org.hisp.dhis.common.AbstractIdentifiableObject;
+//import org.hisp.dhis.common.AbstractIdentifiableObject;
/*
* Copyright (c) 2004-2009, University of Oslo
@@ -30,8 +30,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@SuppressWarnings( "serial" )
+//public class LineListElementOptions extends AbstractIdentifiableObject
public class LineListElementOptions
- extends AbstractIdentifiableObject
implements Serializable
{
=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListOption.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListOption.java 2011-04-01 09:57:53 +0000
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListOption.java 2011-12-05 05:56:00 +0000
@@ -29,11 +29,12 @@
import java.io.Serializable;
-import org.hisp.dhis.common.AbstractIdentifiableObject;
+//import org.hisp.dhis.common.AbstractIdentifiableObject;
@SuppressWarnings("serial")
+//public class LineListOption extends AbstractIdentifiableObject
public class LineListOption
- extends AbstractIdentifiableObject
+
implements Serializable
{
/**
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSAction.java'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSAction.java 2011-07-07 11:56:37 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSAction.java 2011-12-05 05:56:00 +0000
@@ -54,7 +54,7 @@
SmsService smsService;
- private int succ = 0, modemError = 0;
+ //private int succ = 0, modemError = 0;
public void setSmsService( SmsService smsService )
{
@@ -168,10 +168,11 @@
availableOrganisationUnitGroups = new ArrayList<OrganisationUnitGroup>( orgUnitGrpService.getAllOrganisationUnitGroups() );
System.out.println( "size(bulksmsmaction)==" + availableOrganisationUnitGroups.size() );
Collections.sort( availableOrganisationUnitGroups, new OrganisationUnitGroupNameComparator() );
-Iterator it=orgUnitGrpService.getAllOrganisationUnitGroups().iterator();
-while(it.hasNext()){
-System.out.println(it.next());
-}
+ Iterator<OrganisationUnitGroup> it=orgUnitGrpService.getAllOrganisationUnitGroups().iterator();
+ while(it.hasNext())
+ {
+ System.out.println(it.next());
+ }
//dataElementService=new DefaultDataElementService();
//System.out.println("------------------------------------->"+dataElementService.getDataElementGroupCount());
@@ -228,7 +229,7 @@
{
System.out.println( " -" + availableOrganisationUnitGroups.get( j ).getMembers().size() );
- Iterator itr = availableOrganisationUnitGroups.get( j ).getMembers().iterator();
+ Iterator<OrganisationUnit> itr = availableOrganisationUnitGroups.get( j ).getMembers().iterator();
while ( itr.hasNext() )
{
OrganisationUnit temp = (OrganisationUnit) itr.next();
@@ -236,7 +237,7 @@
{
phonenos.add( temp.getPhoneNumber() );
}
- System.out.println( "id="+temp.getUuid()+" phone=" + temp.getPhoneNumber() );
+ System.out.println( "id="+temp.getId()+" ----phone=" + temp.getPhoneNumber() );
}
}
@@ -269,7 +270,7 @@
}
// fill in the sendSMS fields...
- List<SendSMS> sendSMSList = new ArrayList();
+ List<SendSMS> sendSMSList = new ArrayList<SendSMS>();
SendSMS tempSendSMS;
for ( int i = 0; i < phonenos.size(); i++ )
{
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSThirdPartyAction.java'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSThirdPartyAction.java 2011-07-07 11:56:37 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/SendBulkSMSThirdPartyAction.java 2011-12-05 05:56:00 +0000
@@ -46,7 +46,7 @@
SmsService smsService;
- private int succ = 0, modemError = 0;
+ //private int succ = 0, modemError = 0;
public void setSmsService( SmsService smsService )
{
@@ -158,10 +158,11 @@
availableOrganisationUnitGroups = new ArrayList<OrganisationUnitGroup>( orgUnitGrpService.getAllOrganisationUnitGroups() );
System.out.println( "size(bulksmsmaction)==" + availableOrganisationUnitGroups.size() );
Collections.sort( availableOrganisationUnitGroups, new OrganisationUnitGroupNameComparator() );
-Iterator it=orgUnitGrpService.getAllOrganisationUnitGroups().iterator();
-while(it.hasNext()){
-System.out.println(it.next());
-}
+ Iterator<OrganisationUnitGroup> it=orgUnitGrpService.getAllOrganisationUnitGroups().iterator();
+ while(it.hasNext())
+ {
+ System.out.println(it.next());
+ }
//dataElementService=new DefaultDataElementService();
//System.out.println("------------------------------------->"+dataElementService.getDataElementGroupCount());
// DataElementGroup dataElementGrp=dataElementService.getDataElementGroupByName( "MObile Daily");
@@ -194,7 +195,7 @@
{
System.out.println( " -" + availableOrganisationUnitGroups.get( j ).getMembers().size() );
- Iterator itr = availableOrganisationUnitGroups.get( j ).getMembers().iterator();
+ Iterator<OrganisationUnit> itr = availableOrganisationUnitGroups.get( j ).getMembers().iterator();
while ( itr.hasNext() )
{
OrganisationUnit temp = (OrganisationUnit) itr.next();
@@ -202,7 +203,7 @@
{
phonenos.add( temp.getPhoneNumber() );
}
- System.out.println( "id="+temp.getUuid()+" phone=" + temp.getPhoneNumber() );
+ System.out.println( "id="+temp.getId()+ "--- phone=" + temp.getPhoneNumber() );
}
}
@@ -227,7 +228,7 @@
}
// fill in the sendSMS fields...
- List<SendSMS> sendSMSList = new ArrayList();
+ List<SendSMS> sendSMSList = new ArrayList<SendSMS>();
SendSMS tempSendSMS;
for ( int i = 0; i < phonenos.size(); i++ )
{
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/CreateMobileAppAction.java'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/CreateMobileAppAction.java 2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/CreateMobileAppAction.java 2011-12-05 05:56:00 +0000
@@ -26,14 +26,16 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.opensymphony.xwork2.Action;
import java.io.File;
import java.util.Collection;
+
import org.apache.struts2.ServletActionContext;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.period.PeriodService;
+import com.opensymphony.xwork2.Action;
+
public class CreateMobileAppAction implements Action {
private String mvnPath;
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportFormAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportFormAction.java 2010-12-31 07:16:18 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportFormAction.java 2011-12-05 05:56:00 +0000
@@ -1,5 +1,10 @@
package org.hisp.dhis.reports.ouwiseprogress.action;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.period.MonthlyPeriodType;
import org.hisp.dhis.reports.ReportType;
@@ -9,6 +14,17 @@
implements Action
{
// -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private OrganisationUnitGroupService organisationUnitGroupService;
+
+ public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
+ {
+ this.organisationUnitGroupService = organisationUnitGroupService;
+ }
+
+ // -------------------------------------------------------------------------
// Getter & Setter
// -------------------------------------------------------------------------
@@ -26,6 +42,13 @@
return reportTypeName;
}
+ private List<OrganisationUnitGroup> orgUnitGroups;
+
+ public List<OrganisationUnitGroup> getOrgUnitGroups()
+ {
+ return orgUnitGroups;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -37,6 +60,8 @@
periodTypeName = MonthlyPeriodType.NAME;
+ orgUnitGroups = new ArrayList<OrganisationUnitGroup>( organisationUnitGroupService.getAllOrganisationUnitGroups() );
+
return SUCCESS;
}
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java 2011-11-21 11:46:15 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java 2011-12-05 05:56:00 +0000
@@ -39,6 +39,8 @@
import org.hisp.dhis.config.Configuration_IN;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
+import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.organisationunit.comparator.OrganisationUnitShortNameComparator;
import org.hisp.dhis.period.Period;
@@ -90,6 +92,14 @@
{
this.organisationUnitService = organisationUnitService;
}
+
+ private OrganisationUnitGroupService organisationUnitGroupService;
+
+ public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
+ {
+ this.organisationUnitGroupService = organisationUnitGroupService;
+ }
+
/*
private DataSetService dataSetService;
@@ -165,6 +175,13 @@
this.aggData = aggData;
}
+ private Integer orgUnitGroup;
+
+ public void setOrgUnitGroup( Integer orgUnitGroup )
+ {
+ this.orgUnitGroup = orgUnitGroup;
+ }
+
private OrganisationUnit selectedOrgUnit;
private List<OrganisationUnit> orgUnitList;
@@ -216,6 +233,17 @@
if ( reportModelTB.equalsIgnoreCase( "PROGRESSIVE-ORGUNIT" ) )
{
orgUnitList = new ArrayList<OrganisationUnit>( selectedOrgUnit.getChildren() );
+
+ if( orgUnitGroup != 0 )
+ {
+ OrganisationUnitGroup ouGroup = organisationUnitGroupService.getOrganisationUnitGroup( orgUnitGroup );
+
+ if( ouGroup != null )
+ {
+ orgUnitList.retainAll( ouGroup.getMembers() );
+ }
+ }
+
Collections.sort( orgUnitList, new OrganisationUnitShortNameComparator() );
//Hardcoded to level 2 to make report fast for state level
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/AddReportAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/AddReportAction.java 2011-04-19 07:43:37 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/AddReportAction.java 2011-12-05 05:56:00 +0000
@@ -123,9 +123,17 @@
if( orgunitGroupId != null )
{
- OrganisationUnitGroup orgUnitGroup = organisationUnitGroupService.getOrganisationUnitGroup( orgunitGroupId );
-
- report.setOrgunitGroup( orgUnitGroup );
+ if ( orgunitGroupId == 0 )
+ {
+ report.setOrgunitGroup( null );
+ }
+ else
+ {
+ OrganisationUnitGroup orgUnitGroup = organisationUnitGroupService.getOrganisationUnitGroup( orgunitGroupId );
+
+ report.setOrgunitGroup( orgUnitGroup );
+ }
+
}
if( dataSetIds != null )
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/GetReportAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/GetReportAction.java 2010-08-19 10:40:50 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/GetReportAction.java 2011-12-05 05:56:00 +0000
@@ -42,16 +42,48 @@
{
return reportId;
}
+
+ private String ouGroupname;
+
+ public String getOuGroupname()
+ {
+ return ouGroupname;
+ }
+ private String datasetName;
+
+ public String getDatasetName()
+ {
+ return datasetName;
+ }
+
// -------------------------------------------------------------------------
// Action
// -------------------------------------------------------------------------
+
+
+
public String execute()
throws Exception
{
report = reportService.getReport( reportId );
-
+ /*
+ if( report.getOrgunitGroup() != null )
+ {
+ ouGroupname = report.getOrgunitGroup().getName();
+ //System.out.println(report.getOrgunitGroup().getName());
+ }
+
+ if( report.getDataSetIds() != null )
+ {
+ datasetName = report.getDataSetIds();
+ //System.out.println(report.getDataSetIds());
+ }
+
+ //System.out.println(report.getDataSetIds());
+ * */
+
return SUCCESS;
}
}
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/UpdateReportAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/UpdateReportAction.java 2011-04-19 07:43:37 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/reportmanagement/action/UpdateReportAction.java 2011-12-05 05:56:00 +0000
@@ -124,8 +124,16 @@
if( orgunitGroupId != null )
{
- OrganisationUnitGroup orgUnitGroup = organisationUnitGroupService.getOrganisationUnitGroup( orgunitGroupId );
- report.setOrgunitGroup( orgUnitGroup );
+ if ( orgunitGroupId == 0 )
+ {
+ report.setOrgunitGroup( null );
+ }
+ else
+ {
+ OrganisationUnitGroup orgUnitGroup = organisationUnitGroupService.getOrganisationUnitGroup( orgunitGroupId );
+ report.setOrgunitGroup( orgUnitGroup );
+ }
+
}
if( dataSetIds != null )
=== modified file 'local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml 2011-11-21 11:46:15 +0000
+++ local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml 2011-12-05 05:56:00 +0000
@@ -421,6 +421,7 @@
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="reportService" ref="org.hisp.dhis.reports.ReportService" />
+ <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
<!-- <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />-->
</bean>
@@ -430,6 +431,7 @@
id="org.hisp.dhis.reports.ouwiseprogress.action.GenerateOuWiseProgressReportFormAction"
class="org.hisp.dhis.reports.ouwiseprogress.action.GenerateOuWiseProgressReportFormAction"
scope="prototype">
+ <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
</bean>
<bean
=== modified file 'local/in/dhis-web-reports-national/src/main/resources/org/hisp/dhis/reports/i18n_module.properties'
--- local/in/dhis-web-reports-national/src/main/resources/org/hisp/dhis/reports/i18n_module.properties 2011-11-02 09:54:19 +0000
+++ local/in/dhis-web-reports-national/src/main/resources/org/hisp/dhis/reports/i18n_module.properties 2011-12-05 05:56:00 +0000
@@ -151,7 +151,7 @@
set_configuration= Please set the configuration in order for the report module to work properly
home_explanation= Home refers to the absolute path to the BIRT viewer web application on the server
directory_explanation= Directory refers to the part of the URL coming after the server part pointing to the BIRT viewer web application
-dataset= Dataset
+dataset= Data Set
actual= Actual
target= Target
percent= Percent
@@ -299,4 +299,7 @@
reporttype = Report Type
hour = Hour
minute = Minute
-idsp_ra = IDSP Reports Analyser
\ No newline at end of file
+idsp_ra = IDSP Reports Analyser
+back = Back
+select_orgUnitGroup = Select OrgUnit Group
+orgunitgroup = OrgUnit Group
\ No newline at end of file
=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/addReportForm.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/addReportForm.vm 2011-04-19 07:43:37 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/addReportForm.vm 2011-12-05 05:56:00 +0000
@@ -57,6 +57,7 @@
<td><label>$i18n.getString( "orgunitgroup" )</label></td>
<td>
<select id="orgunitGroupId" name="orgunitGroupId" style="min-width:20em">
+ <option value="0" selected>[ $i18n.getString( "select_orgUnitGroup" ) ]</option>
#foreach ( $orgUnitGroup in $orgUnitGroups )
<option value="$orgUnitGroup.id">$orgUnitGroup.name</option>
#end
=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/editReportForm.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/editReportForm.vm 2011-04-19 07:43:37 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/editReportForm.vm 2011-12-05 05:56:00 +0000
@@ -58,6 +58,7 @@
<td><label>$i18n.getString( "orgunitgroup" )</label></td>
<td>
<select id="orgunitGroupId" name="orgunitGroupId" style="min-width:20em">
+ <option value="0" selected>[ $i18n.getString( "select_orgUnitGroup" ) ]</option>
#foreach ( $orgUnitGroup in $orgUnitGroups )
<option value="$orgUnitGroup.id" #if($orgUnitGroup.id == $report.orgunitGroup.id) selected #end>$i18n.getString( $orgUnitGroup.name )</option>
#end
=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reportManagement.js'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reportManagement.js 2011-04-15 11:40:14 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reportManagement.js 2011-12-05 05:56:00 +0000
@@ -67,6 +67,17 @@
byId('excelTemplateField').innerHTML = reportElement.getElementsByTagName( 'exceltemplate' )[0].firstChild.nodeValue;
byId('xmlTemplateField').innerHTML = reportElement.getElementsByTagName( 'xmltemplate' )[0].firstChild.nodeValue;
+ /*
+ var orgGroupName = getElementValue( reportElement, 'orgGroupName' );
+ setInnerHTML( 'orgGroupNameField', orgGroupName ? orgGroupName : '[' + Null + ']' );
+
+ var dataSetName = getElementValue( reportElement, 'dataSetName' );
+ setInnerHTML( 'dataSetNameField', dataSetName ? dataSetName : '[' + Null + ']' );
+ */
+
+ //byId('orgGroupNameField').innerHTML = reportElement.getElementsByTagName( 'orgGroupName' )[0].firstChild.nodeValue;
+
+ //byId('dataSetNameField').innerHTML = reportElement.getElementsByTagName( 'dataSetName' )[0].firstChild.nodeValue;
showDetails();
}
=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/llBulkReportSucess.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/llBulkReportSucess.vm 2011-10-13 08:00:58 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/llBulkReportSucess.vm 2011-12-05 05:56:00 +0000
@@ -1,4 +1,7 @@
-<br /><br />
+<h1>$i18n.getString( "ll_bulk_ra" )</h1>
-<h3>$statusMessage</h3>
\ No newline at end of file
+<h3>Corresponding Organisation Units unavailable for Selected Report</h3>
+<p>
+ <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='lineListingBulkReportAnalyser.action'" style="width:100px" />
+</p>
\ No newline at end of file
=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm 2011-04-15 11:40:14 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm 2011-12-05 05:56:00 +0000
@@ -92,13 +92,26 @@
</select>
</td>
<td class="NormalB">
- <br />
+ 6. $i18n.getString( "orgunit_group" ) :<br />
+ <select id="orgUnitGroup" name="orgUnitGroup" style="width:200px">
+ <option value="0">ALL</option>
+ #foreach( $orgUnitGroup in $orgUnitGroups )
+ <option value="$orgUnitGroup.id">$orgUnitGroup.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="NormalB"> </td>
+ <td class="NormalB">
+ <br /><br/>
<input type="submit" name="generate" style="width:200px" value="$i18n.getString( 'generate_report' )"/>
<input type="hidden" name="ouIDTB" id="ouIDTB" />
<input type="hidden" name="autogen" id="autogen" value="0" />
<input type="hidden" name="reportTypeNameTB" id="reportTypeNameTB" value="$reportTypeName" />
</td>
</tr>
+
</table>
</form>
=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/reportsList.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/reportsList.vm 2010-08-19 10:40:50 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/reportsList.vm 2011-12-05 05:56:00 +0000
@@ -69,6 +69,8 @@
<p><label>$i18n.getString( "reportType" ):</label><br><span id="reportTypeField"></span></p>
<p><label>$i18n.getString( "exceltemplate" ):</label><br><span id="excelTemplateField"></span></p>
<p><label>$i18n.getString( "xmltemplate" ):</label><br><span id="xmlTemplateField"></span></p>
+ <!--<p><label>$i18n.getString( "orgunitgroup" ):</label><br><span id="orgGroupNameField"></span></p>
+ <p><label>$i18n.getString( "dataset" ):</label><br><span id="dataSetNameField"></span></p>-->
</div>
</td>
=== modified file 'local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/responseReportManagementObject.vm'
--- local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/responseReportManagementObject.vm 2010-08-19 10:40:50 +0000
+++ local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/responseReportManagementObject.vm 2011-12-05 05:56:00 +0000
@@ -6,5 +6,7 @@
<frequency>$i18n.getString( $report.periodType.name )</frequency>
<reportType>$report.reportType</reportType>
<exceltemplate>$report.excelTemplateName</exceltemplate>
- <xmltemplate>$report.xmlTemplateName</xmltemplate>
+ <xmltemplate>$report.xmlTemplateName</xmltemplate>
+<!--<orgGroupName>$ouGroupname</orgGroupName>
+ <dataSetName>$datasetName</dataSetName>-->
</report>
\ No newline at end of file
