Thread: [ggc-cvs] SF.net SVN: ggc:[1314] trunk (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1314
          http://sourceforge.net/p/ggc/code/1314
Author:   andyrozman
Date:     2014-09-20 09:20:20 +0000 (Sat, 20 Sep 2014)
Log Message:
-----------
Printing extended

Modified Paths:
--------------
    trunk/ggc-core/src/ggc/core/print/PrintExtendedMonthlyReport.java
    trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java

Modified: trunk/ggc-core/src/ggc/core/print/PrintExtendedMonthlyReport.java
===================================================================

--- trunk/ggc-core/src/ggc/core/print/PrintExtendedMonthlyReport.java	2014-09-19 17:23:45 UTC (rev 1313)
+++ trunk/ggc-core/src/ggc/core/print/PrintExtendedMonthlyReport.java	2014-09-20 09:20:20 UTC (rev 1314)
@@ -5,6 +5,7 @@
 import ggc.core.data.MonthlyValues;
 import ggc.core.util.DataAccess;
 
+import com.atech.print.engine.ITextDocumentPrintSettings;
 import com.atech.print.engine.PrintAbstractIText;
 import com.atech.utils.ATDataAccessAbstract;
 import com.itextpdf.text.Document;
@@ -19,50 +20,50 @@
  *  Application:   GGC - GNU Gluco Control
  *
  *  See AUTHORS for copyright information.
- * 
+ *
  *  This program is free software; you can redistribute it and/or modify it under
  *  the terms of the GNU General Public License as published by the Free Software
  *  Foundation; either version 2 of the License, or (at your option) any later
  *  version.
- * 
+ *
  *  This program is distributed in the hope that it will be useful, but WITHOUT
  *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  *  FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  *  details.
- * 
+ *
  *  You should have received a copy of the GNU General Public License along with
  *  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  *  Place, Suite 330, Boston, MA 02111-1307 USA
- * 
+ *
  *  Filename:     PrintExtendedMonthlyReport
  *  Description:  For printing Extended Monthly Report
- * 
- *  Author: andyrozman {an...@at...}  
+ *
+ *  Author: andyrozman {an...@at...}
  */
 
 
-public class PrintExtendedMonthlyReport extends PrintAbstractIText 
+public class PrintExtendedMonthlyReport extends PrintAbstractIText
 {
-    
+
     MonthlyValues monthlyValues;
     DataAccess dataAccessLocal;
-    
+
     /**
      * Constructor
-     * 
+     *
      * @param mv
      */
     public PrintExtendedMonthlyReport(MonthlyValues mv)
     {
         super(DataAccess.getInstance().getI18nControlInstance(), false);
-        
+
         dataAccessLocal = (DataAccess)this.dataAccess;
         this.monthlyValues = mv;
-        
+
         this.init();
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -70,8 +71,8 @@
     {
         Paragraph p = new Paragraph();
 
-        Font f = new Font(this.baseFontTimes , 16, Font.BOLD); 
-        
+        Font f = new Font(this.baseFontTimes , 16, Font.BOLD);
+
         p.setAlignment(Element.ALIGN_CENTER);
         p.add(new Paragraph(this.i18nControl.getMessage(getTitleText()) + " - " + this.dataAccessLocal.getMonthsArray()[monthlyValues.getMonth()-1] + " " + monthlyValues.getYear(), f));
         p.add(new Paragraph(this.i18nControl.getMessage("FOR") + " " + this.dataAccessLocal.getSettings().getUserName(), new Font(FontFamily.TIMES_ROMAN, 12, Font.ITALIC)));
@@ -80,14 +81,14 @@
 
         return p;
     }
-    
-    
+
+
     public String getTitleText()
     {
         return "EXTENDED_MONTHLY_REPORT";
     }
-    
-    
+
+
     private void setComment(String text, PdfPTable table)
     {
     	table.getDefaultCell().setHorizontalAlignment(Element.ALIGN_LEFT);
@@ -95,8 +96,8 @@
     	table.getDefaultCell().setHorizontalAlignment(Element.ALIGN_CENTER);
     }
 
-    
-    
+
+
     private void addEmptyValues(int day, PdfPTable table)
     {
         table.addCell(day + "." + this.monthlyValues.getMonth());
@@ -108,23 +109,23 @@
         table.addCell("");
         table.addCell("");
     }
-    
 
+
     private void addValues(int entry, int day, DailyValuesRow dvr, PdfPTable table)
     {
         if (entry==0)
             table.addCell(day + "." + this.monthlyValues.getMonth());
         else
             table.addCell("");
-	
-	
+
+
         table.addCell(dvr.getTimeAsString());
-        
+
         if (dvr.getBG()>0.0)
             table.addCell(dvr.getBGAsString());
         else
             table.addCell("");
-            
+
         table.addCell(dvr.getIns1AsString());
         table.addCell(dvr.getIns2AsString());
         table.addCell(dvr.getCHAsString());
@@ -133,8 +134,8 @@
 
         setComment(dvr.getComment(), table);
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -145,16 +146,16 @@
 
         PdfPTable datatable = new PdfPTable(numColumns);
         int headerwidths[] = { 10, 10,
-                               10, 10, 10, 
-                               10, 10,  
+                               10, 10, 10,
+                               10, 10,
                                30 }; // percentage
         datatable.setWidths(headerwidths);
         datatable.setWidthPercentage(100); // percentage
-        
+
         datatable.getDefaultCell().setVerticalAlignment(Element.ALIGN_MIDDLE);
         datatable.getDefaultCell().setHorizontalAlignment(Element.ALIGN_CENTER);
         datatable.getDefaultCell().setBorderWidth(1);
-        
+
         datatable.addCell(createBoldTextPhrase("DATE"));
         datatable.addCell(createBoldTextPhrase("TIME"));
         datatable.addCell(createBoldTextPhrase("BG"));
@@ -163,19 +164,19 @@
         datatable.addCell(createBoldTextPhrase("CH_SHORT"));
         datatable.addCell(createBoldTextPhrase("URINE"));
         datatable.addCell(createBoldTextPhrase("COMMENTS"));
-        
-        
+
+
         datatable.setHeaderRows(1); // this is the end of the table header
 
         datatable.getDefaultCell().setBorderWidth(1);
-        
+
         int count = 1;
-        
-        for (int i = 1; i <= this.monthlyValues.getDaysInMonth(); i++) 
+
+        for (int i = 1; i <= this.monthlyValues.getDaysInMonth(); i++)
         {
-            
+
             DailyValues dv = this.monthlyValues.getDayValuesExtended(i);
-            
+
             if (dv==null)
             {
                 this.setBackground(count, datatable);
@@ -191,37 +192,37 @@
                     count++;
                 }
             }
-            
+
         }
-        
+
         document.add(datatable);
 
         // TO-DO
-        
-        // Stocks 
+
+        // Stocks
         document.add(new Paragraph(" "));
         document.add(new Paragraph(" "));
         document.add(new Paragraph(" "));
         document.add(new Paragraph(this.i18nControl.getMessage("STOCKS"), this.textFontNormal));
-        
+
         float[] wdts = { 1, 99 };
-        
+
         PdfPTable p = new PdfPTable(2);
         p.getDefaultCell().setBorderWidth(0.0f);
         p.setWidths(wdts);
         p.setWidthPercentage(100); // percentage
         p.addCell("");
         p.addCell(new Phrase(String.format(this.i18nControl.getMessage("COMMING_IN_VERSION"), "0.7"), this.textFontNormal));
-        
+
         document.add(p);
-        
+
         document.add(new Paragraph(" "));
         document.add(new Paragraph(" "));
-        
+
         // Doctor appointments
         document.add(new Paragraph(this.i18nControl.getMessage("APPOINTMENTS"), this.textFontNormal));
         document.add(p);
-        
+
     }
 
 
@@ -243,7 +244,7 @@
     @Override
     public String getFileNameRange()
     {
-        return "" + monthlyValues.getYear() + "_" + ATDataAccessAbstract.getLeadingZero(monthlyValues.getMonth(), 2); 
+        return "" + monthlyValues.getYear() + "_" + ATDataAccessAbstract.getLeadingZero(monthlyValues.getMonth(), 2);
     }
 
     /**
@@ -254,6 +255,13 @@
     {
         return 12;
     }
-    
 
+
+    @Override
+    public ITextDocumentPrintSettings getCustomDocumentSettings()
+    {
+    	return new ITextDocumentPrintSettings(30, 30, 10, 30);
+    }
+
+
 }
\ No newline at end of file

Modified: trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java	2014-09-19 17:23:45 UTC (rev 1313)
+++ trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java	2014-09-20 09:20:20 UTC (rev 1314)
@@ -14,6 +14,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.atech.print.engine.ITextDocumentPrintSettings;
 import com.atech.print.engine.PrintAbstractIText;
 import com.itextpdf.text.Document;
 import com.itextpdf.text.Element;
@@ -27,49 +28,49 @@
  *  Application:   GGC - GNU Gluco Control
  *
  *  See AUTHORS for copyright information.
- * 
+ *
  *  This program is free software; you can redistribute it and/or modify it under
  *  the terms of the GNU General Public License as published by the Free Software
  *  Foundation; either version 2 of the License, or (at your option) any later
  *  version.
- * 
+ *
  *  This program is distributed in the hope that it will be useful, but WITHOUT
  *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  *  FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  *  details.
- * 
+ *
  *  You should have received a copy of the GNU General Public License along with
  *  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  *  Place, Suite 330, Boston, MA 02111-1307 USA
- * 
+ *
  *  Filename:     PrintFoodMenuAbstract
  *  Description:  Abstract class for printing Food Menu's
- * 
- *  Author: andyrozman {an...@at...}  
+ *
+ *  Author: andyrozman {an...@at...}
  */
 
 
 public abstract class PrintFoodMenuAbstract extends PrintAbstractIText
 {
-    
+
     private static final Log LOG = LogFactory.getLog(PrintFoodMenuAbstract.class);
-    
+
     DayValuesData dayValuesData;
     DataAccess dataAccessCore;
-    
-    
+
+
     /**
      * Constructor
-     * 
+     *
      * @param mv
      */
     public PrintFoodMenuAbstract(DayValuesData mv)
     {
         super(DataAccessNutri.getInstance().getParentI18nControlInstance(), false);
-        
+
         this.dayValuesData = mv;
         dataAccessCore = DataAccess.getInstance();
-        
+
         this.init();
     }
 
@@ -106,7 +107,7 @@
 
         int count = 0;
 
-        Font f = this.textFontNormal; 
+        Font f = this.textFontNormal;
 
         PdfPTable datatable = new PdfPTable(getTableColumnsCount());
         datatable.setWidths(getTableColumnWidths());
@@ -138,7 +139,7 @@
 
                 DailyValuesRow rw = (DailyValuesRow) dv.getRow(i);
 
-                if ( (!this.dataAccess.isValueSet(rw.getMealsIds())) && 
+                if ( (!this.dataAccess.isValueSet(rw.getMealsIds())) &&
                      (!this.dataAccess.isValueSet(rw.getExtendedValue(ExtendedDailyValue.EXTENDED_FOOD_DESCRIPTION))))
                     continue;
 
@@ -151,26 +152,26 @@
 
                 datatable.addCell(new Phrase(rw.getTimeAsString(), f));
 
-                
+
                 if (this.dataAccess.isValueSet(rw.getMealsIds()))
                 {
 
                     DailyFoodEntries mpts = new DailyFoodEntries(rw.getMealsIds(), true);
                     writeTogetherData(datatable, rw);
-    
-    
+
+
                     for (int j = 0; j < mpts.getElementsCount(); j++)
                     {
                         DailyFoodEntry mp = mpts.getElement(j);
                         this.writeColumnData(datatable, mp);
                     }
                 }
-                
+
                 if (this.dataAccess.isValueSet(rw.getExtendedValue(ExtendedDailyValue.EXTENDED_FOOD_DESCRIPTION)))
                 {
                     writeFoodDescData(datatable, rw);
                 }
-                
+
             } // for
 
             if (active_day_entry==0)
@@ -188,11 +189,11 @@
 
     }
 
-    
 
+
     /**
      * Get Formated Value (String correctly formated from float value)
-     * 
+     *
      * @param value
      * @param dec_places
      * @return
@@ -200,25 +201,33 @@
     public String getFormatedValue(float value, int dec_places)
     {
         return this.dataAccess.getDecimalHandler().getDecimalAsString(value, dec_places);  // ch
-        
+
     }
-    
-    
-    
+
     /**
      * {@inheritDoc}
      */
     @Override
+    public ITextDocumentPrintSettings getCustomDocumentSettings()
+    {
+    	return new ITextDocumentPrintSettings(30, 30, 10, 30);
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public String getFileNameRange()
     {
         return this.dayValuesData.getRangeBeginObject().getDateFilenameString() + "-"
                 + this.dayValuesData.getRangeEndObject().getDateFilenameString();
     }
-    
-    
+
+
     /**
      * Get text for title
-     * 
+     *
      * @return title
      */
     public abstract String getTitleText();
@@ -229,7 +238,7 @@
      */
     public abstract int getTableColumnsCount();
 
-    /** 
+    /**
      * Return columns widths for table
      * @return
      */
@@ -237,7 +246,7 @@
 
     /**
      * Write additional header to documents
-     *  
+     *
      * @param table
      * @throws Exception
      */
@@ -245,7 +254,7 @@
 
     /**
      * Write together data (all data of certain type summed)
-     * 
+     *
      * @param table
      * @param rw
      * @throws Exception
@@ -254,31 +263,31 @@
 
     /**
      * Write data in column
-     * 
+     *
      * @param table
      * @param mp
      * @throws Exception
      */
     public abstract void writeColumnData(PdfPTable table, DailyFoodEntry mp) throws Exception;
 
-    
+
     /**
      * Write Food Description Data
-     * 
+     *
      * @param table
      * @param mp
      * @throws Exception
      */
     public abstract void writeFoodDescData(PdfPTable table, DailyValuesRow mp) throws Exception;
-    
-    
+
+
     /**
      * Write empty column data. If there is no data, this is used, to fill empty places.
-     * 
+     *
      * @param table
      * @throws Exception
      */
     public abstract void writeEmptyColumnData(PdfPTable table) throws Exception;
-    
-    
+
+
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



