=== removed file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/ReportExcelItemValue.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/ReportExcelItemValue.java 2009-10-27 06:05:22 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/ReportExcelItemValue.java 1970-01-01 00:00:00 +0000 @@ -1,78 +0,0 @@ -package org.hisp.dhis.reportexcel.importing; - -/* - * Copyright (c) 2004-2007, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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 org.hisp.dhis.reportexcel.excelitem.ExcelItem; -/** - * @author Tran Thanh Tri - * @version $Id - */ -public class ReportExcelItemValue -{ - - private ExcelItem excelItem; - - private String value; - - - // ---------------------------------------------------------------------- - // Constructors - // ---------------------------------------------------------------------- - - public ReportExcelItemValue( ExcelItem excelItem, String value ) - { - super(); - - this.excelItem = excelItem; - - this.value = value; - } - - // ---------------------------------------------------------------------- - // Getters and setters - // ---------------------------------------------------------------------- - - public String getValue() - { - return value; - } - - public void setValue( String value ) - { - this.value = value; - } - - public ExcelItem getExcelItem() { - return excelItem; - } - - public void setExcelItem(ExcelItem excelItem) { - this.excelItem = excelItem; - } - -} === removed file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm 2009-10-22 17:22:15 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importData.vm 1970-01-01 00:00:00 +0000 @@ -1,62 +0,0 @@ - -#if($!fileExcel) -
$!message
- - - #end -

$!encoder.htmlEncode($!organisationUnit.name)

- - - - - - - - - - - - - - - - - - - - -
$i18n.getString( 'select_excel_file' ) - -
$i18n.getString( 'reports' ) -
$i18n.getString( 'period' ) - - -
  
-
- - -

- - -