dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 914
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-10-28 08:12:37 +0700
message:
  Remove unused file
removed:
  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/webapp/dhis-web-excel-reporting/importData.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.

=== 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 @@
-<body>
-#if($!fileExcel)
-<div id="messageUpload"> $!message </div>
- <span id="message" style="top:70px;right:5px;position:fixed;width:200px;z-index:100009" onclick="hideById(this.id);"></span>
-<input type="hidden" name="uploadFileName" id="uploadFileName" value="$!fileExcel">
- #end
-<h2>$!encoder.htmlEncode($!organisationUnit.name)</h2>
-<table width="50%">
-  <tr>
-    <form name="uploadfile" action="getInformation.action" method="post" enctype="multipart/form-data">
-      <td width="18%" style=" width:25% ">$i18n.getString( 'select_excel_file' )</td>
-      <td width="82%">
-          <input type="file" id="upload" name="upload" value="$!fileExcel;" >
-          <input name="submit" type="submit" value="$i18n.getString( 'upload_file' )" />      </td>
-    </form>
-  </tr>
-  <tr>
-    <td>$i18n.getString( 'reports' )</td>
-    <td><select type="text" id="reportId" name="reportId" style="min-width:20em; width:100%" #if(!$!fileExcel) disabled #end onChange="javascript: document.getElementById('lastYear').disabled=false; document.getElementById('nextYear').disabled=false; document.getElementById('period').disabled=false; document.getElementById('preview').disabled=false; document.getElementById('import').disabled=false;">
-	  <option value="">$i18n.getString('select')</option>
-	  #foreach($reportExcel in $reportExcels)
-		<option value="$!reportExcel.id">$!encoder.htmlEncode($!reportExcel.name)</option>
-	  #end
-      </select>
-    </td>
-  </tr>
-  <tr>
-    <td>$i18n.getString( 'period' )</td>
-    <td>
-	<input type="button" value="<<" id="lastYear" name="lastYear" onclick="lastYear();" disabled />
-	<input type="button" value=">>" id="nextYear" name="nextYear" onclick="nextYear()" disabled />
-	<select name="period" id="period" style="min-width:20em; width:100%" type="text" disabled >
-        	#foreach($period in $periods)
-				<option value='$period.id'>$format.formatPeriod( $period )</option>
-			#end
-			
-    </select></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  
-</table>
-<hr>
-<input type="button" name="preview" id="preview" onClick="javascript: getPreviewImportData('$!fileExcel.getName()');" value="$i18n.getString('preview')" disabled>
-<input type="button" name="import" id="import" onClick="javascript: importData();" value="$i18n.getString('import')" disabled>
-<br><br>
-	<div id="showValue" style="display:none; width:100%" >
-		<table id="showReportItemValues" width="100%">
-		<tr>
-		<th width="20px"><input type="checkbox" name="selectAll" id="selectAll" onClick="javascript: selectAll();"/></th>
-		<th>$i18n.getString('report')</th>
-		<th>$i18n.getString('value')</th>
-		</tr>
-		<tbody>
-		
-		</tbody>
-		</table>
-	</div>
-</body>
-