dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16547
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6314: Removed outdated tallysheet classes
------------------------------------------------------------
revno: 6314
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-03-20 14:32:38 +0100
message:
Removed outdated tallysheet classes
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetPdfService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetTuple.java
--
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 directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheet.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheet.java 1970-01-01 00:00:00 +0000
@@ -1,181 +0,0 @@
-package org.hisp.dhis.tallysheet;
-
-/*
- * Copyright (c) 2004-2012, 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 java.util.List;
-
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-
-/**
- * @author Haavard Tegelsrud, Oddmund Stroemme, Joergen Froeysadal, Ruben Wangberg
- * @version $Id$
- */
-public class TallySheet
-{
- public static final String KEY_TALLY_SHEET = "tallySheet";
-
- private String tallySheetName;
-
- private List<TallySheetTuple> tallySheetTuples;
-
- private boolean a3Format;
-
- private boolean displayFacilityName;
-
- private OrganisationUnit organisationUnit;
-
- private int rowWidth;
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- /**
- * Returns the name of the tally sheet
- *
- * @return the name of the tally sheet
- */
- public String getTallySheetName()
- {
- return tallySheetName;
- }
-
- /**
- * Returns a list of TallySheetTuples. The TallySheetTuple object contains
- * the necessary information to build a row in the final tally sheet PDF.
- * (DataElement name and number of cell rows).
- *
- * @return a List of TallySheetTuples
- */
- public List<TallySheetTuple> getTallySheetTuples()
- {
- return tallySheetTuples;
- }
-
- /**
- * Returns a boolean that tells the tally sheet format.
- *
- * @return a boolean that is true if tally sheet is A3, false if tally sheet is A4.
- */
- public boolean isA3Format()
- {
- return a3Format;
- }
-
- /**
- * Returns a boolean that tells if the facility name is to be shown on the final
- * tally sheet PDF.
- *
- * @return a boolean that is true if the facility name is to be shown on PDF, false if not.
- */
- public boolean isDisplayFacilityName()
- {
- return displayFacilityName;
- }
-
- /**
- * Sets the format of the tally sheet.
- *
- * @param a3Format true if format is A3, false if format is A4
- */
- public void setA3Format( boolean a3Format )
- {
- this.a3Format = a3Format;
-
- if ( a3Format )
- {
- rowWidth = 100;
- }
- else
- {
- rowWidth = 50;
- }
- }
-
- /**
- * Sets the displayFacilityName variable, that decides wether the facility name will be written
- * to the PDF or not.
- *
- * @param displayFacilityName true if facility name is to be shown, false if not.
- */
- public void setDisplayFacilityName( boolean displayFacilityName )
- {
- this.displayFacilityName = displayFacilityName;
- }
-
- /**
- * Sets the organisation unit associated with the tally sheet.
- *
- * @param organisationUnit the OrganisationUnit
- */
- public void setOrganisationUnit( OrganisationUnit organisationUnit )
- {
- this.organisationUnit = organisationUnit;
- }
-
- /**
- * Sets the name of the tally sheet
- *
- * @param tallySheetName the tally sheet name
- */
- public void setTallySheetName( String tallySheetName )
- {
- this.tallySheetName = tallySheetName;
- }
-
- /**
- * Sets the List of TallySheetTuples that the tally sheet contains
- *
- * @param tallySheetTuples the List of TallySheetTuples associated with the tally sheet.
- */
- public void setTallySheetTuples( List<TallySheetTuple> tallySheetTuples )
- {
- this.tallySheetTuples = tallySheetTuples;
- }
-
- /**
- * Returns the name of the organisation unit associated with the tally sheet.
- *
- * @return the name of the organisation unit
- */
- public String getFacilityName()
- {
- return organisationUnit.getName();
- }
-
- /**
- * Returns the number of zeros the tally sheet can fit on each row. Dependent on whether
- * the format is A4 or A3.
- *
- * @return the number of zeros on each row
- */
- public int getRowWidth()
- {
- return rowWidth;
- }
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetPdfService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetPdfService.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetPdfService.java 1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-package org.hisp.dhis.tallysheet;
-
-/*
- * Copyright (c) 2004-2012, 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 java.io.InputStream;
-
-import org.hisp.dhis.i18n.I18n;
-
-/**
- * @author Haavard Tegelsrud, Oddmund Stroemme, Joergen Froeysadal, Ruben
- * Wangberg
- * @version $Id$
- */
-public interface TallySheetPdfService
-{
- final String ID = TallySheetPdfService.class.getName();
-
- /**
- * Returns an InputStream representing the tally sheet The InputStream will
- * give the opportunity to either print or save the tally sheet.
- *
- * @param tallySheet the tally sheet
- * @param i18n the internationalization
- * @return InputStream the InputStream
- */
- InputStream createTallySheetPdf( TallySheet tallySheet, I18n i18n );
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetService.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetService.java 1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-package org.hisp.dhis.tallysheet;
-
-/*
- * Copyright (c) 2004-2012, 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 java.util.List;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-
-/**
- * @author Haavard Tegelsrud, Oddmund Stroemme, Joergen Froeysadal, Ruben Wangberg
- * @version $Id$
- */
-public interface TallySheetService
-{
- final String ID = TallySheetService.class.getName();
-
- /**
- * Creates a tally sheet by passing information about organisation unit,
- * data set, elements in the data set, formating of the printable tally
- * sheet, whether to display the name of the organisation unit and the name
- * of the tally sheet.
- *
- * @param organisationUnit the organisation unit
- * @param dataElements the data elements
- * @param a3Format the format of the printable tally sheet
- * @param displayFacilityName whether or not to display the name of the
- * organisation unit
- * @param selectedDataSet the selected data set
- * @param tallySheetName the name of the tally sheet
- */
- TallySheet createTallySheet( OrganisationUnit organisationUnit, List<DataElement> dataElements, boolean a3Format,
- boolean displayFacilityName, DataSet selectedDataSet, String tallySheetName );
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetTuple.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetTuple.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/TallySheetTuple.java 1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-package org.hisp.dhis.tallysheet;
-
-/*
- * Copyright (c) 2004-2012, 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.dataelement.DataElement;
-
-/**
- * @author Haavard Tegelsrud, Oddmund Stroemme, Joergen Froeysadal, Ruben Wangberg
- * @version $Id$
- */
-public class TallySheetTuple
-{
- private int numberOfElements;
-
- private int numberOfRows;
-
- private int rowWidth;
-
- private DataElement dataElement;
-
- private boolean checked = false;
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- /**
- * @return DataElement the data element
- */
- public DataElement getDataElement()
- {
- return dataElement;
- }
-
- /**
- * Check if the user wants to display this tuple on the tally sheet.
- *
- * @return boolean display tuple or not
- */
- public boolean isChecked()
- {
- return checked;
- }
-
- /**
- * @param calculatedNumberOfElements
- * @param dataElement
- * @param rowWidth
- */
- public void setTallySheetTuple( int numberOfElements, DataElement dataElement, int rowWidth )
- {
- this.numberOfElements = numberOfElements;
- this.dataElement = dataElement;
- this.numberOfRows = (int) Math.ceil( numberOfElements * 1.0 / rowWidth );
- this.rowWidth = rowWidth;
- }
-
- /**
- * Set this tuple to be displayed or not on the tally sheet.
- *
- * @param checked display tuple or not
- */
- public void setChecked( boolean checked )
- {
- this.checked = checked;
- }
-
- /**
- * Returns the number of tally rows for this tuple.
- *
- * @return number of rows
- */
- public int getNumberOfRows()
- {
- return numberOfRows;
- }
-
- /**
- * Set the number of tally rows for this tuple.
- *
- * @param rows the number of rows
- */
- public void setNumberOfRows( int rows )
- {
- this.numberOfRows = rows;
- }
-
- // -------------------------------------------------------------------------
- // Logic
- // -------------------------------------------------------------------------
-
- /**
- * Recalculate the number of tally rows needed for this tuple. The user may
- * have altered the factor.
- *
- * @param factor the factor to recalculate by
- */
- public void recalculateRows( double factor )
- {
- numberOfRows = (int) Math.ceil( numberOfElements * factor / rowWidth );
- }
-}
