You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(74) |
Aug
(72) |
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(21) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2006 |
Jan
|
Feb
(1) |
Mar
(122) |
Apr
(93) |
May
(5) |
Jun
(2) |
Jul
|
Aug
(2) |
Sep
(2) |
Oct
|
Nov
|
Dec
(18) |
2007 |
Jan
(5) |
Feb
|
Mar
(29) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(29) |
Feb
(24) |
Mar
(7) |
Apr
(33) |
May
(30) |
Jun
(29) |
Jul
(38) |
Aug
(57) |
Sep
(33) |
Oct
(22) |
Nov
(39) |
Dec
(27) |
2009 |
Jan
(15) |
Feb
(21) |
Mar
(44) |
Apr
(43) |
May
(13) |
Jun
(52) |
Jul
(40) |
Aug
(30) |
Sep
(1) |
Oct
(12) |
Nov
(7) |
Dec
(14) |
2010 |
Jan
(24) |
Feb
(44) |
Mar
(24) |
Apr
(14) |
May
(15) |
Jun
(32) |
Jul
(7) |
Aug
(18) |
Sep
(1) |
Oct
(21) |
Nov
|
Dec
(19) |
2011 |
Jan
(12) |
Feb
(9) |
Mar
(4) |
Apr
|
May
(1) |
Jun
|
Jul
(15) |
Aug
(6) |
Sep
(8) |
Oct
(3) |
Nov
|
Dec
(8) |
2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(18) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(7) |
2013 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(16) |
Jun
(19) |
Jul
(1) |
Aug
(10) |
Sep
(29) |
Oct
(12) |
Nov
(4) |
Dec
(1) |
2015 |
Jan
|
Feb
(9) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(28) |
Nov
|
Dec
(3) |
2016 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(9) |
Jun
(6) |
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(45) |
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
(11) |
Oct
(1) |
Nov
|
Dec
|
From: <and...@us...> - 2016-12-25 16:58:51
|
Revision: 1428 http://sourceforge.net/p/ggc/code/1428 Author: andyrozman Date: 2016-12-25 16:58:49 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Plugins - moved meters Modified Paths: -------------- trunk/ggc-plugins/ggc-meter/build/build.xml trunk/ggc-plugins/ggc-meter/pom.xml trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntry.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntrySpecial.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/MeterPluginDefinition.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/abbott/OptiumXceed.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaDecoder.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/DataAccessMeter.java trunk/ggc-plugins/ggc-plugins-base/pom.xml trunk/ggc-plugins/pom.xml Added Paths: ----------- trunk/ggc-plugins/ggc-meter/ trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/GlucoseMeterMarkerDto.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/GlucoseMeterMarker.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/SerialMeterAbstract.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/UsbMeterAbstract.java trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/GlucoseMeterMarkerHandler.java Removed Paths: ------------- trunk/ggc-meter/ trunk/ggc-plugin_base/ Property Changed: ---------------- trunk/ggc-plugins/ Index: trunk/ggc-plugins =================================================================== --- trunk/ggc-plugins 2016-12-25 16:39:02 UTC (rev 1427) +++ trunk/ggc-plugins 2016-12-25 16:58:49 UTC (rev 1428) Property changes on: trunk/ggc-plugins ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.iml Modified: trunk/ggc-plugins/ggc-meter/build/build.xml =================================================================== --- trunk/ggc-meter/build/build.xml 2016-12-25 13:37:33 UTC (rev 1420) +++ trunk/ggc-plugins/ggc-meter/build/build.xml 2016-12-25 16:58:49 UTC (rev 1428) @@ -1,15 +1,15 @@ <?xml version="1.0" ?> -<project name="GNU PlugIn Base" default="build" basedir="."> +<project name="GNU PlugIn Base" default="build" basedir=""> <description> Build file for GGC </description> <!-- Environment properties read from a file ...--> <property file="../../build/AtechTools.properties"/> - <property file="../../ggc-core/build/GGC_Core_Version.properties"/> - <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/> - <property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/> - <property file="./GGCMeterToolVersion.properties"/> + <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/> + <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseBuild.properties"/> + <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/> + <property file="GGCMeterToolVersion.properties"/> <!-- These should *not* be modified on the command line! --> Modified: trunk/ggc-plugins/ggc-meter/pom.xml =================================================================== --- trunk/ggc-meter/pom.xml 2016-12-25 13:37:33 UTC (rev 1420) +++ trunk/ggc-plugins/ggc-meter/pom.xml 2016-12-25 16:58:49 UTC (rev 1428) @@ -7,7 +7,7 @@ <groupId>net.sf.ggc</groupId> <artifactId>ggc-parent</artifactId> <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> + <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath> </parent> <name>GGC Meter Tool Project</name> Added: trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/GlucoseMeterMarkerDto.java =================================================================== --- trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/GlucoseMeterMarkerDto.java (rev 0) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/GlucoseMeterMarkerDto.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -0,0 +1,39 @@ +package ggc.meter.data; + +import ggc.meter.defs.GlucoseMeterMarker; + +/** + * Created by andy on 12/11/16. + */ +public class GlucoseMeterMarkerDto +{ + + GlucoseMeterMarker markerType; + String data; + + + public GlucoseMeterMarkerDto(GlucoseMeterMarker markerType) + { + this(markerType, null); + } + + + public GlucoseMeterMarkerDto(GlucoseMeterMarker markerType, String data) + { + this.markerType = markerType; + this.data = data; + } + + + public static GlucoseMeterMarkerDto createMarker(GlucoseMeterMarker markerType) + { + return new GlucoseMeterMarkerDto(markerType); + } + + + public static GlucoseMeterMarkerDto createMarker(GlucoseMeterMarker markerType, String data) + { + return new GlucoseMeterMarkerDto(markerType, data); + } + +} Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntry.java =================================================================== --- trunk/ggc-meter/src/ggc/meter/data/MeterValuesEntry.java 2016-12-25 13:37:33 UTC (rev 1420) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntry.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -1,18 +1,17 @@ package ggc.meter.data; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; +import java.util.*; import org.hibernate.Session; import org.hibernate.Transaction; -import com.atech.db.ext.ExtendedHandler; +import com.atech.data.GsonUtils; import com.atech.i18n.I18nControlAbstract; import com.atech.utils.data.ATechDate; import com.atech.utils.data.ATechDateType; -import ggc.core.data.defs.DailyValuesExtendedType; +import ggc.core.data.ExtendedDailyValueHandler; +import ggc.core.data.ExtendedDailyValueType; import ggc.core.data.defs.GlucoseUnitType; import ggc.core.db.hibernate.DayValueH; import ggc.meter.util.DataAccessMeter; @@ -51,7 +50,7 @@ private static DataAccessMeter da = DataAccessMeter.getInstance(); private static I18nControlAbstract ic = da.getI18nControlInstance(); - private static ExtendedHandler extendedDailyValueHandler = da.getExtendedDailyValueHandler(); + private static ExtendedDailyValueHandler extendedDailyValueHandler = da.getExtendedDailyValueHandler(); private ATechDate datetime; private Integer bgOriginal = null; @@ -59,8 +58,9 @@ private Hashtable<String, String> params; private Float bgMmolL; public DayValueH entry_object = null; - private HashMap<String, String> extendedMap; + private Map<ExtendedDailyValueType, String> extendedMap; public MeterValuesEntryDataType extendedType = MeterValuesEntryDataType.None; + public List<GlucoseMeterMarkerDto> glucoseMarkers; /** @@ -811,13 +811,15 @@ return false; } else - return extendedDailyValueHandler.isExtendedValueSet(DailyValuesExtendedType.Urine.getCode(), extendedMap); + return extendedDailyValueHandler.isExtendedValueSet(ExtendedDailyValueType.Urine, extendedMap) + || extendedDailyValueHandler.isExtendedValueSet(ExtendedDailyValueType.Urine_mmolL, extendedMap) + || extendedDailyValueHandler.isExtendedValueSet(ExtendedDailyValueType.Urine_mgdL, extendedMap); } public String getUrineValue() { - return extendedDailyValueHandler.getExtendedValue(DailyValuesExtendedType.Urine.getCode(), extendedMap); + return extendedDailyValueHandler.getExtendedValue(ExtendedDailyValueType.Urine, extendedMap); } @@ -838,33 +840,36 @@ } else { - this.extendedMap = new HashMap<String, String>(); + this.extendedMap = new HashMap<ExtendedDailyValueType, String>(); } - this.extendedDailyValueHandler.setExtendedValue(DailyValuesExtendedType.Source.getCode(), // + loadGlucoseMarkers(); + + extendedDailyValueHandler.setExtendedValue(ExtendedDailyValueType.Source, // DataAccessMeter.getInstance().getSourceDevice(), this.extendedMap); } - public void setUrine(DailyValuesExtendedType entryType, String value) + public void setUrine(ExtendedDailyValueType entryType, String value) { - String valueFull = null; - if (entryType == DailyValuesExtendedType.Urine) - { - valueFull = value; - } - else if (entryType == DailyValuesExtendedType.Urine_mgdL) - { - valueFull = value + " " + "mg/dL"; - } - else - // if (entryType == DailyValuesExtendedType.Urine_mgdL) - { - valueFull = value + " " + "mmol/L"; - } + // String valueFull = null; + // + // if (entryType == ExtendedDailyValueType.Urine) + // { + // valueFull = value; + // } + // else if (entryType == ExtendedDailyValueType.Urine_mgdL) + // { + // valueFull = value + " " + "mg/dL"; + // } + // else + // // if (entryType == DailyValuesExtendedType.Urine_mgdL) + // { + // valueFull = value + " " + "mmol/L"; + // } + // + extendedDailyValueHandler.setExtendedValue(entryType, value, extendedMap); - extendedDailyValueHandler.setExtendedValue(entryType.getCode(), valueFull, extendedMap); - resetExtendedType(); } @@ -1007,6 +1012,7 @@ */ public String createExtendedValueDailyValuesH() { + saveGlucoseMarkers(); return extendedDailyValueHandler.saveExtended(extendedMap); } @@ -1168,8 +1174,7 @@ break; case Urine: - extendedDailyValueHandler.setExtendedValue(DailyValuesExtendedType.Urine.getCode(), (String) value, - extendedMap); + extendedDailyValueHandler.setExtendedValue(ExtendedDailyValueType.Urine, (String) value, extendedMap); break; default: @@ -1207,4 +1212,32 @@ return bgMmolL; } + + public void addGlucoseMeterMarker(GlucoseMeterMarkerDto marker) + { + if (this.glucoseMarkers == null) + { + this.glucoseMarkers = new ArrayList<GlucoseMeterMarkerDto>(); + } + + this.glucoseMarkers.add(marker); + } + + + public void loadGlucoseMarkers() + { + if (extendedDailyValueHandler.isExtendedValueSet(ExtendedDailyValueType.GlucometerMarkers, extendedMap)) + { + this.glucoseMarkers = GsonUtils.getListOfType( // + extendedDailyValueHandler.getExtendedValue(ExtendedDailyValueType.GlucometerMarkers, extendedMap), // + GlucoseMeterMarkerDto.class); + } + } + + + public void saveGlucoseMarkers() + { + extendedDailyValueHandler.setExtendedValue(ExtendedDailyValueType.GlucometerMarkers, null, extendedMap); + } + } Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntrySpecial.java =================================================================== --- trunk/ggc-meter/src/ggc/meter/data/MeterValuesEntrySpecial.java 2016-12-25 13:37:33 UTC (rev 1420) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntrySpecial.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -1,10 +1,10 @@ package ggc.meter.data; -import ggc.core.data.ExtendedDailyValueHandler; +import java.util.Hashtable; + +import ggc.core.data.ExtendedDailyValueType; import ggc.meter.util.DataAccessMeter; -import java.util.Hashtable; - /** * Application: GGC - GNU Gluco Control * Plug-in: Meter Tool (support for Meter devices) @@ -104,6 +104,7 @@ // String>(); static Hashtable<String, String> allowed_types = null; + /** * Constructor * @@ -124,6 +125,7 @@ } } + /** * Get Allowed Pump Mapped Types * @@ -142,6 +144,7 @@ return allowed_types; } + private void processUrine(String value) { if (value.toLowerCase().contains("mmol/")) @@ -169,24 +172,25 @@ } } + /** * Which Special is DVE - * + * * @param dv_type * @return */ - public int whichSpecialIsDVE(int dv_type) - { - switch (dv_type) - { - case ExtendedDailyValueHandler.EXTENDED_URINE: - return SPECIAL_ENTRY_URINE_COMBINED; + // public int whichSpecialIsDVE(int dv_type) + // { + // switch (dv_type) + // { + // case ExtendedDailyValueHandler.EXTENDED_URINE: + // return SPECIAL_ENTRY_URINE_COMBINED; + // + // default: + // return -1; + // } + // } - default: - return -1; - } - } - /** * Do we Transfer Units For Special Entry * @@ -197,6 +201,7 @@ return special_entries.get("" + this.special_entry_id).transfer_unit; } + /** * Get Pump Mapped Type * @@ -207,6 +212,7 @@ return special_entries.get("" + this.special_entry_id).pump_map; } + /** * Set Date Time * @@ -217,6 +223,7 @@ this.datetime_tag = dt; } + /** * Get Pump Compare Id * @@ -227,6 +234,7 @@ return this.datetime_tag * 100 + "_" + getPumpMappedType(); } + /** * Get Special Entry DbEntry * @return @@ -249,21 +257,22 @@ return sb.toString(); } + private void initSpecialEntries() { if (special_entries == null) { special_entries = new Hashtable<String, SpecialEntryDefinition>(); special_entries.put("1", new SpecialEntryDefinition(1, "URINE", "mmol/L", true, 4, - ExtendedDailyValueHandler.EXTENDED_URINE, SpecialEntryDefinition.TYPE_STRING)); + ExtendedDailyValueType.Urine_mmolL, SpecialEntryDefinition.TYPE_STRING)); special_entries.put("2", new SpecialEntryDefinition(2, "URINE", "mg/dL", true, 4, - ExtendedDailyValueHandler.EXTENDED_URINE, SpecialEntryDefinition.TYPE_STRING)); - special_entries.put("3", new SpecialEntryDefinition(3, "URINE", "", false, 4, - ExtendedDailyValueHandler.EXTENDED_URINE, SpecialEntryDefinition.TYPE_STRING)); - special_entries.put("4", new SpecialEntryDefinition(4, "CH", "g", false, 5, -1, - SpecialEntryDefinition.TYPE_DECIMAL_1)); - special_entries.put("-2", new SpecialEntryDefinition(-2, "BG", "", false, 3, -1, - SpecialEntryDefinition.TYPE_INTEGER)); + ExtendedDailyValueType.Urine_mgdL, SpecialEntryDefinition.TYPE_STRING)); + special_entries.put("3", new SpecialEntryDefinition(3, "URINE", "", false, 4, ExtendedDailyValueType.Urine, + SpecialEntryDefinition.TYPE_STRING)); + special_entries.put("4", + new SpecialEntryDefinition(4, "CH", "g", false, 5, null, SpecialEntryDefinition.TYPE_DECIMAL_1)); + special_entries.put("-2", + new SpecialEntryDefinition(-2, "BG", "", false, 3, null, SpecialEntryDefinition.TYPE_INTEGER)); } // Hashtable<String, String> special_entry_tags = new Hashtable<String, @@ -271,6 +280,7 @@ } + /** * Get Packed Value * @@ -287,6 +297,7 @@ return v; } + /** * get Value Value * @return @@ -302,15 +313,13 @@ } else if (special_entries.get("" + this.special_entry_id).type == SpecialEntryDefinition.TYPE_DECIMAL_1) { - v = "" - + da.getDecimalHandler().getDecimalAsString( - da.getFloatValueFromString(this.special_entry_value.trim(), 0.0f) * 1.0f, 1); + v = "" + da.getDecimalHandler() + .getDecimalAsString(da.getFloatValueFromString(this.special_entry_value.trim(), 0.0f) * 1.0f, 1); } else if (special_entries.get("" + this.special_entry_id).type == SpecialEntryDefinition.TYPE_DECIMAL_2) { - v = "" - + da.getDecimalHandler().getDecimalAsString( - da.getFloatValueFromString(this.special_entry_value.trim(), 0.0f) * 1.0f, 2); + v = "" + da.getDecimalHandler() + .getDecimalAsString(da.getFloatValueFromString(this.special_entry_value.trim(), 0.0f) * 1.0f, 2); } else { @@ -320,6 +329,7 @@ return v; } + /** * Get Type Description * @@ -331,6 +341,7 @@ .getMessage(special_entries.get("" + this.special_entry_id).tag); } + /** * Get Extended Freetype description * @@ -343,12 +354,14 @@ private class SpecialEntryDefinition { + public int id; public String tag; public String unit; boolean transfer_unit; public int pump_map; - public int dailyvalue_ext_map; + public ExtendedDailyValueType dailyValueExtendedMap; + // public int dailyvalue_ext_map; public int type; public static final int TYPE_DECIMAL_1 = 1; @@ -356,6 +369,7 @@ public static final int TYPE_STRING = 3; public static final int TYPE_INTEGER = 4; + /* * public SpecialEntryDefinition(int id_, String tag_, String unit_, * boolean transfer_unit_ ) @@ -365,14 +379,14 @@ */ public SpecialEntryDefinition(int id_, String tag_, String unit_, boolean transfer_unit_, int pump_map_, - int dv_ext_map, int type_) + ExtendedDailyValueType dailyValueExtendedMap, int type_) { this.id = id_; this.tag = tag_; this.unit = unit_; this.transfer_unit = transfer_unit_; this.pump_map = pump_map_; - this.dailyvalue_ext_map = dv_ext_map; + this.dailyValueExtendedMap = dailyValueExtendedMap; this.type = type_; } Added: trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/GlucoseMeterMarker.java =================================================================== --- trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/GlucoseMeterMarker.java (rev 0) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/GlucoseMeterMarker.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -0,0 +1,34 @@ +package ggc.meter.defs; + +/** + * Created by andy on 12/11/16. + */ +public enum GlucoseMeterMarker +{ + + LowGlucose("MARKER_LO"), // + HighGlucose("MARKER_HI"), // + PreMeal("MARKER_PRE_MEAL"), // + PostMeal("MARKER_POST_MEAL"), // + DontFeelRight("MARKER_DONT_FEEL_RIGHT"), // + Sick("MARKER_SICK"), // + Stress("MARKER_STRESS"), // + Activity("MARKER_ACTIVITY"), // + ControlResult("MARKER_CONTROL_RESULT"), // + AfterFoodWithTime("MARKER_AFTER_FOOD"), // + ; + + private String description; + + + GlucoseMeterMarker(String description) + { + this.description = description; + } + + + public String getDescription() + { + return description; + } +} Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/MeterPluginDefinition.java =================================================================== --- trunk/ggc-meter/src/ggc/meter/defs/MeterPluginDefinition.java 2016-12-25 13:37:33 UTC (rev 1420) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/MeterPluginDefinition.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -127,8 +127,10 @@ { List<FeaturesEntry> outList = new ArrayList<FeaturesEntry>(); - outList.add(new FeaturesEntry("LifeScan: Ultra2 (in 2016)")); - outList.add(new FeaturesEntry("Wellion: Calla, Luna (in 2016 ?)")); + outList.add(new FeaturesEntry("LifeScan: Ultra2 (in 2017)")); + outList.add(new FeaturesEntry("Wellion: Calla, Luna (in 2017 ?)")); + outList.add(new FeaturesEntry("Menarini: most newer models (in 2017 ?)")); + outList.add(new FeaturesEntry("Arkray: some models (in 2017 ?)")); return outList; } Added: trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/SerialMeterAbstract.java =================================================================== --- trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/SerialMeterAbstract.java (rev 0) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/SerialMeterAbstract.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -0,0 +1,256 @@ +package ggc.meter.device; + +import java.io.EOFException; +import java.util.Set; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.atech.utils.data.ATechDate; +import com.atech.utils.data.ATechDateType; + +import ggc.core.data.defs.GlucoseUnitType; +import ggc.meter.data.MeterValuesEntry; +import ggc.meter.data.defs.MeterDeviceDefinition; +import ggc.meter.util.DataAccessMeter; +import ggc.plugin.comm.NRSerialCommunicationHandler; +import ggc.plugin.comm.cfg.SerialSettings; +import ggc.plugin.data.enums.PlugInExceptionType; +import ggc.plugin.device.DeviceIdentification; +import ggc.plugin.device.PlugInBaseException; +import ggc.plugin.output.OutputWriter; + +/** + * This is abstract class for serial meters, that works with new CommunicationHandler + * framework (MeterInterface2). + */ +public abstract class SerialMeterAbstract +{ + + private static final Logger LOG = LoggerFactory.getLogger(SerialMeterAbstract.class); + + protected DataAccessMeter dataAccess; + protected OutputWriter outputWriter; + protected NRSerialCommunicationHandler communicationHandler; + protected String portName; + protected boolean active = false; + protected String serialNumber; + protected MeterDeviceDefinition deviceDefinition; + protected GlucoseUnitType glucoseUnitType; + private int receiveTimeout; + + + public SerialMeterAbstract(DataAccessMeter dataAccess, OutputWriter outputWriter, String portName, + MeterDeviceDefinition deviceDefinition) + { + this.dataAccess = dataAccess; + this.outputWriter = outputWriter; + this.portName = portName; + this.deviceDefinition = deviceDefinition; + } + + + public void readData() throws PlugInBaseException + { + checkIfDevicePresentOnConfiguredPort(); + connectDevice(); + preInitDevice(); + readDeviceData(); + } + + + private void connectDevice() + { + communicationHandler = new NRSerialCommunicationHandler(portName, getSerialSettings()); + communicationHandler.connectAndInitDevice(); + this.active = true; + } + + + protected abstract void preInitDevice() throws PlugInBaseException; + + + private void checkIfDevicePresentOnConfiguredPort() throws PlugInBaseException + { + Set<String> availablePorts = NRSerialCommunicationHandler.getAvailablePorts(); + + boolean found = false; + + for (String port : availablePorts) + { + if (port.equalsIgnoreCase(portName)) + { + found = true; + break; + } + } + + if (!found) + { + throw new PlugInBaseException(PlugInExceptionType.DeviceNotFoundOnConfiguredPort); + // if (availablePorts.size() > 0) + // { + // + // } + // else + // { + // throw new + // PlugInBaseException(PlugInExceptionType.DeviceNotFoundOnConfiguredPort); + // } + } + } + + + public abstract void readDeviceData() throws PlugInBaseException; + + + protected void setReceiveTimeout(int timeout) throws PlugInBaseException + { + this.receiveTimeout = timeout; + this.communicationHandler.setReceiveTimeout(timeout); + } + + + protected byte readByte() throws Exception + { + int rv = -1; + long startMs = System.currentTimeMillis(); + + do + { + rv = this.communicationHandler.read(); + + if (rv != -1) + { + return (byte) rv; + } + + if ((System.currentTimeMillis() - startMs) > this.receiveTimeout) + { + break; + } + + } while (rv == -1); + + if (this.active) + { + throw new EOFException("Serial port timeout on " + this.portName); + } + + return -1; + } + + + protected char readChar() throws Exception + { + int rv = -1; + + try + { + rv = this.communicationHandler.read(); + } + catch (PlugInBaseException ex) + { + throw ex; + } + + if (rv == -1) + { + if (this.active) + { + throw new EOFException("Serial port timeout on " + this.portName); + } + + throw new InterruptedException(); + } + return (char) rv; + } + + + public abstract SerialSettings getSerialSettings(); + + + public String right(String s, int size) + { + if (s == null) + return null; + if (s.length() <= size) + { + return s; + } + return s.substring(s.length() - size); + } + + + public int unsignedByteToInt(byte b) + { + return b & 0xFF; + } + + + public String unsignedByteToIntAsHexString(byte data) + { + return Integer.toHexString(this.unsignedByteToInt(data)); + } + + + protected void write(int[] buf) throws PlugInBaseException + { + this.communicationHandler.write(buf); + this.communicationHandler.flush(); + } + + + protected void disconnectDevice() + { + this.communicationHandler.disconnectDevice(); + this.active = false; + } + + + protected void write(byte[] buf) throws PlugInBaseException + { + this.communicationHandler.write(buf); + this.communicationHandler.flush(); + } + + + protected void writeDeviceIdentification() + { + DeviceIdentification deviceIdentification = new DeviceIdentification(dataAccess.getI18nControlInstanceBase()); + deviceIdentification.setDeviceDefinition(this.deviceDefinition); + deviceIdentification.device_serial_number = serialNumber; + + outputWriter.setDeviceIdentification(deviceIdentification); + outputWriter.writeDeviceIdentification(); + } + + + public void setGlucoseUnitType(GlucoseUnitType glucoseUnitType) + { + this.glucoseUnitType = glucoseUnitType; + } + + + public void writeBGData(float bg, int year, int month, int day, int hour, int minute) + { + MeterValuesEntry mve = new MeterValuesEntry(); + mve.setBgValue(bg, glucoseUnitType); + mve.setDateTimeObject(getATechDate(year, month, day, hour, minute)); + + this.outputWriter.writeData(mve); + } + + + public ATechDate getATechDate(int year, int month, int day, int hour, int minute) + { + return new ATechDate(day, month, year, hour, minute, ATechDateType.DateAndTimeMin); + } + + + protected void read(int[] data) throws PlugInBaseException + { + communicationHandler.read(data); + } + +} Copied: trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/UsbMeterAbstract.java (from rev 1382, trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaUsbMeterHandler.java) =================================================================== --- trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/UsbMeterAbstract.java (rev 0) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/UsbMeterAbstract.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -0,0 +1,287 @@ +package ggc.meter.device; + +import java.io.EOFException; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.atech.utils.data.ATechDate; +import com.atech.utils.data.ATechDateType; + +import ggc.core.data.defs.GlucoseUnitType; +import ggc.meter.data.MeterValuesEntry; +import ggc.meter.data.defs.MeterDeviceDefinition; +import ggc.meter.util.DataAccessMeter; +import ggc.plugin.comm.NRSerialCommunicationHandler; +import ggc.plugin.comm.cfg.SerialSettings; +import ggc.plugin.comm.cfg.USBDevice; +import ggc.plugin.data.GGCPlugInFileReaderContext; +import ggc.plugin.data.enums.PlugInExceptionType; +import ggc.plugin.device.DeviceIdentification; +import ggc.plugin.device.DownloadSupportType; +import ggc.plugin.device.PlugInBaseException; +import ggc.plugin.device.v2.DeviceDefinition; +import ggc.plugin.output.OutputWriter; + +/** + * This is abstract class for Usb meters, that works with new framework (MeterInterface2). + */ +public abstract class UsbMeterAbstract +{ + + private static final Logger LOG = LoggerFactory.getLogger(SerialMeterAbstract.class); + + protected DataAccessMeter dataAccess; + protected OutputWriter outputWriter; + protected NRSerialCommunicationHandler communicationHandler; + protected String portName; + protected boolean active = false; + protected String serialNumber; + protected MeterDeviceDefinition deviceDefinition; + protected GlucoseUnitType glucoseUnitType; + private int receiveTimeout; + + + public UsbMeterAbstract(DataAccessMeter dataAccess, OutputWriter outputWriter, + MeterDeviceDefinition deviceDefinition) + { + this.dataAccess = dataAccess; + this.outputWriter = outputWriter; + this.portName = portName; + this.deviceDefinition = deviceDefinition; + } + + + public void readData() throws PlugInBaseException + { + checkIfDevicePresentOnConfiguredPort(); + connectDevice(); + preInitDevice(); + readDeviceData(); + } + + + private void connectDevice() + { + communicationHandler = new NRSerialCommunicationHandler(portName, getSerialSettings()); + communicationHandler.connectAndInitDevice(); + this.active = true; + } + + + protected abstract void preInitDevice() throws PlugInBaseException; + + + private void checkIfDevicePresentOnConfiguredPort() throws PlugInBaseException + { + Set<String> availablePorts = NRSerialCommunicationHandler.getAvailablePorts(); + + boolean found = false; + + for (String port : availablePorts) + { + if (port.equalsIgnoreCase(portName)) + { + found = true; + break; + } + } + + if (!found) + { + throw new PlugInBaseException(PlugInExceptionType.DeviceNotFoundOnConfiguredPort); + // if (availablePorts.size() > 0) + // { + // + // } + // else + // { + // throw new + // PlugInBaseException(PlugInExceptionType.DeviceNotFoundOnConfiguredPort); + // } + } + } + + + public abstract void readDeviceData() throws PlugInBaseException; + + + protected void setReceiveTimeout(int timeout) throws PlugInBaseException + { + this.receiveTimeout = timeout; + this.communicationHandler.setReceiveTimeout(timeout); + } + + + protected byte readByte() throws Exception + { + int rv = -1; + long startMs = System.currentTimeMillis(); + + do + { + rv = this.communicationHandler.read(); + + if (rv != -1) + { + return (byte) rv; + } + + if ((System.currentTimeMillis() - startMs) > this.receiveTimeout) + { + break; + } + + } while (rv == -1); + + if (this.active) + { + throw new EOFException("Serial port timeout on " + this.portName); + } + + return -1; + } + + + protected char readChar() throws Exception + { + int rv = -1; + + try + { + rv = this.communicationHandler.read(); + } + catch (PlugInBaseException ex) + { + throw ex; + } + + if (rv == -1) + { + if (this.active) + { + throw new EOFException("Serial port timeout on " + this.portName); + } + + throw new InterruptedException(); + } + return (char) rv; + } + + + public abstract SerialSettings getSerialSettings(); + + + public String right(String s, int size) + { + if (s == null) + return null; + if (s.length() <= size) + { + return s; + } + return s.substring(s.length() - size); + } + + + public int unsignedByteToInt(byte b) + { + return b & 0xFF; + } + + + public String unsignedByteToIntAsHexString(byte data) + { + return Integer.toHexString(this.unsignedByteToInt(data)); + } + + + protected void write(int[] buf) throws PlugInBaseException + { + this.communicationHandler.write(buf); + this.communicationHandler.flush(); + } + + + protected void disconnectDevice() + { + this.communicationHandler.disconnectDevice(); + this.active = false; + } + + + protected void write(byte[] buf) throws PlugInBaseException + { + this.communicationHandler.write(buf); + this.communicationHandler.flush(); + } + + + protected void writeDeviceIdentification() + { + DeviceIdentification deviceIdentification = new DeviceIdentification(dataAccess.getI18nControlInstanceBase()); + deviceIdentification.setDeviceDefinition(this.deviceDefinition); + deviceIdentification.device_serial_number = serialNumber; + + outputWriter.setDeviceIdentification(deviceIdentification); + outputWriter.writeDeviceIdentification(); + } + + + public void setGlucoseUnitType(GlucoseUnitType glucoseUnitType) + { + this.glucoseUnitType = glucoseUnitType; + } + + + public void writeBGData(float bg, int year, int month, int day, int hour, int minute) + { + MeterValuesEntry mve = new MeterValuesEntry(); + mve.setBgValue(bg, glucoseUnitType); + mve.setDateTimeObject(getATechDate(year, month, day, hour, minute)); + + this.outputWriter.writeData(mve); + } + + + public ATechDate getATechDate(int year, int month, int day, int hour, int minute) + { + return new ATechDate(day, month, year, hour, minute, ATechDateType.DateAndTimeMin); + } + + + protected void read(int[] data) throws PlugInBaseException + { + communicationHandler.read(data); + } + + + public void readConfiguration(DeviceDefinition definition, Object connectionParameters, OutputWriter outputWriter) + throws PlugInBaseException + { + } + + + public List<USBDevice> getAllowedDevicesList() + { + List<USBDevice> usbDeviceList = new ArrayList<USBDevice>(); + usbDeviceList.add(new USBDevice("Contour USB", 0x1a79, 0x6002)); + usbDeviceList.add(new USBDevice("Contour USB", 0x1a79, 0x7390)); // ? + usbDeviceList.add(new USBDevice("Contour Next", 0x1a79, 0x7350)); + usbDeviceList.add(new USBDevice("Contour Next USB", 0x1a79, 0x7410)); + usbDeviceList.add(new USBDevice("Contour Next Link", 0x1a79, 0x6300)); + usbDeviceList.add(new USBDevice("Contour Next Link", 0x1a79, 0x6200)); // ? + + return usbDeviceList; + } + + + public List<GGCPlugInFileReaderContext> getFileDownloadContexts(DownloadSupportType downloadSupportType) + { + return null; + } + +} Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/abbott/OptiumXceed.java =================================================================== --- trunk/ggc-meter/src/ggc/meter/device/abbott/OptiumXceed.java 2016-12-25 13:37:33 UTC (rev 1420) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/abbott/OptiumXceed.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -9,7 +9,7 @@ import com.atech.utils.data.ATechDate; import com.atech.utils.data.TimeZoneUtil; -import ggc.core.data.defs.DailyValuesExtendedType; +import ggc.core.data.ExtendedDailyValueType; import ggc.core.data.defs.GlucoseUnitType; import ggc.meter.data.MeterValuesEntry; import ggc.meter.device.AbstractSerialMeter; @@ -512,7 +512,7 @@ // .format(dataAccess.getBGValueByType(DataAccessPlugInBase.BG_MGDL, // DataAccessPlugInBase.BG_MMOL, data))); - mve.setUrine(DailyValuesExtendedType.Urine_mmolL, dataAccess.getFormatedValue( + mve.setUrine(ExtendedDailyValueType.Urine_mmolL, dataAccess.getFormatedValue( dataAccess.getBGValueByType(GlucoseUnitType.mg_dL, GlucoseUnitType.mmol_L, Float.parseFloat(data)), 1)); this.outputWriter.writeData(mve); Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaDecoder.java =================================================================== --- trunk/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaDecoder.java 2016-12-25 13:37:33 UTC (rev 1420) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaDecoder.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -1,7 +1,5 @@ package ggc.meter.device.ascensia.impl; -import java.util.ArrayList; -import java.util.List; import java.util.StringTokenizer; import org.slf4j.Logger; @@ -12,7 +10,9 @@ import com.atech.utils.data.TimeZoneUtil; import ggc.core.data.defs.GlucoseUnitType; +import ggc.meter.data.GlucoseMeterMarkerDto; import ggc.meter.data.MeterValuesEntry; +import ggc.meter.defs.GlucoseMeterMarker; import ggc.meter.util.DataAccessMeter; import ggc.plugin.device.DeviceIdentification; import ggc.plugin.output.OutputWriter; @@ -128,7 +128,8 @@ String markers = strtok.nextToken(); - mve.addParameter("MARKERS", convertMarkers(markers)); // User Marks + // user marks + convertMarkers(markers, mve); // User Marks strtok.nextToken(); // N/A @@ -219,54 +220,52 @@ } - private String convertMarkers(String markersInput) + private void convertMarkers(String markersInput, MeterValuesEntry mve) { - List<String> markers = new ArrayList<String>(); - if (markersInput.contains("<")) { - markers.add("MARKER_LO"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.LowGlucose)); } else if (markersInput.contains(">")) { - markers.add("MARKER_HI"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.HighGlucose)); } if (markersInput.contains("B")) { if (!markersInput.contains("ZB")) - markers.add("MARKER_PRE_MEAL"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.PreMeal)); } else if (markersInput.contains("A")) { if (!markersInput.contains("ZA")) - markers.add("MARKER_POST_MEAL"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.PostMeal)); } if (markersInput.contains("D")) { - markers.add("MARKER_DONT_FEEL_RIGHT"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.DontFeelRight)); } if (markersInput.contains("I")) { - markers.add("MARKER_SICK"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.Sick)); } if (markersInput.contains("S")) { - markers.add("MARKER_STRESS"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.Stress)); } if (markersInput.contains("X")) { - markers.add("MARKER_ACTIVITY"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.Activity)); } if (markersInput.contains("C")) { if (!markersInput.contains("ZC")) - markers.add("MARKER_CONTROL_RESULT"); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.ControlResult)); } if (markersInput.contains("Z")) @@ -322,13 +321,9 @@ time = "3 h"; } - markers.add(String.format(i18nControl.getMessage("MARKER_AFTER_FOOD"), time)); + mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.AfterFoodWithTime, time)); } - if (markers.size() == 0) - return null; - else - return DataAccessMeter.getInstance().createStringRepresentationOfCollection(markers, ","); } Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/DataAccessMeter.java =================================================================== --- trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2016-12-25 13:37:33 UTC (rev 1420) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -482,7 +482,7 @@ // System.out.println("Load Extended Handler: " + new // ExtendedDailyValue(this)); - this.addExtendedHandler(EXTENDED_HANDLER_DAILY_VALUE, new ExtendedDailyValueHandler(this)); + this.addExtendedHandler(EXTENDED_HANDLER_DAILY_VALUE, new ExtendedDailyValueHandler()); // this.extended_handlers = new Hashtable<>(); // this.extended_handlers.put(EXTENDED_HANDLER_DAILY_VALUE, new // ExtendedDailyValue(this)); Added: trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/GlucoseMeterMarkerHandler.java =================================================================== --- trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/GlucoseMeterMarkerHandler.java (rev 0) +++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/GlucoseMeterMarkerHandler.java 2016-12-25 16:58:49 UTC (rev 1428) @@ -0,0 +1,22 @@ +package ggc.meter.util; + +import java.util.List; + +import ggc.meter.defs.GlucoseMeterMarker; + +/** + * Created by andy on 12/11/16. + */ +public class GlucoseMeterMarkerHandler +{ + + // FIXME + public String t(List<GlucoseMeterMarker> markers) + { + if (markers.size() == 0) + return null; + else + return DataAccessMeter.getInstance().createStringRepresentationOfCollection(markers, ","); + } + +} Modified: trunk/ggc-plugins/ggc-plugins-base/pom.xml =================================================================== --- trunk/ggc-plugins/ggc-plugins-base/pom.xml 2016-12-25 16:39:02 UTC (rev 1427) +++ trunk/ggc-plugins/ggc-plugins-base/pom.xml 2016-12-25 16:58:49 UTC (rev 1428) @@ -3,40 +3,18 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> + <artifactId>ggc-plugins</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <name>GGC Plugin Base Project</name> + <name>GGC Plugins Base</name> - <artifactId>ggc-plugin-base</artifactId> + <artifactId>ggc-plugins-base</artifactId> <version>${ggc-plugin-base.version}</version> - <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> - <sourceDirectory>src</sourceDirectory> - <scriptSourceDirectory>src</scriptSourceDirectory> - <testSourceDirectory>src/test/java</testSourceDirectory> - <resources> - <resource> - <directory>src</directory> - <filtering>true</filtering> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - </build> + <dependencies> <dependency> <groupId>net.sf.ggc</groupId> Modified: trunk/ggc-plugins/pom.xml =================================================================== --- trunk/ggc-plugins/pom.xml 2016-12-25 16:39:02 UTC (rev 1427) +++ trunk/ggc-plugins/pom.xml 2016-12-25 16:58:49 UTC (rev 1428) @@ -13,6 +13,13 @@ <artifactId>ggc-plugins</artifactId> <packaging>pom</packaging> + + <modules> + <module>ggc-plugins-base</module> + + </modules> + + <!-- <modules> <module>ggc-help</module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 16:39:04
|
Revision: 1427 http://sourceforge.net/p/ggc/code/1427 Author: andyrozman Date: 2016-12-25 16:39:02 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Doctor App - added ggc-desktop-doctor - added gcc-doctor-server Added Paths: ----------- trunk/ggc-doctor-app/ggc-desktop-doctor/ trunk/ggc-doctor-app/ggc-desktop-doctor/docs/ trunk/ggc-doctor-app/ggc-desktop-doctor/pom.xml trunk/ggc-doctor-app/ggc-desktop-doctor/src/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/java/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/test/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/test/java/ trunk/ggc-doctor-app/ggc-desktop-doctor/src/test/resources/ trunk/ggc-doctor-app/ggc-doctor-server/ trunk/ggc-doctor-app/ggc-doctor-server/docs/ trunk/ggc-doctor-app/ggc-doctor-server/pom.xml trunk/ggc-doctor-app/ggc-doctor-server/src/ trunk/ggc-doctor-app/ggc-doctor-server/src/main/ trunk/ggc-doctor-app/ggc-doctor-server/src/main/java/ trunk/ggc-doctor-app/ggc-doctor-server/src/main/resources/ trunk/ggc-doctor-app/ggc-doctor-server/src/test/ trunk/ggc-doctor-app/ggc-doctor-server/src/test/java/ trunk/ggc-doctor-app/ggc-doctor-server/src/test/resources/ trunk/ggc-doctor-app/pom.xml Index: trunk/ggc-doctor-app/ggc-desktop-doctor =================================================================== --- trunk/ggc-doctor-app/ggc-desktop-doctor 2016-12-25 16:21:27 UTC (rev 1426) +++ trunk/ggc-doctor-app/ggc-desktop-doctor 2016-12-25 16:39:02 UTC (rev 1427) Property changes on: trunk/ggc-doctor-app/ggc-desktop-doctor ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +*.iml Added: trunk/ggc-doctor-app/ggc-desktop-doctor/pom.xml =================================================================== --- trunk/ggc-doctor-app/ggc-desktop-doctor/pom.xml (rev 0) +++ trunk/ggc-doctor-app/ggc-desktop-doctor/pom.xml 2016-12-25 16:39:02 UTC (rev 1427) @@ -0,0 +1,61 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-doctor-app</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>GGC Doctor Desktop</name> + <description>GGC Doctor's Edition</description> + <artifactId>ggc-doctor-desktop</artifactId> + <version>0.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-core</artifactId> + </dependency> + + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-doctor-core</artifactId> + </dependency> + + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-desktop</artifactId> + </dependency> + + <dependency> + <groupId>com.atech-software</groupId> + <artifactId>atech-tools</artifactId> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-702.jdbc3</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <!-- <version>4.11</version> --> + <!-- <scope>test</scope> --> + </dependency> + + + </dependencies> + + <properties> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + </properties> + +</project> Added: trunk/ggc-doctor-app/ggc-doctor-server/pom.xml =================================================================== --- trunk/ggc-doctor-app/ggc-doctor-server/pom.xml (rev 0) +++ trunk/ggc-doctor-app/ggc-doctor-server/pom.xml 2016-12-25 16:39:02 UTC (rev 1427) @@ -0,0 +1,81 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../ggc-master-pom/pom.xml</relativePath> + </parent> + + <groupId>net.sf.ggc</groupId> + <name>GGC Software Support - MS Health Vault</name> + + <description>Temporary project for Integration with MS Health Vault software.</description> + + <artifactId>ggc-sw-healthvault</artifactId> + <version>0.1-SNAPSHOT</version> + + <build> + <directory>target</directory> + <outputDirectory>target/classes</outputDirectory> + <finalName>${project.artifactId}-${project.version}</finalName> + <testOutputDirectory>target/test-classes</testOutputDirectory> + <sourceDirectory>src/main/java</sourceDirectory> + <!-- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory> --> + + + <testSourceDirectory>src/test/java</testSourceDirectory> + <resources> + <resource> + <directory>src</directory> + <filtering>true</filtering> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + </testResources> + </build> + + <dependencies> + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-core</artifactId> + </dependency> + + <dependency> + <groupId>com.atech-software</groupId> + <artifactId>atech-tools</artifactId> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-702.jdbc3</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <!-- <version>4.11</version> --> + <!-- <scope>test</scope> --> + </dependency> + + + + + </dependencies> + + <properties> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + </properties> + +</project> Added: trunk/ggc-doctor-app/pom.xml =================================================================== --- trunk/ggc-doctor-app/pom.xml (rev 0) +++ trunk/ggc-doctor-app/pom.xml 2016-12-25 16:39:02 UTC (rev 1427) @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-root</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>GGC Doctor App</name> + <artifactId>ggc-doctor-app</artifactId> + <packaging>pom</packaging> + + <!-- + <modules> + <module>ggc-help</module> + </modules> + --> + +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 16:21:29
|
Revision: 1426 http://sourceforge.net/p/ggc/code/1426 Author: andyrozman Date: 2016-12-25 16:21:27 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Future - future module Added Paths: ----------- trunk/ggc-future/ trunk/ggc-future/pom.xml Added: trunk/ggc-future/pom.xml =================================================================== --- trunk/ggc-future/pom.xml (rev 0) +++ trunk/ggc-future/pom.xml 2016-12-25 16:21:27 UTC (rev 1426) @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-root</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>GGC Future Modules</name> + <artifactId>ggc-future</artifactId> + <packaging>pom</packaging> + + <!-- + <modules> + <module>ggc-help</module> + </modules> + --> + +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 16:11:38
|
Revision: 1425 http://sourceforge.net/p/ggc/code/1425 Author: andyrozman Date: 2016-12-25 16:11:36 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Plugins - moved all files from old project Modified Paths: -------------- trunk/ggc-plugins/ggc-plugins-base/build/build.xml trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/comm/cfg/SerialSettings.java trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/device/PlugInBaseException.java Added Paths: ----------- trunk/ggc-plugins/ggc-plugins-base/.settings/ trunk/ggc-plugins/ggc-plugins-base/build/ trunk/ggc-plugins/ggc-plugins-base/docs/ trunk/ggc-plugins/ggc-plugins-base/pom.xml trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/ trunk/ggc-plugins/ggc-plugins-base/src/main/resources/GGCPlugin_de.properties trunk/ggc-plugins/ggc-plugins-base/src/main/resources/GGCPlugin_en.properties trunk/ggc-plugins/ggc-plugins-base/src/main/resources/GGCPlugin_fr.properties trunk/ggc-plugins/ggc-plugins-base/src/main/resources/GGCPlugin_si.properties trunk/ggc-plugins/ggc-plugins-base/src/main/resources/icons/ Removed Paths: ------------- trunk/ggc-plugin_base/.settings/ trunk/ggc-plugin_base/build/ trunk/ggc-plugin_base/docs/ trunk/ggc-plugin_base/pom.xml trunk/ggc-plugin_base/src/GGCPlugin_de.properties trunk/ggc-plugin_base/src/GGCPlugin_en.properties trunk/ggc-plugin_base/src/GGCPlugin_fr.properties trunk/ggc-plugin_base/src/GGCPlugin_si.properties trunk/ggc-plugin_base/src/ggc/ trunk/ggc-plugin_base/src/icons/ Deleted: trunk/ggc-plugin_base/pom.xml =================================================================== --- trunk/ggc-plugin_base/pom.xml 2016-12-25 16:06:50 UTC (rev 1424) +++ trunk/ggc-plugin_base/pom.xml 2016-12-25 16:11:36 UTC (rev 1425) @@ -1,107 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> - </parent> - - <name>GGC Plugin Base Project</name> - - <artifactId>ggc-plugin-base</artifactId> - <version>${ggc-plugin-base.version}</version> - - <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> - <sourceDirectory>src</sourceDirectory> - <scriptSourceDirectory>src</scriptSourceDirectory> - <testSourceDirectory>src/test/java</testSourceDirectory> - <resources> - <resource> - <directory>src</directory> - <filtering>true</filtering> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - </build> - - <dependencies> - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-core</artifactId> - </dependency> - - <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId> - </dependency> --> - - <dependency> - <groupId>com.atech-software</groupId> - <artifactId>atech-tools</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-core</artifactId> - </dependency> - - <dependency> - <groupId>com.ibm.old.comapi</groupId> - <artifactId>ibm-compapi</artifactId> - </dependency> - - <!-- - <dependency> - <groupId>com.neuronrobotics</groupId> - <artifactId>nrjavaserial</artifactId> - </dependency> ---> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> - <groupId>com.neuronrobotics</groupId> - <artifactId>nrjavaserial-j15</artifactId> - </dependency> - - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna-j15</artifactId> - </dependency> - - <dependency> - <groupId>org.hid4java</groupId> - <artifactId>hid4java-j15</artifactId> - </dependency> - - <dependency> - <groupId>org.scream3r</groupId> - <artifactId>jssc</artifactId> - </dependency> - - </dependencies> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> - -</project> Deleted: trunk/ggc-plugin_base/src/GGCPlugin_de.properties =================================================================== --- trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2016-12-25 16:06:50 UTC (rev 1424) +++ trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2016-12-25 16:11:36 UTC (rev 1425) @@ -1,404 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: German ### -# ### Created by: Reinhold Rumberger (ru...@us...)### -# ### Version: 0.6.1 ### -# ### Last change: 20.09.2014 13:39:15 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 245 -# Not translated: 235 (96 %) -# Need to be checked: 1 (0 %) -# -# Translated: 9 (4 %) -# -# -# -## -# Collation Rules - In unicode we can create special rules for sorting where we specify -# sorting order of special characters. This will be used by tree's and special tables. -# For english this is left empty. For all other (that have non-standard, non english -# charcters) we need to set this if we want sorting to be done correctly. -# -COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z - -# -# General [1] -# - -# buttons and general stuff -CANCEL=Abbrechen -OK=OK -HELP=Hilfe -CLOSE=Schlie\u00DFen -APPLY=Anwenden -LOG__=log: -SELECT=Select -ERROR=Error -ADD=Add -EDIT=Edit -DELETE=Delete -NEXT=Next -YES=Yes -NO=No -WARNING=Warning -UNIT_MMOLL=mmol/L -UNIT_MGDL=mg/dL -FALSE=False -TRUE=True -DATE=Date -TIME=Time -GRAPH=Graph -SELECT_ITEM_FIRST=Please select item first. -ARE_YOU_SURE_DELETE=Are you sure you want to delete this item/entry? -QUESTION=Question -INFORMATION=Information -INVALID_DATA=Invalid data -VERSION=Version - -# weeks days and months -SU=Su -MO=Mo -TU=Tu -WE=We -TH=Th -FR=Fr -SA=Sa -DAY=Tag - -SUNDAY=Sontag -MONDAY=Montag -TUESDAY=Dienstag -WEDNESDAY=Mittwoch -THURSDAY=Donnerstag -FRIDAY=Freitag -SATURDAY=Samstag -JANUARY=January -FEBRUARY=February -MARCH=March -APRIL=April -MAY=May -JUNE=June -JULY=July -AUGUST=August -SEPTEMBER=September -OCTOBER=October -NOVEMBER=November -DECEMBER=December - -# -# Configuration [1] -# -MY__=My -DEVICE_COMPANY=Company -DEVICE_DEVICE=Ger\u00E4t -NO_COMPANY_SELECTED=No company selected. -NO_DEVICE_SELECTED=No device selected. -TIMEZONE_CONFIGURATION=TimeZone Configuration -SELECT_ITEM_OR_CANCEL=Select one of items or use Cancel option. -SELECT_MASS_STORAGE_DRIVE=Select Mass Storage Drive -SELECT_SERIAL_PORT=Select Serial Port -SERIAL_PORT=Serial Port -MASS_STORAGE_DRIVE=Mass Storage Drive -NEW__=New -NOT_SET=Not Set ! -TIMEZONE_PREFERENCES=TimeZone Preferences -SELECT_TIMEZONE_LIST=Select correct timezone -NEED_DAYLIGHTSAVING_FIX=Do we need daylight savings fix? -WINTERTIME_FIX=Winter Time Fix -SUMMERTIME_FIX=Summer Time Fix -DEVICE_CONNECTION=Device connection -CUSTOM_NAME=Custom name -COMMUNICATION_SETTINGS=Communication Settings -CONFIG_ERROR_NO_DEVICE_OR_PARAMETERS=<html>Configuration Error:<br>You either didn't select device, or you didn't correctly<br>enter all required parameters.<br></html> -DEVICE_VERSION=Device version - -# -# Ports [1] -# -COMMUNICATION_PORT=Communication Port - -# -# Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions -CONFIGURED_DEVICE=Configured Device -INSTRUCTIONS=Instructions for Download -MY_DEVICE_NAME=My name -DEVICE_ICON=%s picture -DEVICE_NAME_=Device name -CONNECTION_TYPE=Connection -CONNECTION_PARAMETER=C. Parameter -STATUS=Status -DAYLIGHTSAVINGS_FIX=Time (DS) fix -DS_NO=No -DS_FIX_SHORT=Yes (W.=%s / S.=%s) -DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s -DEVICE_DOESNT_SUPPORT_DS_FIX=Not supported by device ! -DEVICE_DOESNT_SUPPORT_DS_FIX_2=Device doesn't support Daylight savings fix -INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your device entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html> -START_DOWNLOAD=Start Download >>> -WAIT_UNTIL_DEVICE_PREINIT=Please wait until device is pre-inited! - -# status -ERROR_IN_CONFIG=Error in config -READY=Ready - -# Download support -DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html> -DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html> -DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html> -DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html> -DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support import of data through files.<br></html> -DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support download of configuration.<br></html> -INTERNAL_CONFIGURATION_ERROR=<html>There seems to be internal problem<br>in configuration of application.<br></html> - -# -# File Selector [1] -# -IMPORT_FILE_SELECTOR=Import File Selector -IMPORT_FILE_SELECTOR_DESC=<html><body>Please select import file of selected type. </body></html> -SELECT_FILE=Select file: -BROWSE=Browse -MULTIPLE_IMPORT_SELECTOR=Multiple Import Selector -MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>This device has several possible import types. Please select correct import type, for import type you have available. </body></html> - -# -# Transfer display [1] -# -ERROR_CONTACTING_DEVICE=We had problem contacting device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n -BREAK_COMMUNICATION=Break Communication -EXPORT_DATA=Export Data -DATA=Data -LOG=Log -DEVICE_INFO=%s Info -ACTION=Action -READING_OLD_DATA=Reading old data (from Db) -STATUS_NONE=Unknown Status -STATUS_READY=Ready -STATUS_DOWNLOADING=Downloading -STATUS_STOPPED_DEVICE=Download stopped (by device) -STATUS_STOPPED_USER=Download stopped by user -STATUS_DOWNLOAD_FINISHED=Download finished -STATUS_READER_ERROR=Internal %s (or port) error -UNKNOWN=Unknown -NEW=New -CHANGED=Changed -OLD=Old -LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log is currently not available. -READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s] -SW_VERSION=SW Version -HW_VERSION=HW Version -SELECT_ALL=Select All -DESELECT_ALL=Deselect All -FILTER=Filter -FILTER_ALL=All -FILTER_NEW=New -FILTER_CHANGED=Changed -FILTER_EXISTING=Old -FILTER_UNKNOWN=Unknown -FILTER_NEW_CHANGED=New + Changed -FILTER_ALL_BUT_EXISTING=All except old - -# -# Export [1] -# -EXPORT_OUTPUT=Output for export -EXPORT_DEVICE_DATA=Export %s Data -GGC_APPLICATION=GGC Application -EXPORT_PROGRESS=Progress of export -START=Start -EXPORT_STATUS_READY=Ready -EXPORT_STATUS_EXPORTING=Exporting -EXPORT_STATUS_FINISHED=Finished - -# -# List [1] -# -LEGEND_DESC=<html><b>Legend:</b><br><font color="green">Green</font> = All known devices supported<br><font color="#33FFFF">Cyan</font> = Testing<br><font color="#660066">Magenta</font> = some devices implemented<br><font color="blue">Blue</font> = work in progress<br><font color="#FFCC33">Orange</font> = Planned<br><font color="red">Red</font> = Not Planned</html> - -# -# About [1] -# -SYSTEM_PROPERTIES=System Properties -ABOUT=About -PROPERTY=Property -VALUE=Value -LICENCE=Licence -CREDITS=Credits -LIBRARIES=Libraries -GGC_DEVELOPMENT_TEAM=GGC Development Team -SEE_CREDITS=(See Credits) -DEVELOPERS_DESC=Developers & features they implemented -HELPERS_DESC=People that helped (testing, lending or donating hardware,...) -FEATURES=Features -IMPLEMENTED_FEATURES=Implemented Features -SUPPORTED_DEVICES=Supported Devices -NOT_IMPLEMENTED_FEATURES=Not Implemented Features -PLANNED_DEVICES=Planned Devices -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - -# -# Printing - Base [2] -# -PRINTING=Printing -TYPE_OF_REPORT=Type Of Report -SELECT_YEAR_AND_MONTH=Select Year And Month -REPORT_FOOTER=Dieser Bericht wurde von "GGC - GNU Gluco Control" erstellt, frei verf\u00FCgbar unter http://ggc.sourceforge.net -FOR=f\u00FCr -PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html> -PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html> -PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html> -SELECT_STARTING_RANGE=Select starting range -SELECT_ENDING_RANGE=Select ending range -PAGE=Seite - -# -# Device Interfaces [1] -# -SERIAL_PORTS=Serielle Schnittstellen: COM2,... -MASS_STORAGE=Mass Storage: G:,... - -# -# Used protocols [1] -# -DEVICE_PROTOCOL=Protocol -PROT_NONE=None (dummy or N/A) -PROT_SERIAL_BRIDGE=Serial (or USB bridge) -PROT_MASS_STORAGE_XML=Mass Storage (Xml) -PROT_BLUE_TOOTH=BlueTooth -PROT_BLUETOOTH_SERIAL=Bluetooth (Serial) -PROT_SERIAL_USB=Serial (USB) -PROT_FILE_IMPORT=File import -PROT_DATABASE=Database - -# -# Libraries [1] -# -NO_BINARY_PART_FOUND=Device uses special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n<GGC_Install>\lib\native\%s\nand look for file: '%s'.\nIf it's not there you must obtain it,\nif it is there, then there is something\nwrong with it (re-obtain it).\n - -# -# Special Comments [1] -# -DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated. -DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device. - -# -# Error Dialog [1] -# -ERROR_DIALOG=Error Dialog -DETAILS=Details -ERROR_SOLUTION=Solution -EXCEPTION_LOG=Exception (Stack) Trace -SEND_TO_SERVER=Send to Server -SENDING_TO_SERVER=Sending to Server -SEND_TO_SERVER_TEXT=<html>This part is not implemented yet. But at later time when<br>this works, you will able to send us report of error<br>and receive solution (if it exists).<br></html> -NO_SOLUTION_AVAILABLE=No solution available. -ERROR_COUNT=Errors (%s) - -# -# Download Device [2] -# -DOWNLOAD_DEVICE=Data from device -DOWNLOAD_FILE=Import from file -DOWNLOAD_CONFIG=Config from device -DOWNLOAD_NOT_SUPPORTED_GGC=Not supported by GGC -DOWNLOAD_NOT_SUPPORTED_BY_DEVICE=Not supported by device - -# -# File Import [2] -# -IMPORT_FILE=Import file - -# -# Devices [1] -# - -# Smart pix -PIX_ABORT_AUTOSCAN=Autoscan aborted -PIX_DETECT_DEVICES=Detecting devices -PIX_UNRECOVERABLE_ERROR=Unrecoverable error -PIX_READING_ELEMENT=Reading elements from device -PIX_FINISHED_REPORT_READY=Finished reading. Report ready. -PIX_FINISHED_READING=Finished reading. Report ready. -PIX_READING=Reading data -PIX_SCANNING=Scanning for device -PIX_CREATING_REPORT=Creating report -PIX_DEVICE_NOT_FOUND=Device not found -PIX_ERROR_INIT_DEVICE=Error on init/read device -SMARTPIX_VERSION_2=SmartPix v2.x -SMARTPIX_VERSION_3=SmartPix v3.x or higher -SMARTPIX_VERSION_INFO=<html><b>Smart Pix Version Info<br><br></b><b><i>SmartPix v1.x</i></b> - Devices with this firmware are not supported, because<br> they had too many bugs (for external use). If your device still has v1<br>firmware you can update it for free (see Roche site).<br><b><i>SmartPix v2.x</i></b> - Version 2 works ok on Windows, but there is problem<br>on other OSes (we tested on linux and Mac and it didn't work on any<br>of them)<br><b><i>SmartPix v3.x</i></b> - This version uses different type of commands for<br>controling devices, which works great on all OSes, so this is preffered<br>version to use.<br></html> - -# Minimed Pump/CGMS -MM_DEVICE_INIT_PROBLEM=%s problem on initialization with %s:\n%s\n -MM_INVALID_RETURN_VALUE=Invalid return value (%s), return value should be between %s and %s. -MM_WRONG_STATE=Device is in wrong state for successful reading (current state=%s, required state=%s). -MM_DEVICE_PUMP=Pump -MM_DEVICE_CGMS=CGMS -MM_PUMP_ERROR_REPLY=Error Reply -MM_PUMP_STATE_REPLY=State Reply -MM_ERROR_READING_DEVICE=Error on reading device. -MM_SET_RF_POWER_ON=Set RF Power On -MM_READ_PUMP_ERROR_STATUS=Read Pump Error Status (current alarm code) -MM_READ_PUMP_STATE=Read Pump State -MM_READ_TEMPORARY_BASAL=Read Temporary Basal -MM_DETECT_BOLUS=Detect bolus (set temp basal rate) -MM_ACKNOWLEDGE=Acknowledge -MM_CANCEL_SUSPEND=Cancel Suspend -MM_KEYPAD_PUSH_ACK=Keypad Push (ACK) -MM_KEYPAD_PUSH_ESC=Keypad Push (ESC) -MM_READ_FIRMWARE_VERSION=Read Firmware Version -MM_PUMP_DELIVERY_TBR=Check TBR delivery -MM_PUMP_DELIVERING_TBR=Pump is currently delivering TBR and cannot communicate with computer. - -# -# Graphs [1] -# - -# Date/range selector -DATE_RANGE_SELECTOR=Range Selector -ONE_WEEK=1 Week -TWO_WEEKS=2 Weeks -1_MONTH=1 Month -3_MONTHS=3 Months -CUSTOM=Custom -RANGE=Range - - -# -# Device Events (2) -# -EVENT_TYPE=Event Type -EVENT_POWER_DOWN=Power Down -EVENT_POWER_UP=Power Up -EVENT_DATETIME_SET=Datum/Zeit gestellt -EVENT_DATETIME_CORRECT=Datum/Zeit korrigiert -EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back -EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward -EVENT_DATETIME_CHANGED=Date/Time Changed -EVENT_BATTERY_REMOVED=Batterie entfernt -EVENT_BATTERY_REPLACED=Batterie gewechselt -EVENT_BATTERY_LOW=Batterie fast leer -EVENT_BATTERY_LOW_DESC=Batterie fast leer (%s) - - -# -# Device Errors [2] -# -ERROR_TYPE=Fehlertyp -ERROR_UNKNOWN_ERROR=Unbekannter Fehler -ERROR_BATTERY_DEPLETED=Batterie leer -ERROR_AUTOMATIC_OFF=Automatic Off -ERROR_END_OF_OPERATION=End Of Operation -ERROR_MECHANICAL_ERROR=Mechanischer Fehler -ERROR_ELECTRONIC_ERROR=Elektronischer Fehler -ERROR_POWER_INTERRUPT=Stromzufuhr unterbrochen -ERROR_DATA_INTERRUPTED=Data Interrupted -ERROR_LANGUAGE_ERROR=Sprachfehler Deleted: trunk/ggc-plugin_base/src/GGCPlugin_en.properties =================================================================== --- trunk/ggc-plugin_base/src/GGCPlugin_en.properties 2016-12-25 16:06:50 UTC (rev 1424) +++ trunk/ggc-plugin_base/src/GGCPlugin_en.properties 2016-12-25 16:11:36 UTC (rev 1425) @@ -1,584 +0,0 @@ -# -# !MASTER_FILE! -# !S! MODULE=GGC Plugin Base -# !S! MODULE_VERSION=0.6.1 -# -# ###################################################################### -# ### GGC PlugIn Base ### -# ###################################################################### -# ### Language: English ### -# ### Created by: Andy Rozman (an...@at...) ### -# ### Last change: 13th October 2015 ### -# ### Library Version: 1.0.2 ### -# ### Application Version: 0.6.2 ### -# ###################################################################### -# -# Please use this file as default language file. Do not try to translate -# from any other files, since this is the Master language file. Create the -# same header and specify application version number for easier changes at -# later time. -# Translations should be grouped by groups as specified here. -# Older groups are done by packages, newer by logical name. - -# -# In brackets there are now tags which define urgency of some text beeing translated -# !S! GROUP_PRIORITY_1=Needed, urgent (Base functionality, options which will be used by user mostly) -# !S! GROUP_PRIORITY_2=Needed -# !S! GROUP_PRIORITY_3=Not used yet (in public releases) -# !S! GROUP_PRIORITY_4=In implementation -# -# * - If tags also has *, then it means that this string can change regulary, last update is in [] -# - - - -# -# !G! General [1] -# - -# !SG! buttons and general stuff -CANCEL=Cancel -OK=OK -HELP=Help -CLOSE=Close -APPLY=Apply -LOG__=log: -SELECT=Select -ERROR=Error -ADD=Add -EDIT=Edit -DELETE=Delete -NEXT=Next -YES=Yes -NO=No -WARNING=Warning -UNIT_MMOLL=mmol/L -UNIT_MGDL=mg/dL -FALSE=False -TRUE=True -DATE=Date -TIME=Time -GRAPH=Graph -SELECT_ITEM_FIRST=Please select item first. -ARE_YOU_SURE_DELETE=Are you sure you want to delete this item/entry? -QUESTION=Question -INFORMATION=Information -INVALID_DATA=Invalid data -VERSION=Version - -# !SG! weeks days and months -DAY=Day -SU=Su -MO=Mo -TU=Tu -WE=We -TH=Th -FR=Fr -SA=Sa - -SUNDAY=Sunday -MONDAY=Monday -TUESDAY=Tuesday -WEDNESDAY=Wednesday -THURSDAY=Thursday -FRIDAY=Friday -SATURDAY=Saturday - -JANUARY=January -FEBRUARY=February -MARCH=March -APRIL=April -MAY=May -JUNE=June -JULY=July -AUGUST=August -SEPTEMBER=September -OCTOBER=October -NOVEMBER=November -DECEMBER=December - - -# -# !G! Configuration [1] -# -MY__=My -DEVICE_COMPANY=Company -DEVICE_DEVICE=Device -NO_COMPANY_SELECTED=No company selected. -NO_DEVICE_SELECTED=No device selected. -TIMEZONE_CONFIGURATION=TimeZone Configuration -SELECT_ITEM_OR_CANCEL=Select one of items or use Cancel option. -SELECT_MASS_STORAGE_DRIVE=Select Mass Storage Drive -SELECT_SERIAL_PORT=Select Serial Port -SELECT_USB_DEVICE=Select USB Device -SERIAL_PORT=Serial Port -USB_DEVICE=USB Device -MASS_STORAGE_DRIVE=Mass Storage Drive -NEW__=New -NOT_SET=Not Set ! -TIMEZONE_PREFERENCES=TimeZone Preferences -SELECT_TIMEZONE_LIST=Select correct timezone -NEED_DAYLIGHTSAVING_FIX=Do we need daylight savings fix? -WINTERTIME_FIX=Winter Time Fix -SUMMERTIME_FIX=Summer Time Fix -DEVICE_CONNECTION=Device connection -CUSTOM_NAME=Custom name -COMMUNICATION_SETTINGS=Communication Settings -CONFIG_ERROR_NO_DEVICE_OR_PARAMETERS=<html>Configuration Error:<br>You either didn't select device, or you didn't correctly<br>enter all required parameters.<br></html> -DEVICE_VERSION=Device version - -# -# !G! Ports [1] -# -COMMUNICATION_PORT=Communication Port - - -# -# !G! Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions -CONFIGURED_DEVICE=Configured Device -INSTRUCTIONS=Instructions for Download -MY_DEVICE_NAME=My name -DEVICE_ICON=%s picture -DEVICE_NAME_=Device name -CONNECTION_TYPE=Connection -CONNECTION_PARAMETER=C. Parameter -STATUS=Status -DAYLIGHTSAVINGS_FIX=Time (DS) fix -DS_NO=No -DS_FIX_SHORT=Yes (W.=%s / S.=%s) -DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s -DEVICE_DOESNT_SUPPORT_DS_FIX=Not supported by device ! -DEVICE_DOESNT_SUPPORT_DS_FIX_2=Device doesn't support Daylight savings fix -INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your device entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html> -START_DOWNLOAD=Start Download >>> -WAIT_UNTIL_DEVICE_PREINIT=Please wait until device is pre-inited! - -# !SG! status -ERROR_IN_CONFIG=Error in config -READY=Ready - -# !SG! Download support -DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html> -DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html> -DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html> -DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html> -DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support import of data through files.<br></html> -DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support download of configuration.<br></html> -INTERNAL_CONFIGURATION_ERROR=<html>There seems to be internal problem<br>in configuration of application.<br></html> - - -# -# !G! File Selector [1] -# -IMPORT_FILE_SELECTOR=Import File Selector -IMPORT_FILE_SELECTOR_DESC=<html><body>Please select import file of selected type. </body></html> -SELECT_FILE=Select file: -BROWSE=Browse -MULTIPLE_IMPORT_SELECTOR=Multiple Import Selector -MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>This device has several possible import types. Please select correct import type, for import type you have available. </body></html> - -# -# !G! Transfer display [1] -# -ERROR_CONTACTING_DEVICE=We had problem contacting device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n -BREAK_COMMUNICATION=Break Communication -EXPORT_DATA=Export Data -DATA=Data -LOG=Log -DEVICE_INFO=%s Info -ACTION=Action -READING_OLD_DATA=Reading old data (from Db) -STATUS_NONE=Unknown Status -STATUS_READY=Ready -STATUS_DOWNLOADING=Downloading -STATUS_STOPPED_DEVICE=Download stopped (by device) -STATUS_STOPPED_USER=Download stopped by user -STATUS_DOWNLOAD_FINISHED=Download finished -STATUS_READER_ERROR=Internal %s (or port) error - -UNKNOWN=Unknown -NEW=New -CHANGED=Changed -OLD=Old - -LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log is currently not available. -READ_DEVICE_DATA_TITLE=Read %s Data [%s on %s] -SW_VERSION=SW Version -HW_VERSION=HW Version -SELECT_ALL=Select All -DESELECT_ALL=Deselect All -FILTER=Filter -FILTER_ALL=All -FILTER_NEW=New -FILTER_CHANGED=Changed -FILTER_EXISTING=Old -FILTER_UNKNOWN=Unknown -FILTER_NEW_CHANGED=New + Changed -FILTER_ALL_BUT_EXISTING=All except old - - -# -# !G! Export [1] -# -EXPORT_OUTPUT=Output for export -EXPORT_DEVICE_DATA=Export %s Data -GGC_APPLICATION=GGC Application -EXPORT_PROGRESS=Progress of export -START=Start -EXPORT_STATUS_READY=Ready -EXPORT_STATUS_EXPORTING=Exporting -EXPORT_STATUS_FINISHED=Finished - - - -# -# !G! List [1] -# -LEGEND_DESC=<html><b>Legend:</b><br><font color="green">Green</font> = All known devices supported<br><font color="#33FFFF">Cyan</font> = Testing<br><font color="#660066">Magenta</font> = some devices implemented<br><font color="blue">Blue</font> = work in progress<br><font color="#FFCC33">Orange</font> = Planned<br><font color="red">Red</font> = Not Planned</html> - - -# -# !G! About [1] -# -SYSTEM_PROPERTIES=System Properties -ABOUT=About -PROPERTY=Property -VALUE=Value -LICENCE=Licence -CREDITS=Credits -LIBRARIES=Libraries -GGC_DEVELOPMENT_TEAM=GGC Development Team -SEE_CREDITS=(See Credits) -DEVELOPERS_DESC=Developers & features they implemented -HELPERS_DESC=People that helped (testing, lending or donating hardware,...) -FEATURES=Features -IMPLEMENTED_FEATURES=Implemented Features -SUPPORTED_DEVICES=Supported Devices -NOT_IMPLEMENTED_FEATURES=Not Implemented Features -PLANNED_DEVICES=Planned Devices -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - - -# -# !G! Printing - Base [2] -# -PRINTING=Printing -TYPE_OF_REPORT=Type Of Report -SELECT_YEAR_AND_MONTH=Select Year And Month -REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net -FOR=For -PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html> -PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html> -PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html> -SELECT_STARTING_RANGE=Select starting range -SELECT_ENDING_RANGE=Select ending range -PAGE=Page - -# -# !G! Device Interfaces [1] -# -SERIAL_PORTS=Serial Ports: COM2,... -MASS_STORAGE=Mass Storage: G:,... -CGMS_DEVICE_SHORT=CGMS - - -# -# !G! Used protocols [1] -# -DEVICE_PROTOCOL=Protocol -PROT_NONE=None (dummy or N/A) -PROT_SERIAL_BRIDGE=Serial (or USB bridge) -PROT_MASS_STORAGE_XML=Mass Storage (Xml) -PROT_BLUE_TOOTH=BlueTooth -PROT_BLUETOOTH_SERIAL=Bluetooth (Serial) -PROT_SERIAL_USB=Serial (USB) -PROT_USB_HID=USB (Hid) -PROT_FILE_IMPORT=File import -PROT_DATABASE=Database -PROT_MULTIPLE=Multiple - - -# -# !G! Libraries [1] -# -NO_BINARY_PART_FOUND=Device uses special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n<GGC_Install>\\lib\\native\\%s\nand look for file: '%s'.\nIf it's not there you must obtain it,\nif it is there, then there is something\nwrong with it (re-obtain it).\n - - -# -# !G! Special Comments [1] -# -DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated. -DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device. - - -# -# !G! Error Dialog [1] -# -ERROR_DIALOG=Error Dialog -DETAILS=Details -ERROR_SOLUTION=Solution -EXCEPTION_LOG=Exception (Stack) Trace -SEND_TO_SERVER=Send to Server -SENDING_TO_SERVER=Sending to Server -SEND_TO_SERVER_TEXT=<html>This part is not implemented yet. But at later time when<br>this works, you will able to send us report of error<br>and receive solution (if it exists).<br></html> -NO_SOLUTION_AVAILABLE=No solution available. -ERROR_COUNT=Errors (%s) - - -# -# !G! Download Device [2] -# -DOWNLOAD_DATA=Data from device -DOWNLOAD_DATA_FILE=Data from file -DOWNLOAD_CONFIG=Config from device -DOWNLOAD_CONFIG_FILE=Config from file -DOWNLOAD_DATA_SHORT=Data -DOWNLOAD_DATA_FILE_SHORT=Data (file) -DOWNLOAD_CONFIG_SHORT=Config -DOWNLOAD_CONFIG_FILE_SHORT=Config (file) -DOWNLOAD_NOT_SUPPORTED_GGC=Not supported by GGC -DOWNLOAD_NOT_SUPPORTED_GGC_SHORT=No GGC support -DOWNLOAD_NOT_SUPPORTED_GGC_YET=Not supported by GGC yet -DOWNLOAD_NOT_SUPPORTED_GGC_YET_SHORT=No GGC support yet -DOWNLOAD_NOT_SUPPORTED_BY_DEVICE=Not supported by device -DOWNLOAD_NOT_SUPPORTED_BY_DEVICE_SHORT= - - - - - -# -# !G! File Import [2] -# -IMPORT_FILE=Import file - - -# -# !G! Devices [1] -# - -# !SG! Smart pix -PIX_ABORT_AUTOSCAN=Autoscan aborted -PIX_DETECT_DEVICES=Detecting devices -PIX_UNRECOVERABLE_ERROR=Unrecoverable error -PIX_READING_ELEMENT=Reading elements from device -PIX_FINISHED_REPORT_READY=Finished reading. Report ready. -PIX_FINISHED_READING=Finished reading. Report ready. -PIX_READING=Reading data -PIX_SCANNING=Scanning for device -PIX_CREATING_REPORT=Creating report -PIX_DEVICE_NOT_FOUND=Device not found -PIX_ERROR_INIT_DEVICE=Error on init/read device -SMARTPIX_VERSION_2=SmartPix v2.x -SMARTPIX_VERSION_3=SmartPix v3.x or higher -SMARTPIX_VERSION_INFO=<html><b>Smart Pix Version Info<br><br></b><b><i>SmartPix v1.x</i></b> - Devices with this firmware are not supported, because<br> they had too many bugs (for external use). If your device still has v1<br>firmware you can update it for free (see Roche site).<br><b><i>SmartPix v2.x</i></b> - Version 2 works ok on Windows, but there is problem<br>on other OSes (we tested on linux and Mac and it didn't work on any<br>of them)<br><b><i>SmartPix v3.x</i></b> - This version uses different type of commands for<br>controling devices, which works great on all OSes, so this is preffered<br>version to use.<br></html> - - -# !SG! Ascensia -PRODUCT_CODE=Product Code -SOFTWARE_VERSION=Software Version -EEPROM_VERSION=EEprom Version -SERIAL_NUMBER=Serial Number -USER_MARKS=User Marks -MARKERS=Markers -MARKER_HI=High BG - - -# !SG! Minimed -MM_CONN_INTERFACE=Conn. interface -MM_SERIAL_NR=Serial # - - - -# -# !G! Graphs [1] -# - -# !SG! Date/range selector -DATE_RANGE_SELECTOR=Range Selector -ONE_WEEK=1 Week -TWO_WEEKS=2 Weeks -1_MONTH=1 Month -3_MONTHS=3 Months -CUSTOM=Custom -RANGE=Range - - -# -# !G! Device Events [2] -# -EVENT_TYPE=Event Type -EVENT_POWER_DOWN=Power Down -EVENT_UNKNOWN=Event Unknown -EVENT_POWER_UP=Power Up -EVENT_DATETIME_SET=Date/Time Set -EVENT_DATE_SET=Date Set -EVENT_TIME_SET=Time Set -EVENT_DATETIME_CORRECT=Date/Time Corrected -EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back -EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward -EVENT_DATETIME_CHANGED=Date/Time Changed -EVENT_SELF_TEST=Device Self-test -EVENT_DOWNLOAD=Device Data Download -EVENT_BATTERY_REMOVED=Battery removed -EVENT_BATTERY_REPLACED=Battery replaced -EVENT_BATTERY_LOW=Battery low -EVENT_BATTERY_LOW_DESC=Battery low (%s) - - -# -# !G! Device Errors [2] -# -ERROR_TYPE=Error Type -ERROR_UNKNOWN_ERROR=Unknown Error -ERROR_BATTERY_DEPLETED=Battery Depleted -ERROR_AUTOMATIC_OFF=Automatic Off -ERROR_END_OF_OPERATION=End Of Operation -ERROR_MECHANICAL_ERROR=Mechanical Error -ERROR_ELECTRONIC_ERROR=Electronic Error -ERROR_POWER_INTERRUPT=Power Interrupt -ERROR_DATA_INTERRUPTED=Data Interrupted -ERROR_LANGUAGE_ERROR=Language Error - - -# -# !G! Device Alarms [2] -# -ALARM_UNKNOWN=Unknown Alarm -ALARM_TYPE=Alarm Type -ALARM_BATTERY_LOW=Battery Low -ALARM_REVIEW_DATETIME=Review Date/Time -ALARM_ALARM_CLOCK=Alarm Clock -ALARM_REPLACE_BATTERY=Replace Battery -ALARM_EMPTY_CARTRIDGE=Empty Cartridge -ALARM_AUTO_OFF=Auto Off -ALARM_CALL_SERVICE=Call Service -ALARM_AUTO_OFF_SOON=Auto Off in %s -ALARM_CLOCK_RESET=Clock reset - - -# -# !G! Instructions [1] -# -INSTRUCTIONS_ANIMAS_V2=<html><li>Attach Animas USB interface</li><li>Click on "Start Download"</li><li>Put Pump in Suspend state</li><li>Last side of Pump needs to face USB interface</li><li>Pump Screen needs to be active. If Screen<br>goes dark, communication will not start, so if<br> it is dark, press any button so that screen<br>is active.</li></html> - -INSTRUCTIONS_MINIMED=<html><li>Attach Carelink USB device (or Contour Next Link).<br>Be careful you might have problems on some<br>systems with CareLink USB (you might need to<br>attach/detach it several times)</li><li>Place your pump in front of device (transmiter<br>is on same side as cannula)</li><li>Click on "Start Download"</li><br><br><b><i>Contour Next Link is not yet supported.</i></b></html> - -# -# !G! Device Configuration (only base, other is Device Specific) [2] -# - -# !SG! Configuration Group -GROUP_GENERAL=General Settings -GROUP_DEVICE=Device Settings -GROUP_SOUND=Sound Settings -GROUP_OTHER=Other Settings - -# -# !SG! Base Stuff -# -CFG_BASE_API_VERSION=Api Version -CFG_BASE_PRODUCT_ID=Product Id -CFG_BASE_PRODUCT_NAME=Product Name -CFG_BASE_SOFTWARE_NUMBER=Software Number -CFG_BASE_FIRMWARE_VERSION=Firmware Version -CFG_BASE_PORT_VERSION=Port Version -CFG_BASE_RF_VERSION=RF Version -CFG_BASE_SERIAL_NUMBER=Serial Number -CFG_BASE_SYSTEM_TIME=System Time -CFG_BASE_DISPLAY_TIME=Display Time -CFG_BASE_LANGUAGE=Language -CFG_BASE_BATTERY_STATUS=Battery Status -LANGUAGE_ENGLISH=English -LANGUAGE_CZECH=Czech -LANGUAGE_DANISH=Danish -LANGUAGE_DUTCH=Dutch -LANGUAGE_FINNISH=Finnish -LANGUAGE_FRENCH=French -LANGUAGE_FRENCH_CANADA=French (Canada) -LANGUAGE_GERMAN=German -LANGUAGE_HUNGARIAN=Hungarian -LANGUAGE_ITALIAN=Italian -LANGUAGE_NORVEGIAN=Norvegian -LANGUAGE_POLISH=Polish -LANGUAGE_PORTUGESE=Portugese -LANGUAGE_PORTUGESE_BRAZIL=Portugese (Brazil) -LANGUAGE_SLOVENE=Slovene -LANGUAGE_SPANISH=Spanish -LANGUAGE_SWEDISH=Swedish -LANGUAGE_TURKISH=Turkish -LANGUAGE_UNKNOWN=Unknown language [id=%s] -CFG_BASE_GLUCOSE_UNIT=Glucose Unit -GLUCOSE_UNIT_MGDL=mg/dL -GLUCOSE_UNIT_MMOLL=mmol/L -CFG_BASE_CLOCK_MODE=Clock Mode -CLOCK_MODE_12H=12h -CLOCK_MODE_24H=24h -CFG_BASE_NONE=None -DEVICE_NOT_FOUND_ON_CONFIGURED_PORT=Device Not Found On Configured Port or Port not found (%s) -DEVICE_PORT_IN_USE=Selected port (%s) is in use and can't be claimed. -CFG_SOUND_VOLUME_NA=Not Available -CFG_SOUND_VOLUME_VIBRATE=Vibrate -CFG_SOUND_VOLUME_LOW=Low -CFG_SOUND_VOLUME_MEDIUM=Medium -CFG_SOUND_VOLUME_HIGH=High -CFG_SOUND_VOLUME_UNKNOWN=Unknown -CFG_SOUND_VOLUME_DISABLED=Disabled -CFG_SOUND_VOLUME_ENABLED=Enabled -CFG_SOUND_VOLUME_FOR=Sound volume - - -CFG_BASE_FROM=From -CFG_BASE_AMOUNT=Amount -CFG_BASE_DELTA=Delta -CFG_BASE_NAME=Name -CFG_BASE_SLOT=Slot - - - - -# !SG! Minimed Pump/CGMS - -CFG_MM_RF_ENABLED=RF Enabled -CFG_MM_BLOCK_ENABLED=Settings Block Enabled -CFG_MM_VOLTAGE_NORMAL_1_5_V=Normal 1.5 V -CFG_BASE_VOLTAGE=Voltage -CFG_BASE_BATTERY_STATUS_LOW=Low -CFG_BASE_BATTERY_STATUS_NORMAL=Normal -CFG_BASE_BATTERY_STATUS_OFF=Off -CFG_BASE_BATTERY_STATUS_UNKNOWN=Unknown (%d) -CFG_BASE_INVALID_VALUE=Invalid value: %s -CFG_BASE_CARBOHYDRATE_UNIT=Carbohydrate Unit -CFG_BASE_CARBOHYDRATE_UNIT_GRAMS=grams -CFG_BASE_CARBOHYDRATE_UNIT_EXCH=exchange - -CFG_BASE_CARBOHYDRATE_UNIT_GRAMS_SHORT=g -CFG_BASE_CARBOHYDRATE_UNIT_EXCH_SHORT=exch - -CFG_BASE_UNIT_UNIT_SHORT=U -CFG_PARADIGM_LINK_ENABLE=Paradigm Link Enabled -CFG_MM_KEYPAD_LOCKED=Keypad Locked - -PCFG_REMAINING_INSULIN=Remaining insulin -PCFG_ALARM_CLOCK=Alarm Clock - - - - -# OLD - - -MM_DEVICE_INIT_PROBLEM=%s problem on initialization with %s:\n%s\n -MM_INVALID_RETURN_VALUE=Invalid return value (%s), return value should be between %s and %s. -MM_WRONG_STATE=Device is in wrong state for successful reading (current state=%s, required state=%s). -MM_DEVICE_PUMP=Pump -MM_DEVICE_CGMS=CGMS -MM_PUMP_ERROR_REPLY=Error Reply -MM_PUMP_STATE_REPLY=State Reply -MM_ERROR_READING_DEVICE=Error on reading device. -MM_SET_RF_POWER_ON=Set RF Power On - -MM_PUMP_DELIVERY_TBR=Check TBR delivery -MM_PUMP_DELIVERING_TBR=Pump is currently delivering TBR and cannot communicate with computer. \ No newline at end of file Deleted: trunk/ggc-plugin_base/src/GGCPlugin_fr.properties =================================================================== --- trunk/ggc-plugin_base/src/GGCPlugin_fr.properties 2016-12-25 16:06:50 UTC (rev 1424) +++ trunk/ggc-plugin_base/src/GGCPlugin_fr.properties 2016-12-25 16:11:36 UTC (rev 1425) @@ -1,351 +0,0 @@ -# -# ###################################################################### -# ### GGC PlugIn Base ### -# ###################################################################### -# ### Language: French ### -# ### Created by: F.A. ### -# ### Last change: 16th April 2010 ### -# ### Library Version: 0.4.5 ### -# ### Application Version: 0.4.17 ### -# ###################################################################### -# - -# -COLLATION_RULES = < a,A,\u00e0,\u00c0,\u00e2,\u00c2 < b,B < c,C,\u00e7,\u00c7 < d,D <e,E,\u00e9,\u00c9,\u00e8,\u00c8,\u00ea,\u00ca,\u00eb,\u00cb < f,F < g,G < h,H < i,I,\u00ef,\u00cf < j,J < k,K < l,L < m,M < n,N < o,O,\u00f4,\u00d4 < p,P < q,Q < r,R < s,S < t,T < u,U,\u00fb,\u00db,\u00f9,\u00d9,\u00fc,\u00dc < v,V < w,W < x,X < y,Y < z,Z - - -# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# -# COMMENT: Need to be fixed prior to use. Some of this translations might be done in Core. We created this file from Meter -# and Core. Translators need to fix this prior to first use on Translation Tool. -# Andy -# -# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - - - - - - -# -# !G! General (1) -# - -# buttons -CANCEL=Annuler -OK=OK -HELP=Aide -CLOSE=Fermer -APPLY=Appliquer -LOG__=log: -SELECT=S\u00E9lectionner -ERROR=Erreur -ADD=Ajouter -EDIT=\u00C9diter -DELETE=Supprimer -NEXT=Suivant -YES=Oui -NO=Non -WARNING=Attention - -UNIT_MMOLL=mmol/L -UNIT_MGDL=mg/dL -FALSE=Faux -TRUE=Vrai - - -DATE=Date -TIME=Heure -GRAPH=Graph - - -# weeks days and months -SU=Di -MO=Lu -TU=Ma -WE=Me -TH=Je -FR=Ve -SA=Sa -JANUARY=Janvier -FEBRUARY=F\u00E9vrier -MARCH=Mars -APRIL=Avril -MAY=Mai -JUNE=Juin -JULY=Juillet -AUGUST=Ao\u00FBt -SEPTEMBER=Septembre -OCTOBER=Octobre -NOVEMBER=Novembre -DECEMBER=D\u00E9cembre - -SELECT_ITEM_FIRST=Commencez par s\u00E9lectionner un \u00E9l\u00E9ment SVP -ARE_YOU_SURE_DELETE=\u00CAtes vous s\u00FBr de vouloir supprimer cet \u00E9l\u00E9ment/saisie ? -QUESTION=Question - - -# -# Configuration (1) -# -MY__=Mon -DEVICE_COMPANY=Compagnie -DEVICE_DEVICE=Dispositif -NO_COMPANY_SELECTED=Aucune compagnie s\u00E9lectionn\u00E9e. -NO_DEVICE_SELECTED=Aucun dispositif s\u00E9lectinn\u00E9. -TIMEZONE_CONFIGURATION=Configuration Fuseau Horaire -SELECT_ITEM_OR_CANCEL=S\u00E9l\u00E9ctionnez un \u00E9l\u00E9ment ou Annulez -SELECT_MASS_STORAGE_DRIVE=S\u00E9lectionner le dispositif d'enregistrement -SELECT_SERIAL_PORT=S\u00E9lectionner le Port S\u00E9rie -SERIAL_PORT=Serial Port -MASS_STORAGE_DRIVE=Dispositif d'enregistrement -NEW__=Nouveau -NOT_SET=Non d\u00E9fini! -TIMEZONE_PREFERENCES=Pr\u00E9ferences Fuseau Horaire -SELECT_TIMEZONE_LIST=S\u00E9lectionnez le bon Fuseau Horaire -NEED_DAYLIGHTSAVING_FIX=La correction de l'enregistrement heure d'\u00E9t\u00E9 est-elle n\u00E9cessaire? -WINTERTIME_FIX=Correction Heure d'hiver -SUMMERTIME_FIX=Correction Heure d'\u00E9t\u00E9 -DEVICE_CONNECTION=Connexion du dispositif - -# -# Ports -# -COMMUNICATION_PORT=Port de Communication - - -# -# Instructions Dialog (1) -# -OOPS_DEVICE_NOT_CONFIGURED=Oops ! Vous avez oubli\u00E9 de configurer votre lecteur %s\n et actuellement aucun %s n'est configur\u00E9\net/ou s\u00E9lectionn\u00E9. Veuillez v\u00E9rifier\net la configuration de votre %s. -CONFIGURED_DEVICE_INSTRUCTIONS=Instructions du %s configur\u00E9 -CONFIGURED_DEVICE=Configured Device -INSTRUCTIONS=Instructions for Download -MY_DEVICE_NAME=My device name -DEVICE_ICON=Image du %s -DEVICE_NAME_=Device name -CONNECTION_TYPE=Connection -CONNECTION_PARAMETER=C. Parameter -STATUS=Status -DAYLIGHTSAVINGS_FIX=Time (DS) fix -DS_NO=No -DS_FIX_SHORT=Yes (W.=%s / S.=%s) -DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s -DEVICE_DOESNT_SUPPORT_DS_FIX=Device doesn't support Daylight savings fix ! -DEVICE_DOESNT_SUPPORT_DS_FIX_2=Device doesn't support Daylight savings fix -INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your device entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html> -START_DOWNLOAD=Start Download >>> -WAIT_UNTIL_OLD_DATA_IS_READ=Please wait until old (existing) data is read! - -# status -ERROR_IN_CONFIG=Error in config -READY=Ready - -DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html> -DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html> -DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html> -DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html> -DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support import of data through files.<br></html> -DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support download of configuration.<br></html> -INTERNAL_CONFIGURATION_ERROR=<html>There seems to be internal problem<br>in configuration of application.<br></html> - - - -# -# Transfer display (1) -# -ERROR_CONTACTING_DEVICE=Nous ne parvenons pas \u00E0 contacter le lecteur glyc\u00E9mique.\nVeuillez v\u00E9rifier le r\u00E9glage du port de communication\n(certains c\u00E2bles modifient leur adresse\nen se connectant). Renouvelez la configuration\net le probl\u00E8me devrait \u00EAtre r\u00E9solu !\n -BREAK_COMMUNICATION=Interrompre la Communication -EXPORT_DATA=Exporter les Donn\u00E9es -DATA=Donn\u00E9es -LOG=Log -DEVICE_INFO=%s Info -ACTION=Action -READING_OLD_DATA=Reading old data (from Db) - - -STATUS_NONE=Statut inconnu -STATUS_READY=Pr\u00EAt -STATUS_DOWNLOADING=Chargement -STATUS_STOPPED_DEVICE=Chargement interrompu (par le dispositif) -STATUS_STOPPED_USER=Chargement interroompu par l'utilisateur -STATUS_DOWNLOAD_FINISHED=Chargement termin\u00E9 -STATUS_READER_ERROR=Erreur %s Interne (ou de port) - -UNKNOWN=Inconnu -NEW=Nouveau -CHANGED=Modifi\u00E9 -OLD=Ancien - -LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log n'est pas actuellement disponible. -READ_DEVICE_DATA_TITLE=Lecture des donn\u00E9es [%s sur %s] -SW_VERSION=SW Version -HW_VERSION=HW Version -SELECT_ALL=Tout S\u00E9lectionner -DESELECT_ALL=Tout D\u00E9-s\u00E9lectionner -FILTER=Filtrer -FILTER_ALL=Tout -FILTER_NEW=Nouveau -FILTER_CHANGED=Modifi\u00E9 -FILTER_EXISTING=Ancien -FILTER_UNKNOWN=Inconnu -FILTER_NEW_CHANGED=Nouveau + Modifi\u00E9 -FILTER_ALL_BUT_EXISTING=Tout sauf Ancien - -# -# File Selector -# - -IMPORT_FILE_SELECTOR=Import File Selector -IMPORT_FILE_SELECTOR_DESC=<html><body>Please select import file of selected type. </body></html> -SELECT_FILE=Select file: -BROWSE=Browse -MULTIPLE_IMPORT_SELECTOR=Multiple Import Selector -MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>This device has several possible import types. Please select correct import type, for import type you have available. </body></html> - - - -# -# Export (1) -# -EXPORT_OUTPUT=Sortie \u00E0 Exporter -#EXPORT_DEVICE_DATA=Donn\u00E9es %s Export\u00E9es -GGC_APPLICATION=Application GGC -EXPORT_PROGRESS=Progression de l'exportation -START=D\u00E9but -EXPORT_STATUS_READY=Pr\u00EAt -EXPORT_STATUS_EXPORTING=Exportation en cours -EXPORT_STATUS_FINISHED=Termin\u00E9 - - - - -# -# List (1) -# -LEGEND_DESC=<html><b>Légnde :</b><br><font color="green">Vert</font> = Tous les dispositifs supportés connus<br><font color="#33FFFF">Cyan</font> = En test<br><font color="#660066">Magenta</font> = quelques dispositifs pris en charge<br><font color="blue">Bleu</font> = Travail en cours<br><font color="#FFCC33">Orange</font> = Pr\u00E9vu<br><font color="red">Red</font> = Non prévu</html> - - - -# -# About (1) -# -SYSTEM_PROPERTIES=System Properties -ABOUT=About -PROPERTY=Property -VALUE=Value -LICENCE=Licence -CREDITS=Credits -LIBRARIES=Libraries -GGC_DEVELOPMENT_TEAM=GGC Development Team -SEE_CREDITS=(See Credits) -DEVELOPERS_DESC=Developers & features they implemented -HELPERS_DESC=People that helped (testing, lending or donating hardware,...) -FEATURES=Features -IMPLEMENTED_FEATURES=Implemented Features -SUPPORTED_DEVICES=Supported Devices -NOT_IMPLEMENTED_FEATURES=Not Implemented Features -PLANNED_DEVICES=Planned Devices -DEVICE_PLUGIN=%s Plug-in -DEVICE_PLUGIN_ABOUT=About %s Plug-in - - - -# -# Printing - Base (2) -# -DATE=Date -PRINTING=Printing -TYPE_OF_REPORT=Type Of Report -SELECT_YEAR_AND_MONTH=Select Year And Month -REPORT_FOOTER=Rapport cr\u00E9\u00E9 par "GGC - GNU Gluco Control", logiciel libre disponible sur http://ggc.sourceforge.net -FOR=For -PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html> -PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html> -PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html> -SELECT_STARTING_RANGE=Select starting range -SELECT_ENDING_RANGE=Select ending range - - -# -# Meter Interfaces (1) -# -SERIAL_PORTS=Serial Ports: COM2,... -MASS_STORAGE=Mass Storage: G:,... - - -# -# Used protocols (1) -# -PROT_NONE=None (dummy or N/A) -PROT_SERIAL_BRIDGE=Serial (or USB bridge) -PROT_MASS_STORAGE_XML=Mass Storage (Xml) -PROT_BLUE_TOOTH=BlueTooth -PROT_BLUETOOTH_SERIAL=BlueTooth/Serial - - -# -# Libraries (1) -# -NO_BINARY_PART_FOUND=Meter devices are using special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n\\lib\\native\\%s and look for\nfile: %s. If it's not there you must\nobtain it, if it is there, then there is\nsomething wrong with it.\n - - - -# -# Special Comments -# -DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated. -DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device. - - -# -# Error Dialog (1) -# -ERROR_DIALOG=Error Dialog -DETAILS=Details -ERROR_SOLUTION=Solution -EXCEPTION_LOG=Exception (Stack) Trace -SEND_TO_SERVER=Send to Server -SENDING_TO_SERVER=Sending to Server -SEND_TO_SERVER_TEXT=<html>This part is not implemented yet. But at later time when<br>this works, you will able to send us report of error<br>and receive solution (if it exists).<br></html> -NO_SOLUTION_AVAILABLE=No solution available. -ERROR_COUNT=Errors (%s) - - -# -# Devices -# - -# Smart pix -PIX_ABORT_AUTOSCAN=Autoscan aborted -PIX_DETECT_DEVICES=Detecting devices -PIX_UNRECOVERABLE_ERROR=Unrecoverable error -PIX_READING_ELEMENT=Reading elements from device -# S_ (%s) -PIX_FINISHED_REPORT_READY=Finished reading. Report ready. -PIX_FINISHED_READING=Finished reading. Report ready. -PIX_READING=Read data -PIX_SCANNING=Scanning for device -PIX_CREATING_REPORT=Creating report -PIX_DEVICE_NOT_FOUND=Device not found - - - -# -# Device Events (2) -# -EVENT_TYPE=Event Type -EVENT_POWER_DOWN=Power Down -EVENT_POWER_UP=Power Up -EVENT_DATETIME_SET=Date/Time Set -EVENT_DATETIME_CORRECT=Date/Time Corrected -EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back -EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward -EVENT_DATETIME_CHANGED=Date/Time Changed -EVENT_SELF_TEST=%s Self-test -EVENT_DOWNLOAD=%s Data Download -EVENT_BATTERY_REMOVED=Battery removed -EVENT_BATTERY_REPLACED=Battery replaced -EVENT_BATTERY_LOW=Battery low -EVENT_BATTERY_LOW_DESC=Battery low (%s) - Deleted: trunk/ggc-plugin_base/src/GGCPlugin_si.properties =================================================================== --- trunk/ggc-plugin_base/src/GGCPlugin_si.properties 2016-12-25 16:06:50 UTC (rev 1424) +++ trunk/ggc-plugin_base/src/GGCPlugin_si.properties 2016-12-25 16:11:36 UTC (rev 1425) @@ -1,415 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: Sloevene ### -# ### Created by: Andy (an...@t-...) ### -# ### Version: 0.6.1 ### -# ### Last change: 6.7.2013 19:47:59 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 264 -# Not translated: 19 (7 %) -# Need to be checked: 0 (0 %) -# -# Translated: 245 (92 %) -# -# -# This comment will be displayed after header -## -# Collation Rules - In unicode we can create special rules for sorting where we specify -# sorting order of special characters. This will be used by tree's and special tables. -# For english this is left empty. For all other (that have non-standard, non english -# charcters) we need to set this if we want sorting to be done correctly. -# -COLLATION_RULES=< a,A < b,B < c,C < \u010D,\u010C < d,D < e,E < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O < p,P < q,Q < r,R < s,S < \u0161,\u0160 < t,T < u,U < v,V < w,W < x,X < y,Y < z,Z < \u017E,\u017D - -# -# General [1] -# - -# buttons and general stuff -CANCEL=Prekini -OK=OK -HELP=Pomo\u010D -CLOSE=Zapri -APPLY=Prevzemi -LOG__=log: -SELECT=Izberi -ERROR=Napaka -ADD=Dodaj -EDIT=Spremeni -DELETE=Zbri\u0161i -NEXT=Nasl. -YES=Da -NO=Ne -WARNING=Opozorilo -UNIT_MMOLL=mmol/L -UNIT_MGDL=mg/dL -FALSE=Napa\u010Dno -TRUE=Pravilno -DATE=Datum -TIME=\u010Cas -GRAPH=Graf -SELECT_ITEM_FIRST=Prosimo najprej izberite vnos. -ARE_YOU_SURE_DELETE=Ste prepri\u010Dani da \u017Eelite odstraniti ta vnos? -QUESTION=Vpra\u0161anje -INFORMATION=Informacija -INVALID_DATA=Napa\u010Dni podatek -VERSION=Verzija - -# weeks days and months -SU=Ne -MO=Po -TU=To -WE=Sr -TH=\u010Ce -FR=Pe -SA=So - - -JANUARY=Januar -FEBRUARY=Februar -MARCH=Marec -APRIL=April -MAY=Maj -JUNE=Junij -JULY=Julij -AUGUST=Avgust -SEPTEMBER=September -OCTOBER=Oktober -NOVEMBER=November -DECEMBER=December - -# -# Configuration [1] -# -MY__=Moj -DEVICE_COMPANY=Podjetje -DEVICE_DEVICE=Naprava -NO_COMPANY_SELECTED=Nobeno podjetje ni izbrano. -NO_DEVICE_SELECTED=Nobena naprava ni izbrana. -TIMEZONE_CONFIGURATION=Nastavitev \u010Dasovne cone -SELECT_ITEM_OR_CANCEL=Izberi en element ali uporabi Prekini opcijo. -SELECT_MASS_STORAGE_DRIVE=Izberi Mass Storage napravo -SELECT_SERIAL_PORT=Izberi Serijska Vrata -SERIAL_PORT=Serijska Vrata -MASS_STORAGE_DRIVE=Mass Storage naprava -NEW__=Nov -NOT_SET=Ni nastavljeno ! -TIMEZONE_PREFERENCES=Nastavitve \u010Dasovne cone -SELECT_TIMEZONE_LIST=Izberite pravilno \u010Dasovno cono -NEED_DAYLIGHTSAVING_FIX=Potrebujemo avtomatsko popravilo \u010Dasa (letni/zimski)? -WINTERTIME_FIX=Popravilo zimskega \u010Dasa -SUMMERTIME_FIX=Popravilo letnega \u010Dasa -DEVICE_CONNECTION=Tip povezave -CUSTOM_NAME=Poljubno ime -COMMUNICATION_SETTINGS=Komunikacijske nastavitve -CONFIG_ERROR_NO_DEVICE_OR_PARAMETERS=<html>Konfiguracijska napaka:<br>Verjetno niste izbrali naprave, ali pa niste pravilno<br>\nnastavili vseh zahtevanih nastavitev.<br></html> -DEVICE_VERSION=Verzija naprave - -# -# Ports [1] -# -COMMUNICATION_PORT=Komunikacijska vrata - -# -# Instructions Dialog [1] -# -OOPS_DEVICE_NOT_CONFIGURED=Ups! Pozabili ste nastaviti svoj merilec\nin trenutno ni nobenega nastavljenega\nin/ali izbranega. Obi\u0161cite konfiguracijo\nin nastavite va\u0161 merilec.\n -CONFIGURED_DEVICE_INSTRUCTIONS=Nastavljen %s in navodila -CONFIGURED_DEVICE=Nastavljen merilec -INSTRUCTIONS=Navodila za prenos podatkov -MY_DEVICE_NAME=Moje ime -DEVICE_ICON=Slika merilca -DEVICE_NAME_=Ime naprave -CONNECTION_TYPE=Povezava -CONNECTION_PARAMETER=Vrata -STATUS=Status -DAYLIGHTSAVINGS_FIX=Popravilo \u010Dasa -DS_NO=Ne -DS_FIX_SHORT=Ja (Z.=%s / L.=%s) -DS_FIX_LONG=Ja (Popravilo pozimi=%s / Popravilo poleti=%s). \u010Casovna cona: %s -DEVICE_DOESNT_SUPPORT_DS_FIX=Ni podprto s strani naprave. -DEVICE_DOESNT_SUPPORT_DS_FIX_2=Naprava ne podpira popravila \u010Dasa -INSTRUCTIONS_DESC=<html>Na zgornji desni strani lahko vidite va\u0161o konfiguracijo. \u010Ce status ni 'Pripravljeno' potem imamo problem s konfiguracijo. Prosim zaprite okno in za\u017Eenite konfiguracijo znova. \u010Ce je problem \u0161e vedno prisoten kontaktirajte podporo (poglejte Dokumentacijo). Na spodnji desni strani lahko vidite navodila kako priklju\u010Diti merilec na va\u0161 ra\u010Dunalnik. Prosim pazljivo jim sledite in ko ste kon\u010Dali kliknite na 'Za\u010Detek prenosa'. Odprlo se bo naslednjo okno, kjer se bodo vrednosti iz merilca prikazovale. Vsi podatki so samo prikazani dokler ne kliknete na tipko 'Izvozi podatke'.</html> -START_DOWNLOAD=Za\u010Detek prenosa >>> -WAIT_UNTIL_DEVICE_PREINIT=Prosim po\u010Dakajte dokler ni naprava pripravljena! - -# status -ERROR_IN_CONFIG=Napaka v konfiguraciji -READY=Pripravljeno - -# Download support -DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Va\u0161a izbrana naprava (%s [%s])<br>ne podpira prenosa podatkov.<br></html> -DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC v tem trenutku ne podpira prenosa prenosa<br>podatkov iz izbrane naprave (%s [%s]).<br>Preverite seznam naprav in preverite ali je<br>podpora v na\u010Drtu ali nas kontaktirajte za<br>dodatne podatke.</html> -DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generi\u010Dne naprave ne podpirajo prenosa podatkov.<br>Izberite "pravo" napravo in poskusite znova.<br></html> -DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Va\u0161a izbrana naprava (%s [%s])<br>ne podpira prenosa podatkov.<br></html> -DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Va\u0161a izbrana naprava (%s [%s])<br>ne podpira uvoza podatkov preko datoteke.<br></html> -DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Va\u0161a izbrana naprava (%s [%s])<br>ne podpira prenosa nastavitev.<br></html> -INTERNAL_CONFIGURATION_ERROR=<html>Zgleda da imamo interni problem<br>pri konfiguraciji aplikacije.<br></html> - -# -# File Selector [1] -# -IMPORT_FILE_SELECTOR=Izbira uvozne datoteke -IMPORT_FILE_SELECTOR_DESC=<html><body>Prosim izberite uvozno datoteko izbranega tipa.</body></html> -SELECT_FILE=Izberi datoteko: -BROWSE=Brskaj -MULTIPLE_IMPORT_SELECTOR=Izbira tipa uvozne datoteke -MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>Ta naprava ima ve\u010D razli\u010Dnih tipov za uvoz. Prosim izberite uvozni format, ki ustreza va\u0161i datoteki.</body></html> - -# -# Transfer display [1] -# -ERROR_CONTACTING_DEVICE=Imeli smo problem pri kontaktiranju merilca.\nProsim preverite nastavitve komunikacijskih vrat\n(nekateri kabli lahko spremenijo vrata, ko\njih znova priklju\u010Dimo). Za\u017Eenite konfiguracijo\nin problem bo verjetno re\u0161en.\n -BREAK_COMMUNICATION=Prekini prenos -EXPORT_DATA=Izvozi podatke -DATA=Podatki -LOG=Dnevnik -DEVICE_INFO=Podatki merilca -ACTION=Akcija -READING_OLD_DATA=Berem stare podatke (iz baze) -STATUS_NONE=Neznan status -STATUS_READY=Pripravljeno -STATUS_DOWNLOADING=Nalaganje (download) -STATUS_STOPPED_DEVICE=Nalaganje prekinjeno (naprava) -STATUS_STOPPED_USER=Nalaganje prekinjeno s strani uporabnika -STATUS_DOWNLOAD_FINISHED=Nalaganje zaklju\u010Deno -STATUS_READER_ERROR=Interna napaka na merilcu (ali portu) -UNKNOWN=Neznan -NEW=Nov -CHANGED=Spremenjen -OLD=Star -LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Dnevnik trenutno \u0161e ne deluje. -READ_D... [truncated message content] |
From: <and...@us...> - 2016-12-25 16:06:52
|
Revision: 1424 http://sourceforge.net/p/ggc/code/1424 Author: andyrozman Date: 2016-12-25 16:06:50 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Plugins - added ggc-plugins-base, with new structure Added Paths: ----------- trunk/ggc-plugins/ggc-plugins-base/src/ trunk/ggc-plugins/ggc-plugins-base/src/main/ trunk/ggc-plugins/ggc-plugins-base/src/main/java/ trunk/ggc-plugins/ggc-plugins-base/src/main/resources/ trunk/ggc-plugins/ggc-plugins-base/src/test/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 16:03:46
|
Revision: 1423 http://sourceforge.net/p/ggc/code/1423 Author: andyrozman Date: 2016-12-25 16:03:44 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Plugins - create base Added Paths: ----------- trunk/ggc-plugins/ggc-plugins-base/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 15:54:55
|
Revision: 1422 http://sourceforge.net/p/ggc/code/1422 Author: andyrozman Date: 2016-12-25 15:54:53 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Core App - adding and changing structure Modified Paths: -------------- trunk/ggc-core-app/ggc-core/pom.xml trunk/ggc-core-app/pom.xml Added Paths: ----------- trunk/ggc-core-app/ggc-doctor-core/ trunk/ggc-core-app/ggc-doctor-core/docs/ trunk/ggc-core-app/ggc-doctor-core/pom.xml trunk/ggc-core-app/ggc-doctor-core/src/ trunk/ggc-core-app/ggc-doctor-core/src/main/ trunk/ggc-core-app/ggc-doctor-core/src/main/java/ trunk/ggc-core-app/ggc-doctor-core/src/main/resources/ trunk/ggc-core-app/ggc-doctor-core/src/test/ trunk/ggc-core-app/ggc-doctor-core/src/test/java/ trunk/ggc-core-app/ggc-doctor-core/src/test/resources/ Modified: trunk/ggc-core-app/ggc-core/pom.xml =================================================================== --- trunk/ggc-core-app/ggc-core/pom.xml 2016-12-25 13:55:31 UTC (rev 1421) +++ trunk/ggc-core-app/ggc-core/pom.xml 2016-12-25 15:54:53 UTC (rev 1422) @@ -4,40 +4,16 @@ <parent> <groupId>net.sf.ggc</groupId> - <artifactId>ggc-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> + <artifactId>ggc-core-app</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <name>GGC Core Project</name> + <name>GGC Core</name> <artifactId>ggc-core</artifactId> <version>${ggc-core.version}</version> - <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> - <sourceDirectory>src</sourceDirectory> - <scriptSourceDirectory>src</scriptSourceDirectory> - <testSourceDirectory>src/test/java</testSourceDirectory> - <resources> - <resource> - <directory>src</directory> - <filtering>true</filtering> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - </build> - <dependencies> <dependency> <groupId>com.atech-software</groupId> Added: trunk/ggc-core-app/ggc-doctor-core/pom.xml =================================================================== --- trunk/ggc-core-app/ggc-doctor-core/pom.xml (rev 0) +++ trunk/ggc-core-app/ggc-doctor-core/pom.xml 2016-12-25 15:54:53 UTC (rev 1422) @@ -0,0 +1,46 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-core-app</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>GGC Core Doctor</name> + <description>GGC Core for Doctors Edition (mostly just customizations of ggc-core)</description> + <artifactId>ggc-core-doctor</artifactId> + <version>${ggc-core-doctor.version}</version> + + + + <dependencies> + <dependency> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-core</artifactId> + </dependency> + + <dependency> + <groupId>com.atech-software</groupId> + <artifactId>atech-tools</artifactId> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-702.jdbc3</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <!-- <version>4.11</version> --> + <!-- <scope>test</scope> --> + </dependency> + + + </dependencies> + + +</project> Modified: trunk/ggc-core-app/pom.xml =================================================================== --- trunk/ggc-core-app/pom.xml 2016-12-25 13:55:31 UTC (rev 1421) +++ trunk/ggc-core-app/pom.xml 2016-12-25 15:54:53 UTC (rev 1422) @@ -13,10 +13,9 @@ <artifactId>ggc-core-app</artifactId> <packaging>pom</packaging> - <!-- <modules> - <module>ggc-help</module> + <module>ggc-core</module> + <module>ggc-doctor-core</module> </modules> - --> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 13:55:34
|
Revision: 1421 http://sourceforge.net/p/ggc/code/1421 Author: andyrozman Date: 2016-12-25 13:55:31 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Core App - moved ggc-core here Modified Paths: -------------- trunk/ggc-core-app/ggc-core/build/build.xml trunk/ggc-core-app/ggc-core/build/build_help.xml trunk/ggc-support/ggc-help/pom.xml Added Paths: ----------- trunk/ggc-core-app/ trunk/ggc-core-app/ggc-core/ trunk/ggc-core-app/ggc-core/src/main/java/ggc/ trunk/ggc-core-app/ggc-core/src/main/resources/GGC_CGMS.hbm.xml trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Main.hbm.xml trunk/ggc-core-app/ggc-core/src/main/resources/GGC_New.hbm.xml trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Nutrition.hbm.xml trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Other.hbm.xml trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Pump.hbm.xml trunk/ggc-core-app/ggc-core/src/main/resources/GGC_de.properties trunk/ggc-core-app/ggc-core/src/main/resources/GGC_en.properties trunk/ggc-core-app/ggc-core/src/main/resources/GGC_fr.properties trunk/ggc-core-app/ggc-core/src/main/resources/GGC_si.properties trunk/ggc-core-app/ggc-core/src/main/resources/log4j.properties trunk/ggc-core-app/pom.xml trunk/ggc-pump/src/ggc/pump/gui/pdtc/ Removed Paths: ------------- trunk/ggc-core/ trunk/ggc-core-app/ggc-core/src/GGC_CGMS.hbm.xml trunk/ggc-core-app/ggc-core/src/GGC_Main.hbm.xml trunk/ggc-core-app/ggc-core/src/GGC_New.hbm.xml trunk/ggc-core-app/ggc-core/src/GGC_Nutrition.hbm.xml trunk/ggc-core-app/ggc-core/src/GGC_Other.hbm.xml trunk/ggc-core-app/ggc-core/src/GGC_Pump.hbm.xml trunk/ggc-core-app/ggc-core/src/GGC_de.properties trunk/ggc-core-app/ggc-core/src/GGC_en.properties trunk/ggc-core-app/ggc-core/src/GGC_fr.properties trunk/ggc-core-app/ggc-core/src/GGC_si.properties trunk/ggc-core-app/ggc-core/src/ggc/ trunk/ggc-core-app/ggc-core/src/log4j.properties Modified: trunk/ggc-core-app/ggc-core/build/build.xml =================================================================== --- trunk/ggc-core/build/build.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/build/build.xml 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,13 +1,13 @@ <?xml version="1.0" ?> -<project name="GNU Gluco Control" default="build" basedir="."> +<project name="GNU Gluco Control" default="build" basedir=""> <description> Build file for GGC </description> <!-- Environment properties read from a file ...--> <property file="../../build/AtechTools.properties"/> - <property file="./GGCBuild.properties"/> - <property file="./GGC_Core_Version.properties"/> + <property file="GGCBuild.properties"/> + <property file="GGC_Core_Version.properties"/> <!-- These should *not* be modified on the command line! --> Modified: trunk/ggc-core-app/ggc-core/build/build_help.xml =================================================================== --- trunk/ggc-core/build/build_help.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/build/build_help.xml 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,13 +1,13 @@ <?xml version="1.0" ?> -<project name="GNU Gluco Control" default="build" basedir="."> +<project name="GNU Gluco Control" default="build" basedir=""> <description> Build file for GGC </description> <!-- Environment properties read from a file ...--> <property file="../../build/AtechTools.properties"/> - <property file="./GGCBuild.properties"/> - <property file="./GGC_Core_Version.properties"/> + <property file="GGCBuild.properties"/> + <property file="GGC_Core_Version.properties"/> <!-- These should *not* be modified on the command line! --> Deleted: trunk/ggc-core-app/ggc-core/src/GGC_CGMS.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_CGMS.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/src/GGC_CGMS.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,39 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** ggc::CGM SCHEMA ******************* --> - - - <!-- CGMS Data --> - <class name="ggc.core.db.hibernate.cgms.CGMSDataH" table="cgm_data" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="base_type" type="int" /> - <property name="sub_type" type="int" /> - <property name="value" type="string" length="2000" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - - <!-- Pump Data Additional Info--> - <class name="ggc.core.db.hibernate.cgms.CGMSDataExtendedH" table="cgm_data_ext" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="type" type="int" /> - <property name="value" type="string" length="2000" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - -</hibernate-mapping> Deleted: trunk/ggc-core-app/ggc-core/src/GGC_Main.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Main.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/src/GGC_Main.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,81 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** ggc::Main SCHEMA ******************* --> - - - <!-- ****************************************** --> - <!-- *** Patient Data **** --> - <!-- ****************************************** --> - - <!-- DayValueH: last_change=[db=7] --> - <class name="ggc.core.db.hibernate.DayValueH" table="data_dayvalues"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="bg" type="int"/> - <property name="ins1" type="int"/> - <property name="ins2" type="int"/> - <property name="ch" type="float"/> - <property name="meals_ids" type="text"/> - <property name="extended" type="text"/> - <property name="person_id" type="int" not-null="true"/> - <property name="comment" type="string" length="2000"/> - <property name="changed" type="long" not-null="false"/> - </class> - - - <!-- ****************************************** --> - <!-- *** Configuration **** --> - <!-- ****************************************** --> - - <!-- SettingsH: last_change=[db=7] --> - <class name="ggc.core.db.hibernate.SettingsH" table="cfg_settings"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="key" column="el_key" type="string" length="44" not-null="true"/> - <property name="value" column="el_value" type="string" length="255"/> - <property name="type" type="int"/> - <!-- 1-string, 2-int, 3=float --> - <property name="description" type="string" length="255"/> - <property name="person_id" type="int" not-null="true"/> - </class> - - - <!-- ColorSchemeH: last_change=[db=7] --> - <class name="ggc.core.db.hibernate.ColorSchemeH" table="cfg_colorscheme"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="50"/> - <property name="custom_type" type="int"/> - <property name="color_bg" type="int"/> - <property name="color_bg_avg" type="int"/> - <property name="color_bg_low" type="int"/> - <property name="color_bg_high" type="int"/> - <property name="color_bg_target" type="int"/> - <property name="color_ins" type="int"/> - <property name="color_ins1" type="int"/> - <property name="color_ins2" type="int"/> - <property name="color_ins_perbu" type="int"/> - <property name="color_ch" type="int"/> - </class> - - - <!-- - <class name="ggc.core.db.hibernate.DbInfoH" table="db_info"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="key" column="el_key" type="string" length="44" not-null="true"/> - <property name="value" column="el_value" type="string" length="255"/> - <property name="type" type="int"/> - <! 1-string, 2-int, 3=float --> - <!-- <property name="description" type="string" length="255"/> - </class> --> - - -</hibernate-mapping> Deleted: trunk/ggc-core-app/ggc-core/src/GGC_New.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_New.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/src/GGC_New.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,136 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- - Mappings put here and for new functionalities that were not "deployed" yet. This is read only if you start - GGC with dev parameter (on development database with correct columns). If you try to use this on production - Db you will get exception and GGC won't start. - --> - - - <!-- ****************************************** --> - <!-- *** Stocks **** --> - <!-- ****************************************** --> - - <!-- Stock types --> - <!-- - <class name="ggc.core.db.hibernate.StockTypeH" table="stock_types"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="1000" /> - <property name="name_i18n" type="string" length="1000" /> - </class> - --> - - - <class name="ggc.core.db.hibernate.StockSubTypeH" table="stock_subtypes"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="stockTypeId" column="stock_type_id" type="java.lang.Long"/> - <property name="name" type="java.lang.String" length="512"/> - <property name="description" type="java.lang.String" length="2000"/> - <property name="packageContent" column="package_content" type="java.lang.Long"/> - <property name="packageContentUnit" column="package_content_unit" type="java.lang.String" length="100"/> - <property name="usageUnit" column="usage_unit" type="java.lang.Integer"/> - <property name="usageMin" column="usage_min" type="java.lang.Integer"/> - <property name="usageMax" column="usage_max" type="java.lang.Integer"/> - <property name="active" type="java.lang.Boolean"/> - <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/> - <property name="extended" type="text"/> - <property name="comment" type="java.lang.String" length="2000"/> - </class> - - <class name="ggc.core.db.hibernate.StockH" table="stock_stocks"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - - <!-- <property name="stockSubtypeId" column="stock_subtype_id" type="java.lang.Long" /> --> - - <many-to-one name="stockSubtype" class="ggc.core.db.hibernate.StockSubTypeH" fetch="select"> - <column name="stock_subtype_id" not-null="true"/> - </many-to-one> - - <property name="stocktakingId" column="stocktaking_id" type="java.lang.Long"/> - <property name="amount" type="java.lang.Long"/> - <property name="location" type="java.lang.String" length="1000"/> - <property name="validFrom" column="valid_from" type="java.lang.Long"/> - <property name="validTill" column="valid_till" type="java.lang.Long"/> - - <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/> - <property name="extended" type="text"/> - <property name="comment" type="java.lang.String" length="2000"/> - </class> - - - <class name="ggc.core.db.hibernate.StocktakingH" table="stock_stocktaking"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="datetime" column="dt_stocktaking" type="java.lang.Long"/> - <property name="description" type="java.lang.String" length="2000"/> - - <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/> - <property name="extended" type="text"/> - <property name="comment" type="java.lang.String" length="2000"/> - <property name="changed" type="java.lang.Long"/> - </class> - - - <!-- ****************************************** --> - <!-- *** Doctors **** --> - <!-- ****************************************** --> - - - <!-- Doctor types --> - <class name="ggc.core.db.hibernate.doc.DoctorTypeH" table="doc_types"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="1000"/> - <property name="predefined" type="int"/> - </class> - - <!-- Doctor --> - <class name="ggc.core.db.hibernate.doc.DoctorH" table="doc_doctors"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <many-to-one name="doctorType" column="doctor_type_id" class="ggc.core.db.hibernate.doc.DoctorTypeH" - lazy="false"/> - <property name="name" type="string" length="100"/> - <property name="address" type="string" length="2000"/> - <property name="phoneGsm" column="phone_gsm" type="string" length="500"/> - <property name="phone" type="string" length="500"/> - <property name="email" type="string" length="500"/> - <property name="workingTime" column="working_time" type="text"/> - <property name="activeFrom" column="active_from" type="long"/> - <property name="activeTill" column="active_till" type="long"/> - <property name="extended" type="text"/> - <property name="personId" column="person_id" type="int" not-null="true"/> - <property name="comment" type="string" length="4000"/> - </class> - - <!-- Appointment --> - <class name="ggc.core.db.hibernate.doc.DoctorAppointmentH" table="doc_appointment"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <many-to-one name="doctor" class="ggc.core.db.hibernate.doc.DoctorH" lazy="false"/> - <property name="dt_apoint" type="long" not-null="true"/> - <property name="apoint_text" type="string" length="1000"/> - <property name="extended" type="text"/> - <property name="personId" column="person_id" type="int" not-null="true"/> - <property name="comment" type="string" length="4000"/> - </class> - - - <!-- ****************************************** --> - <!-- *** Connect **** --> - <!-- ****************************************** --> - - -</hibernate-mapping> \ No newline at end of file Deleted: trunk/ggc-core-app/ggc-core/src/GGC_Nutrition.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Nutrition.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/src/GGC_Nutrition.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,112 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** GGC::Nutrition SCHEMA ******************* --> - - - <!-- Nutrition Definition - Global --> - <class name="ggc.core.db.hibernate.food.NutritionDefinitionH" table="nutrition_definition"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="weight_unit" type="string" length="50"/> - <property name="tag" type="string" length="50"/> - <property name="name" type="string" length="100"/> - <property name="decimal_places" type="text" length="10"/> - <property name="static_entry" type="int"/> - </class> - - <!-- Nutrition Home Weight Type - Global --> - <class name="ggc.core.db.hibernate.food.NutritionHomeWeightTypeH" table="nutrition_home_weight_type"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="static_entry" type="int"/> - </class> - - - <!-- Food Group - Nutrition 1 --> - <class name="ggc.core.db.hibernate.food.FoodGroupH" table="nutrition_usda_food_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="1000"/> - </class> - - - <!-- Food Description - - Nutrition 1--> - <class name="ggc.core.db.hibernate.food.FoodDescriptionH" table="nutrition_usda_food_description"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="group_id" type="long"/> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="refuse" type="float"/> - <property name="nutritions" type="text"/> - <property name="home_weights" type="text"/> - </class> - - - <!-- Food Group - Nutrition 2 --> - <class name="ggc.core.db.hibernate.food.FoodUserGroupH" table="nutrition_user_food_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="1000"/> - <property name="parent_id" type="long"/> - <property name="changed" type="long" not-null="false"/> - </class> - - - <!-- Food Description - - Nutrition 2--> - <class name="ggc.core.db.hibernate.food.FoodUserDescriptionH" table="nutrition_user_food_description"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="group_id" type="long"/> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="1000"/> - <property name="refuse" type="float"/> - <property name="nutritions" type="text"/> - <property name="home_weights" type="text"/> - <property name="changed" type="long" not-null="false"/> - </class> - - - <class name="ggc.core.db.hibernate.food.MealGroupH" table="meal_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="2000"/> - <property name="parent_id" type="long"/> - <property name="changed" type="long" not-null="false"/> - </class> - - <class name="ggc.core.db.hibernate.food.MealH" table="meal_meal"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="group_id" type="long"/> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="2000"/> - <property name="parts" type="text"/> - <!-- 1:x=1.0;2:y;1:z --> - <!-- type:id type=[1=Nutrition USDBA, 2=Nutrition User ]; id = id in db --> - <property name="nutritions" type="text"/> - <property name="extended" type="text"/> - <property name="comment" type="string" length="2000"/> - <property name="changed" type="long" not-null="false"/> - </class> - -</hibernate-mapping> Deleted: trunk/ggc-core-app/ggc-core/src/GGC_Other.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Other.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/src/GGC_Other.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,48 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** ggc::Other SCHEMA ******************* --> - - <class name="ggc.core.db.hibernate.inet.InetGroupH" table="inet_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="parent" type="string" length="255"/> - - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="2000"/> - <property name="comment" type="string" length="2000"/> - </class> - - - <class name="ggc.core.db.hibernate.inet.InetTypeH" table="inet_type"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="2000"/> - <property name="comment" type="string" length="2000"/> - </class> - - <class name="ggc.core.db.hibernate.inet.InetLinkGroupH" table="inet_link_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="group_id" type="string" length="1000"/> - <property name="link_id" type="string" length="1000"/> - </class> - - <class name="ggc.core.db.hibernate.inet.InetLinkH" table="inet_link"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="1000"/> - <property name="description" type="string" length="2000"/> - <property name="comment" type="string" length="2000"/> - </class> - - -</hibernate-mapping> Deleted: trunk/ggc-core-app/ggc-core/src/GGC_Pump.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Pump.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/src/GGC_Pump.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,54 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** ggc::Pump SCHEMA ******************* --> - - - <!-- Pump Data --> - <class name="ggc.core.db.hibernate.pump.PumpDataH" table="pump_data" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="base_type" type="int" /> - <property name="sub_type" type="int" /> - <property name="value" type="string" length="2000" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - <!-- Pump Data Additional Info--> - <class name="ggc.core.db.hibernate.pump.PumpDataExtendedH" table="pump_data_ext" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="type" type="int" /> - <property name="value" type="string" length="2000" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - <!-- Pump Profile --> - <class name="ggc.core.db.hibernate.pump.PumpProfileH" table="pump_profile" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255" /> - <property name="basal_base" type="float" /> - <property name="basal_diffs" type="text" /> - <property name="active_from" type="long" /> - <property name="active_till" type="long" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - -</hibernate-mapping> Deleted: trunk/ggc-core-app/ggc-core/src/GGC_de.properties =================================================================== --- trunk/ggc-core/src/GGC_de.properties 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core-app/ggc-core/src/GGC_de.properties 2016-12-25 13:55:31 UTC (rev 1421) @@ -1,843 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: German ### -# ### Created by: Reinhold Rumberger (ru...@us...)### -# ### Version: 0.5 ### -# ### Last change: 02.05.2013 11:05:20 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 648 -# Not translated: 96 (15 %) -# Need to be checked: 110 (17 %) -# -# Translated: 442 (68 %) -# -# -# -## GGC Core# -# Collation Rules - In unicode we can create special rules for sorting where we specify -# sorting order of special characters. This will be used by tree's and special tables. -# For english this is left empty. For all other (that have non-standard, non english -# charcters) we need to set this if we want sorting to be done correctly. -# -COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z - -# -# GGC - Globally used [1] -# -DELETE=L\u00F6schen -ADD=Hinzuf\u00FCgen -EDIT=Bearbeiten -NEW=Neu -EDIT_DEL_SHORT=Bearb./L\u00F6schen -FEATURE=Feature -IMPLEMENTED_VERSION=wird in Version %s implementiert -OR=oder -INFORMATION=Information -QUESTION=Frage -YES=Ja -NO=Nein -COMMING_IN_VERSION=Kommt in Version %s -NOT_WORKING_100PRO=Funktioniert noch nicht zu 100% -NOT_TESTED_100PRO=Noch nicht zu 100% getestet -NOT_USED=Nicht verwendet - -# -# ggc.datamodels [1] -# -NO_NAME=Kein Name -TIME=Zeit -BG=BZ -INS_1=Ins1 -INS_2=Ins2 -INS_3=Ins3 -INSULIN_1=Insulin 1 -INSULIN_2=Insulin 2 -INSULIN_3=Insulin 3 -BU=KH -ACT=Ac. -COMMENT=Kommentar -DATE_MUST_BE_IN_FORMAT=Datum muss folgendes Format haben -TIME_MUST_BE_IN_FORMAT=Zeit muss folgendes Format haben -ERROR_PARSING_DATE=Fehler beim Einlesen des Datums -DATETIME=Datum/Zeit -PUMP_INSULIN=Pumpen-Insulin - -# -# Main Frame (Info panels) & Other places [1] -# - -# general -BG_TARGET=BZ-Ziel - -# hba1c -NO_EXPRESSIVENESS=Keine Aussagekraft -LITTLE_EXPRESSIVENESS=Geringe Aussagekraft -STANDARD_EXPRESSIVENESS=Mittlere Aussagekraft -GOOD_EXPRESSIVENESS=Hohe Aussagekraft - -# -# Daily Values Stats [1] -# - -# main -CH_LONG=Kohlehydrate -ACTIVITY=Bewegung -FOOD=Lebensmittel -UPDATE_FROM_FOOD=KH aktualisieren -EDIT_FOOD=Lebensmittel Db [1] -DATE_TIME=Datum/Zeit -FOOD_SET=Lebensmittelgruppe [%s] - -# meals -FOOD_BY_DESCRIPTION=Beschreibung [2] -FOOD_BY_DESCRIPTION_TITLE=Nahrungsmittel nach Beschreibung -DESCRIBE_FOODS=<html><b>Beschreiben Sie Nahrungsmittel, die Sie gegessen haben</b> (wenn Sie KH in eckige Klammern [] einschließen, künnen KH automatisch errechnet werden)</html> -CALCULATE=Berechnen -NO_DESCRIPTIONS_WITH_CH=Es wurden keine Beschreibungen mit KH-Definitionen\nim Nahrungsbeschreibungsbereich gefunden.\nSollten Sie einen Fehler gemacht haben,\nbearbeiten Sie den Text noch einmal.\n -CH=KH - -# -# Main GUI Panels [1] -# -ADD_ROW=Neuer Eintrag -EDIT_ROW=Eintrag \u00E4ndern -CLOSE=Schlie\u00DFen -COURSE_GRAPH=Verlaufsdiagramm -SPREAD_GRAPH=Spread Graph -TO_BE_DRAWN=Einzuzeichnen -CONNECT_VALUES_FOR_ONE_DAY=Werte eines Tages verbinden -SUM_BU=Summe KH -SUM=Summe -SUM_INSULIN=Summe IE -AVG_BG_PER_DAY=mittlerer BZ pro Tag -INS_PER_DAY=Ins. pro Tag -MEALS=Mahlzeiten -INS_SLASH_BU=Ins/KH -DRAW=Zeichnen -DAILYGRAPHFRAME=Tagesdiagramm -DAILYSTATSFRAME=Tagesstatistiken -SAVE=Speichern -DELETE_ROW=Eintrag L\u00F6schen -LOWEST=Niedrigster -STD_DEV=Std. Abw. -READINGS=Werte -HIGHEST=H\u00F6chster -AVG_BG=Mittl. BZ -BLOOD_GLUCOSE=Blutzucker -BREAD_UNITS=Broteinheiten -AVG=Mittl. -INSULIN=Insulin -URINE=Urin -DOSE=Dosis -TOTAL=Summe -AVG_INS=Mittl. IE -DOSE_INS=Insulindosis -CANCEL=Abbrechen -OK=OK -HELP=Hilfe -ADD_NEW_VALUES=Neue Werte eintragen -COURSEGRAPHFRAME=Verlaufsdiagramm -FREQGRAPHFRAME=Frequenzdiagramm -GRAPH=Diagramm -ADD_NEW_ROW_TO_TABLE=F\u00FCgt eine neue Wertereihe in die Tabelle ein. -DELETE_SELECTED_ROWS=L\u00F6sche ausgew\u00E4hlte Zeilen. -SELECT_ROW_FIRST=Bitte zuerst einen Eintrag ausw\u00E4hlen! -READINGS_SLASH_DAY=Werte/Tag -VALUATION=Wertung -INIT=Initialisierung -READY=Fertig -UNKNOWN=Unbekannt -COMMENTS=Anmerkungen -ARE_YOU_SURE_DELETE=Wollen Sie diesen Eintrag wirklich l\u00F6schen? -ARE_YOU_SURE_DELETE_ROW=Wollen Sie diesen Eintrag wirklich l\u00F6schen? - -# -# GGC Little (GUI) [2] -# -DAILY_VALUES=Tageswerte -SHOW_DAILY_GRAPH=Diagramm anzeigen -DAILY_CONTROL=Daily Control -MN_QUIT_LT_DESC=GGC Little beenden -CURRENT_DATE_HAS_CHANGED=Das Datum hat sich ge\u00E4ndert! Ihre Aktion wird deshalb verworfen und die Tabelle aktualisiert! -TB_ADD_ROW_DESC=Neuer Eintrag f\u00FCr diesen Tag -TB_EDIT_ROW_DESC=Eintrag f\u00FCr diesen Tag bearbeiten -TB_DELETE_ROW_DESC=Eintrag f\u00FCr diesen Tag l\u00F6schen -TB_READ_METER_LT_DESC=Daten vom Me\u00DFger\u00E4t auslesen -TB_ABOUT_DESC=\u00DCber GGC Little -TB_SHOW_GRAPH_DESC=Diagramm f\u00FCr diesen Tag anzeigen -GGC_LITTLE_TITLE=GNU Gluco Control Little -TAB_CONTROL=Steuerung -TAB_SCHEDULE=Terminplan -TAB_PLUGIN=Plug-ins -TAB_STOCKS=Bestand -PLUGIN_IMPLEMENTED_VERSION=Dieses Plug-in wird in Version %s implementiert! -METER_PLUGIN_PANEL=Me\u00DFger\u00E4te-Plug-in -PUMP_PLUGIN_PANEL=Pumpen-Plug-in - -# -# GGC Little (System Tray) [3] -# -SHOW_APP=Anzeigen -SHOW_APP_DESC=GGC Little anzeigen -HIDE_APP=Verstecken -HIDE_APP_DESC=GGC Little verstecken -EXIT_APP=Beenden -EXIT_APP_DESC=GGC Little beenden - -# -# Menus (BE CAREFUL about mnemonics used) Set mnemonic with & before mnemonic letter [1] -# - -# main menus -MN_FILE=&Datei -MN_DATA=Pen/Spritze -MN_DATA_GRAPH=Diagramme -MN_DOCTOR=&Arzt -MN_FOOD=&Ern\u00E4hrung -MN_PRINTING=D&rucken -MN_TOOLS=&Werkzeuge -MN_HELP=&Hilfe - -# file -MN_LOGIN=Ein&loggen -MN_LOGIN_DESC=Patient einloggen -MN_LOGOUT=Ausl&oggen -MN_LOGOUT_DESC=Ausloggen -MN_QUIT=B&eenden -MN_QUIT_DESC=GGC beenden - -# data -MN_DAILY=&Tages\u00FCbersicht -MN_DAILY_DESC=Tagesstatistik betrachten -MN_COURSE=&Verlauf -MN_COURSE_DESC=Verlauf betrachten -MN_SPREAD=Ver&teilung -MN_SPREAD_DESC=Verteilung betrachten -MN_FREQUENCY=&Frequenz -MN_FREQUENCY_DESC=Wertefrequenz betrachten -MN_HBA1C=&HbA1c -MN_HBA1C_DESC=HbA1c betrachten -MN_DATA_RATIO=Verh\u00E4ltnis -MN_DATA_RATIO_DESC=Verh\u00E4ltnis-Einstellungen -MN_RATIO_BASE=Basis -MN_RATIO_BASE_DESC=Basisverh\u00E4ltniseinstellungen (1 pro Tag) -MN_RATIO_EXTENDED=Erweitert -MN_RATIO_EXTENDED_DESC=Erweiterte Verh\u00E4ltniseinstellungen (mehr als 1 pro Tag) -MN_RATIO_CALC=&Verh\u00E4ltnisrechner -MN_RATIO_CALC_DESC=Berechnet verschiedene Verh\u00E4ltnisse (Insulin/KH, ...) - -# tools -MN_DB_MAINT=&Datenbank-Wartung -MN_DB_MAINT_DESC=Funktionen f\u00FCr die Wartung der Datenbank -MN_DB_BACKUP=Datenbank &sichern -MN_DB_BACKUP_DESC=Sichert die GGC-Datenbank -MN_DB_RESTORE=Datenbank &wiederherstellen -MN_DB_RESTORE_DESC=Stellt die GGC-Datenbank anhand einer Sicherung wieder her -MN_MISC_SYNCHRONIZE=&Synchronisierung -MN_MISC_SYNCHRONIZE_DESC=Datenabgleich mit anderen GGC Instanzen -MN_PREFERENCES=&Einstellungen -MN_PREFERENCES_DESC=Einstellungen - -# help -MN_ABOUT=\u00DC&ber -MN_ABOUT_DESC=\u00DCber GGC -MN_CHECK_FOR_UPDATE=Nach &Updates suchen -MN_CHECK_FOR_UPDATE_DESC=Pr\u00FCft, ob eine neue Version verf\u00FCgbar ist - -# food -MN_NUTRDB_USDB=N\u00E4hrstoff-DB (&USDA) -MN_NUTRDB_USDB_DESC=Datenbank mit N\u00E4hrstoff-Informationen, ver\u00F6ffentlicht vom USDA -MN_NUTRDB_USER=N\u00E4hrstoff-DB (&Benutzer) -MN_NUTRDB_USER_DESC=N\u00E4hrstoff-Datenbank des Benutzers -MN_MEALS=&Mahlzeiten-DB -MN_MEALS_DESC=Datenbank mit vollst\u00E4ndigen Mahlzeiten - -# printing -MN_REPORTS=&Data -MN_REPORTS_DESC=Selbstkontrolldaten-Berichte -MN_PDF_SIMPLE=&Einfach -MN_PDF_SIMPLE_DESC=Einfacher PDF-Bericht (monatl.) -MN_PDF_EXT=&Ausf\u00FChrlich -MN_PDF_EXT_DESC=Ausf\u00FChrlicher PDF-Bericht (monatl.) - -# doctors -MN_DOCS=\u00C4&rzte -MN_DOCS_DESC=\u00C4rzte -MN_APPOINT=&Termine -MN_APPOINT_DESC=Termine f\u00FCr Arztbesuche -MN_STOCKS=&Bestand -MN_STOCKS_DESC=Bestand medizinischer Ausr\u00FCstung - -# -# ggc.gui.calendar [2] -# -ENDING_DATE=Enddatum -STARTING_DATE=Startdatum -1_WEEK=1 Woche -1_MONTH=1 Monat -3_MONTHS=3 Monate -CUSTOM=Benutzerdefiniert -DATE_RANGE_SELECTOR=Wahl des Zeitraumes -SU=So -MO=Mo -TU=Di -WE=Mi -TH=Do -FR=Fr -SA=Sa -JANUARY=Januar -FEBRUARY=Februar -MARCH=M\u00E4rz -APRIL=April -MAY=Mai -JUNE=Juni -JULY=Juli -AUGUST=August -SEPTEMBER=September -OCTOBER=Oktober -NOVEMBER=November -DECEMBER=Dezember - -# -# Main GUI Panels [1] -# -GENERAL_INFORMATION=Allgemeine Informationen -YOUR_NAME=Ihr Name -BOLUS_INSULIN=Bolusinsulin -BASAL_INSULIN=Basalinsulin -GLUCOMETER=Messger\u00E4t -BG_UNIT=Ma\u00DFeinheit -HBA1C=HbA1c -YOUR_CURRENT_HBA1C=Ihr aktueller HbA1c -NO_READINGS=Keine Werte -NO_DATASOURCE=Keine Datenquelle -SCHEDULE=Terminplan -YOUR_NEXT_APPOINTMENT=Ihr n\u00E4chster Termin -APP_WILL_BE_FOUND_HERE=wird hier zu finden sein... -STATISTICS_FOR_LAST_WEEK=Statistiken f\u00FCr vorige Woche -BG_STATISTICS=BZ Statistiken -BU_STATISTICS=KH Statistiken -BU_PER_DAY=KH pro Tag -AVG_MEAL_SIZE=KH pro Mahlzeit -MEALS_PER_DAY=Mahlzeiten pro Tag -STATISTICS=Statistiken -PER_DAY=pro Tag -AVG_DOSE_SIZE=Mittl. Dosis -DOSES_PER_DAY=Dosen pro Tag -OTHER_INFO=Sonstiges -STOCK=Bestand -STOCK_DATA_HERE=Daten zu Ihrer medizinischen Ausr\u00FCstung -STO_WILL_BE_FOUND_HERE=wird hier zu finden sein... -NOT_YET=BISHER NOCH NICHT! -BOLUS_INSULIN_SHORT=Bolus -BASAL_INSULIN_SHORT=Basal -AVERAGE=Durchschnitt -DOSES=Dosen - -# -# Hba1c Dialog [1] -# -CALCULATED_HBA1C=Errechneter HbA1c - -# -# Configuration [1] -# -APPLY=Anwenden -ERROR=Fehler -INVALID_NAME=Ung\u00FCltiger Name -PREFERENCES=Einstellungen -GENERAL=Allgemeines -MEDICAL_DATA=Medizinische Daten -COLORS_AND_FONTS=Farbe & Schrift -RENDERING_QUALITY=Darstellungsqualit\u00E4t -SOME_VALUES_CHANGED_LIKE_TO_SAVE=Einige Werte haben sich ge\u00E4ndert. Wollen Sie diese speichen? -VALUES_CHANGED=Ge\u00E4nderte Werte -CHOOSE_A_COLOR=W\u00E4hlen Sie eine Farbe -BG_HIGH_ZONE=\u00DCberzuckerbereich -BG_TARGET_ZONE=Zielbereich -BG_LOW_ZONE=Unterzuckerbereich -BG_AVERAGE=BZ Mittelwert -INS_SLASH_BU_QUOTIENT=Ins/KH -NAME=Name -ABBR=Abk. -HIGH_BG=\u00DCberzuckergrenze -LOW_BG=Unterzuckergrenze -TARGET_HIGH_BG=Obergrenze Zielbereich -TARGET_LOW_BG=Untergrenze Zielbereich -INSULIN_SETTINGS=Insulineinstellungen -BLOOD_GLUCOSE_SETTINGS=Blutzuckereinstellungen -BLOOD_GLUCOSE_UNIT_SETTING=BZ-Einheiteneinstellungen -BLOOD_GLUCOSE_SETTINGS_1=BZ-Einstellungen (mg/dl) -BLOOD_GLUCOSE_SETTINGS_2=BZ-Einstellungen (mmol/l) -HOST=Host -PORT=Port -USERNAME=Benutzername -PASSWORD=Passwort -OPTIONS=Optionen -ANTIALIASING=Kantengl\u00E4ttung -COLOR_RENDERING=Farbdarstellung -DITHERING=Dithering -FRACTIONAL_METRICS=Fractional Metrics -INTERPOLATION=Interpolation -TEXT_ANTIALIASING=Kantengl\u00E4ttung Schrift -RENDERING=Darstellung -DE=Deutsch -EN=Englisch -SI=Slowenisch -YOUR_LANGUAGE=Ihre Sprache -COLOR_SCHEME_SELECT=Farbschemawahl -SELECTED_COLOR_SCHEME=Gew\u00E4hltes Farbschema -NEW_SCHEME=Neues Schema -COLORS=Farben -COLOR_SCHEME_PREDEFINED=Die Farbe eines vordefinierten Farbschemas kann nicht ver\u00E4ndert werden. -USE_AS_TEMPLATE=Folgendes Schema als Vorlage benutzen -CREATE_NEW_SCHEME=Neues Schema erstellen -EDIT_DELETE_SCHEME=Schema Bearbeiten/L\u00F6schen -TYPE_NAME_BEFORE=Geben Sie den Name ein und klicken Sie OK. -SCHEME_NAME_ALREADY_USED=Dieses Schema existiert bereits!\nBitte w\u00E4hlen Sie einen anderen Namen. -PREDEFINED_SCHEME_CANT_BE_CHANGED=Der Name eines vordefinierten Schemas kann nicht ge\u00E4ndert, und das Schema nicht gel\u00F6scht werden! -EXECUTABLE_FILES=Ausf\u00FChrbare Dateien (*.exe) -SELECT_PDF_VIEWER=Wahl des PDF-Betrachters -COLOR_PREVIEW=Farbschema Vorschau -ACTION=Aktion -ACTION_DELETE=L\u00F6schen -ACTION_EDIT=Bearbeiten -SELECTED_SCHEME=Aktives Schema -NEW_NAME=Neuer Name -SELECT_ACTION_OR_CANCEL=Sie sollten eine Aktion oder 'Abbrechen' w\u00E4hlen -GENERAL_SETTINGS=Allgemeine Einstellungen -DATABASE_SETTINGS=Datenbank -DATABASE_SETTINGS_DESC=<html><body><b><i>Warnung! \u00C4ndern Sie diese Einstellung nur wenn Sie wissen, was Sie tun!</i></b><br>Die meisten Daten und Einstellungen befinden sich in der Datenbank selbst. In der Konfigurationsdatei befinden sich nur Einstellungen zu Sprache, Datenbank und Look&Feel.<br><i>\u00C4nderungen werden sich erst nach einem Neustart auswirken.</i></body></html> -SELECTED_DATABASE=Gew\u00E4hlte Datenbank -LAF_SETTINGS=Look & Feel Einstellungen -LAF_SETTINGS_DESC=<html><body><i>\u00C4nderungen werden sich erst nach einem Neustart von GGC auswirken.</i></body></html> -SELECTED_LAF_TYPE_NAME=L&F w\u00E4hlen (Name) -SELECTED_LAF_TYPE_CLASS=L&F w\u00E4hlen (Klasse) -SELECTED_SKINLF_DEF=Gew\u00E4hlter Skin f\u00FCr SkinLF -SELECT_SKINLF_SKIN=W\u00E4hlen Sie eine Oberfl\u00E4che f\u00FCr die Skin L&F-Bibliothek -SELECT=Ausw\u00E4hlen... -BASIC_SETTINGS=Grundeinstellungen -EMPTY_VALUE=Leerer Wert -PDF_VIEWER_SETTINGS=PDF-Betrachter Einstellungen -PDF_VIEWER=PDF-Betrachter -BROWSE=Ausw\u00E4hlen... -LUNCH_START_TIME=Mittagszeit ab (hh:mm) -DINNER_START_TIME=Abendszeit ab (hh:mm) -NIGHT_START_TIME=Nacht ab (hh:mm) - -# Mode -MODE=Modus -APPLICATION_MODE=Anwendungsmodus -PEN_INJECTION_MODE=Pen-/Spritzen-Modus -PUMP_MODE=Pumpenmodus -APPLICATION_MODE_DESC=<html><body>Der Modus unterbindet nicht die Verwendung von Teilen der Anwendung. Er w\u00E4hlt nur die richtigen Daten f\u00FCr die Anzeige der Statistiken und die richtigen Symbole f\u00FCr die Toolbar aus.</body></html> -PEN_INJECTION_MODE_SETTINGS=Pen-/-Spritzmodus Einstellungen -PUMP_MODE_SETTINGS=Pumpenmodus Einstellungen -BASAL_PRECISSION=Basaldosis Genauigkeit -BOLUS_PRECISSION=Bolusdosis Genauigkeit -MAX_BASAL=Max. Basaldosis -MAX_BOLUS=Max. Bolusdosis -TBR_TYPE_SELECTOR=Tempor\u00E4rer Basalratentyp -TBR_TYPE_BOTH=Beide -TBR_TYPE_UNIT=Einheit (U) -TBR_TYPE_PROC=Prozent (%) -TBR_TYPE_CHOICE=Choice in GGC -PROCENT_MIN=Prozent Min. -UNIT_MIN=Einheit Min. -TASK_MIN=Min -TASK_MAX=Max -TASK_STEP=Schritt - -# Language -LANGUAGE=Sprache -LANGPACK_VERSION=Sprachpaket -LANG_WITH_HELP=Sprachen mit Hilfe -LANG_WITHOUT_HELP=Sprachen ohne Hilfe -SELECT_LANGUAGE=Sprachwahl -NO_HELP_AVAILABLE=Keine Hilfe verf\u00FCgbar -HELP_AVAILABLE=Hilfe verf\u00FCgbar -LANG_DESC=<html><body>Die Übersetzung der Anwendung findet getrennt von deren Entwicklung statt, weshalb die Übersetzung meistens etwas veraltet ist. Übersetzungen werden vor allem von Freiwilligen außerhalb des Projekts gepflegt, deshalb sind wir nicht direkt für Fehler in der Übersetzung, oder wann die n\u00E4chste Übersetzung verfügbar ist verantwortlich. Wenn Sie Fehler finden, können Sie uns gerne kontaktieren und wir werden sie baldmöglichst beheben.<br>Wenn etwas noch nicht übersetzt wurde, wird der Ausdruck in der Standardsprache (Englisch) angezeigt.<br>Wenn Sie bei der Übersetzung helfen wollen, kontaktieren Sie uns bitte via E-Maill: gg...@at....</body></html> -NOTE_RESTART=<html><body><b>Warnung:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html> -NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><b>Warnung:</b>Dieses Feature ist noch nicht aktiviert. Bis auf weiteres verwenden Sie bitte die Sprachwahl im Allgemeines-Reiter. Wenn dieses Feature aktiviert wird, wird diese Warnung und die Sprachwahl im Allgemeines-Reiter entfernt.</font></body></html> - -# -# ggc.util [6] -# -UNNAMED_USER=Unbekannter Benutzer -THIS_FILE_WAS_AUTOMATICALY_GENERATED=Diese Datei wurde automatisch generiert. -YOUR_VERSION=Ihre Version -AVAILABLE_VERSION=Verf\u00FCgbare Version -NO_NEW_VERSION=Keine aktuellere Version verf\u00FCgbar. -CHECK_FOR_NEW_VERSION=Auf neue Version \u00FCberpr\u00FCfen -HOST_UNAVAILABLE_INFO=Server nicht verf\u00FCgbar -HOST_UNAVAILABLE_MSG=Konnte nicht mit ggc.sourceforge.net verbinden! - -# -# Graphs [2] -# -DAYS_WITH_READINGS_0_1=Tage mit 0 oder 1 Messung -DAYS_WITH_READINGS_2_3=Tage mit 2 oder 3 Messungen -DAYS_WITH_READINGS_4_5=Tage mit 4 oder 5 Messungen -DAYS_WITH_READINGS_6_7=Tage mit 6 oder 7 Messungen -DAYS_WITH_READINGS_MORE_7=Tage mit 8+ Messungen -AXIS_TIME_LABEL=Zeit (Std) -AXIS_VALUE_LABEL=BZ (%s) -FORMAT_DATE_DAYS=dd.MM.yyyy -FORMAT_DATE_HOURS=HH:mm -GRAPH_NO_DATA_AVAILABLE_CHANGE=Keine Daten verf\u00FCgbar. W\u00E4hlen Sie eine andere Zeitspanne und/oder zu zeichnende Elemente und klicken Sie "Zeichnen"! - -# -# Database Tool [5] -# -DB_TOOL=Database Hibernate Tool -DB_CONFIGURATION=Datenbankeinstellungen -DB_PRESS_HELP=Klicken Sie auf den Hilfe-Knopf um detaillierte Informationen zu den Verbindungseinstellungen zu bekommen. -DB_CONFIG_DESC=<html><head></head><body><p>Dieses Tool ist daf\u00FCr da, Ihre Datenbank f\u00FCr diese Anwendung zu konfigurieren. Bitte setzen Sie alle Einstellungsmöglichkeiten korrekt und versuchen Sie dann, eine Verbindung mit der Datenbank herzustellen (Benutzername, Passwort und Datenbank Name müssen korrekt sein). Ist der Verbindungsversuch erfolgreich, stimmen die Einstellungen.</p><p>Jetzt sind Sie bereit, Tabellen mit Hilfe von Hibernate zu erstellen.. Sie müssen alle JARs zum Classpath hinzufügen, bevor Sie die zweite Option (Datenbank initialisieren) starten. Sie müssen vorsichtig sein! Wenn Sie die Datenbank bereits eingerichtet und mit Daten befüllt haben, wird "Datenbank initialisieren" alle Daten zerstören.<p><body><html> -DATABASE_TYPE=DB-Typ -DATABASE_CLASSNAME=DB-Klasse -HIBERNATE_DIALECT=Hibernate Dialekt -JDBC_URL=JDBC URL -HOSTNAME=Hostname -DATABASE=Datenbank - -# -# Printing - Base [2] -# -PRINTING=Drucken -TYPE_OF_REPORT=Berichttyp -SELECT_YEAR_AND_MONTH=Monat w\u00E4hlen -REPORT_FOOTER=Dieser Bericht stammt von "GGC - GNU Gluco Control", frei verf\u00FCgbar unter http://ggc.sourceforge.net -FOR=F\u00FCr -PRINTING_SETTINGS_NOT_SET=<html>Druckeinstellungen (PDF-Anzeigeprogramm) nicht gesetzt oder inkorrekt.</html> -PRINTING_SETTINGS_NOT_SET_SOL=<html>Gehen Sie zu Werkzeuge->Einstellungen->Drucken<br>und geben Sie den Pfad zum PDF-Anzeigeprogramm an.</html> -PDF_VIEVER_RUN_ERROR=<html>Fehler beim Aufruf des PDF-Anzeigeprogramms:<br>Unbekannter Fehler</html> -SELECT_STARTING_RANGE=Select starting range -SELECT_ENDING_RANGE=Select ending range - -# -# Printing [2] -# -INS_SHORT=Ins -CH_SHORT=KH -BREAKFAST=Fr\u00FChst\u00FCck -LUNCH=Mittagessen -DINNER=Abendessen -NIGHT=Nacht -SIMPLE_MONTHLY_REPORT=Einfacher Bericht (monatl.) -EXTENDED_MONTHLY_REPORT=Ausf\u00FChrlicher Bericht (monatl.) -FOOD_MENU_BASE=Food Menu Base (CH only) -FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins) -FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG) -FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ) - -# -# Stocks [5] -# -STOCKS=Bestand - -# -# Appointments [5] -# -APPOINTMENTS=Arzttermine - -# -# About [1] -# -SYSTEM_PROPERTIES=Systemeigenschaften -ABOUT=\u00DCber -PROPERTY=Eigenschaft -VALUE=Wert -LICENCE=Lizenz: -CREDITS=Mitwirkende -LIBRARIES=Bibliotheken -MAIN=Main -ABOUT_GGC=\u00DCber GNU Gluco Control -GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam -SEE_CREDITS=(siehe Mitwirkende) -GGC_TITLE=GNU Gluco Control -CURRENT_DEVELOPERS=Aktive Entwickler -PREVIOUS_DEVELOPERS=Ehemalige Entwickler - -# -# Doctor types [5] -# -ADDICTION_MEDICINE=Addiction Medicine -ADOLESCENT_MEDICINE=Adolescent Medicine -AIDS_HIV_CARE=AIDS/HIV Care -ANESTHESIOLOGY=Anesthesiology -ASTHMA_ALLERGY_IMMUNOLOGY=Asthma, Allergy & Immunology -BREAST_CANCER_SURGERY=Brustkrebschirurgie -CARDIAC_SURGERY=Herzchirurgie -CHILD_CARE=Child care (pediatrics) -CARDIOLOGY=Kardiologie -COLORECTAL_SURGERY=Colorectal Surgery -COSMETIC_SURGERY=Cosmetic Surgery -CRITICAL_CARE=Critical Care -DENTAL_SPECIALTIES=Dental Specialties -DERMATOLOGY=Dermatologie -DIABETES=Diabetes -EMERGENCY_MEDICINE=Emergency Medicine -ENDOCRINOLOGY=Endokrinologie -EPILEPSY=Epilepsie -FAMILY_MEDICINE=Family Medicine -GASTROENTEROLOGY=Gastroenterologie -GENERAL_SURGERY=Allgemeine Chirurgie -GENERAL_INTERNAL_MEDICINE=General Internal Medicine -GERIATRICS=Geriatrics -GYNECOLOGIC_ONCOLOGY=Gyn\u00E4kologische Onkologie -GYNECOLOGY=Gyn\u00E4kologie -HAND_SURGERY=Hand Surgery -HEAD_AND_NECK_SURGERY=Head and Neck Surgery -HEADACHE=Headache -HEMATOLOGY=H\u00E4matologie -HOSPITAL_INTERNAL_MEDICINE=Hospital Internal Medicine -INFECTIOUS_DISEASES=Infectious Diseases -INFERTILITY_MEDICINE=Infertility Medicine -INTERNAL_MEDICINE=Internal Medicine -LABORATORY_MEDICINE=Laboratory Medicine -MIDWIFE=Midwife (CNM) -MEDICAL_GENETICS=Medical Genetics -METABOLISM=Stoffwechsel -MOVEMENT_DISORDERS=Movement Disorders -NEONATOLOGY=Neonatology -NEPHROLOGY=Nephrologie -NEUROLOGY=Neurologie -NEURO_OPTHALMOLOGY=Neuro-ophthalmology -NEUROSURGERY=Neurochirurgie -NUCLEAR_MEDICINE=Nuclear Medicine -NUTRITION_MEDICINE=Nutrition Medicine -OBSTETRICS_AND_GYNECOLOGY=Geburtshilfe und Gyn\u00E4kologie -ONCOLOGY_MEDICAL=Oncology Medical -ONCOLOGY_RADIATION=Oncology Radiation -OPTHALMOLOGY=Augenheilkunde -ORAL_MAXILLOFACIAL_SURGERY=Oral/Maxillofacial Surgery -ORTHOPEDIC_SURGERY=Orthopedic Surgery -OTOLARYNGOLOGY=Otolaryngology (ENT) -OTOLOGY=Otology -PAIN_MANAGEMENT=Pain Management -PATHOLOGY=Pathologie -PEDIATRIC=Kinderheilkunde -PEDIATRIC_SPECIALISTS=Pediatric Specialists -PERINATOLOGY=Geburtshilfe -PHYSIATRY=Physiatry -PHYSICAL_REHABILITATION=Physical Rehabilitation -PLASTIC_RECONSTRUCTIVE_SURGERY=Plastic/Reconstructive Surgery -PODIATRY=Fu\u00DForthop\u00E4die -PROSTATE_CARE=Prostate Care -PSYCHIATRY=Psychiatrie -PSYCHOLOGY=Psychologie -PULMONARY_MEDICINE=Pulmonary Medicine -RADIOLOGY=Radiologie -RADIATION_ONCOLOGY=Radiation Oncology -REPRODUCTIVE_ENDOCRINOLOGY_INFERTILITY=Reproductive Endocrinology and Infertility -RHEUMATOLOGY=Rheumatologie -SLEEP_DISOREDERS=Schlafst\u00F6rungen -SPORTS_MEDICINE=Sportmedizin -THORACIC_SURGERY=Thoracic Surgery -TRANSPLANT=Transplantation -UROLOGY=Urologie -VASCULAR_SURGERY=Gef\u00E4\u00DFchirurgie - -# -# Doctor [5] -# -DOCTORS=\u00C4rzte -FILTER=Filter -FILTER_VISIBLE=Sichtbare -FILTER_ALL=Alle - -# -# Ratio's: Base [1] -# -RATIO_BASE=Grundverh\u00E4ltnis -INSULIN_CARB_RATIO=Insulin/KH-Verh\u00E4ltnis -SENSITIVITY_FACTOR_LONG=<html>Empfindlichkeitsfaktor<br>(Insulin/BZ-Verh\u00E4ltnis)</html> -FILL_RATIO_ENTRIES=<html>Bitte f¨llen Sie die ersten beiden Einträge dieses Formulars aus,<br>oder brechen Sie den Vorgang ab.</html> - -# -# Ratio's: Extended [1] -# -RATIO_EXTENDED=Erweitertes Verh\u00E4ltnis -RATIO_ENTRY_ADD=Neuer Verh\u00E4ltniseintrag -RATIO_ENTRY_EDIT=Verh\u00E4ltniseintrag bearbeiten -TIME_FROM=Von -TIME_TILL=Bis -PROCENT_OF_BASE=Prozent (der Basis) -PROCENT_OF_BASE_SHORT=% der Basis -CH_INSULIN_RATIO_SHORT=KH/Ins -BG_INSULIN_RATIO_SHORT=BZ/Ins -BG_OH_RATIO_SHORT=BZ/KH -CHECK_RATIOEXTENDED_DATA_OK=<html><body>You filled all data about<br>extended ratio's for whole<br>day successfuly !<br></body></html> -CHECK_RATIOEXTENDED_FAILED=<html><body>You filled data about extended<br>ratio's incorrectly. All minutes<br>of the day must be included (from<br>0:00 till 23:59)!<br></body></html> - -# -# Ratio's: Calculator [4] -# -RATIO_CALCULATOR=Verh\u00E4ltnisrechner -TYPE_SOURCE_DATA=Art der Quelldaten -TYPE_SOURCE_MANUAL=Manuelle Daten -TYPE_SOURCE_DB=Datenbank Daten -TDD_FOR_CALCULATION=Total Daily Dose (TDD) For Calculation -RATIO_TIME_SELECT_DESC=<html>Sie müssen einen Zeitraum für die Rechnung wählen. Sind Ihre Werte stabil (keine größeren Änderungen), dürfte ein größerer Zeitraum bessere Resultate liefern. Gibt es jedoch größere Änderungen, oder befinden Sie sich mitten in einer Bolus-/Basalratenneueinstellung, sollten Sie einen kleineren Zeitraum wählen.</html> -2_WEEKS=2 Wochen -3_WEEKS=3 Wochen -DB_DATA_STATUS=Db Data Status -DB_DATA_NOT_READY=Nicht bereit! -DB_DATA_READY=Bereit -GET_DATA=Daten abrufen -RULE_500=500er-Regel (schnellwirkende Insuline) -RULE_450=450er-Regel (Normalinsuline) -RULE_300=300er-Regel (kleine Kinder) -RULE_1800=1800er-Regel (schnellwirkende Insuline) -RULE_1500=1500er-Regel (Normalinsuline) -SELECT_RANGE=Zeitraum w\u00E4hlen -SELECT_RULE=Regel w\u00E4hlen -SENSITIVITY_FACTOR=Empfindlichkeitsfaktor -CALCULATION=Rechnung -INS_CH_RATIO_PROC=1E Insulin f\u00FCr %s g KH -INS_BG_RATIO=Ins/BZ-Verh\u00E4ltnis -INS_BG_RATIO_PROC=1E Insulin verringert den BZ um %s %s -CH_BG_RATIO=KH/BZ-Verh\u00E4ltnis -CH_BG_RATIO_PROC=1 %s Zunahme f\u00FCr %s g KH -TDD_MUST_BE_GREATER_THAN_ZERO=<html><body>Total Daily Dose (TDD) must be greater than<br>zero. Recheck the value and start calculation<br>again.</body></html> -RATIO_CALCULATOR_NOT_IMPLEMENTED=<html><body>This part of Ratio Calculator not implemented<br>yet.</body></html> -RATIOS_NOT_DONE=<html><body>You never run calculation of Ratio's.<br>Either run it and click OK to transfer<br>calculated data, or use Cancel to exit.</body></html> -RATIO_DB_IMPORT_NA=<html><body>Importing data from Db, doesn't work yet.<br>You can only enter data manually.</body></html> - -# -# Bolus Helper [1] -# -BOLUS_HELPER=Bolus Helper -READ_RATIOS=Read Ratios -CH_INSULIN_RATIO=CH / Insulin Ratio -BG_INSULIN_RATIO=BG / Insulin Ratio -BG_OH_RATIO=BG / CH Ratio -CORRECTION_DOSE=Correction Dose -CARB_DOSE=Dose for covering CH -TOGETHER=Together -TOGETHER_ROUNDED=Together (rounded) -NO_BG_MEASURE=No BG measurment. -NO_CARBS_DEFINED=CH not set. -UNIT_SHORT=U - -# -# Tools [1] -# -METERS_PLUGIN=Messger\u00E4te-Plug-in -PUMPS_PLUGIN=Pumpen-Plug-in -CGMS_PLUGIN=CGMS Tool Plug-in -NUTRITION_PLUGIN=Nutrition Tool Plug-in -STATUS_NOT_INSTALLED=Nicht installiert -STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00FCgbar) -STATUS_INSTALLED=Installiert (Version %s) -PLUGIN_NOT_INSTALLED_OR_AVAILABLE=%s nicht installiert und/oder verf\u00FCgbar. - -# -# Backup/Restore [1] -# - -# backup -BACKUP=Sicherung -BACKUP_DB_TITLE=Sicherung der GGC-Datenbank -BACKUP_DB_TITLE_SHORT=Datenbanksicherung -SELECT_ELEMENTS_TO_BACKUP=W\u00E4hlen Sie die zu sichernden Elemente - -# progress -TOTAL_PROGRESS=Fortschritt insgesamt -BACKUP_NOT_STARTED_YET=Sicherung wurde noch nicht gestartet. -CURRENT_TASK=Aktuelle Aufgabe -NO_TASK_STARTED=Keine Aufgabe - -# elements -GGC_BACKUP=GGC-Sicherung -NUTRITION_OBJECTS=Nahrungsobjekte -USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen -MEAL_GROUPS=Mahlzeit-Gruppen -FOODS=Ern\u00E4hrung -TASK=Aufgabe -SETTINGS=Einstellungen -CONFIGURATION=Configuration -COLOR_SCHEMES=Color Schemes - -# restore -RESTORE_DB_TITLE=Wiederherstellung der GGC-Datenbank -RESTORE_DB_TITLE_SHORT=Datenbankwiederherstellung -RESTORE=Wiederherstellen -RESTORE_NOT_STARTED_YET=Wiederherstellung wurde noch nicht gestarted. -RESTORE_SELECTOR_DESC=<html>Select file from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html> -SELECT_ELEMENTS_TO_RESTORE=Elemente zum Wiederherstellen w\u00E4hlen: -DAILY_VALUES_APPEND=<html>Wollen Sie diese Werte an die vorhandenen Tageswerte anhängen? Falls die Datenbank diese Einträge bereits enthält, könnten diese dadurch dupliziert werden. Neue Einträge werden ohne Vergleich mit bereits existierenden hinzugefügt.</html> -FILE_FILTER_DBE=*.dbe - Datenbank Export Dateien -FILE_FILTER_ZIP=*.zip - Archiv (sollte *.dbe enthalten) -SELECT_FILE_TO_RESTORE=Wiederherzustellende Datei ausw\u00E4hlen -NEXT_STEP=Weiter - -# -# Update [1] -# -LEGEND=Legende -NEWEST=Neueste Version -NOT_UPDATED=Nicht aktualisiert -NOT_UPDATABLE=Nicht aktualisierbar -UNKNOWN_STATUS=Unbekannter Status -CHECK_SERVER=Server \u00FCberpr\u00FCfen -RUN_UPDATE=Aktualisieren! -CURRENT_VERSION=Aktuelle Version -SERVER_VERSION=Version auf dem Server -UPDATEABLE=Aktualisierbarkeit -UPDATE_APPLICATION=Aktualisierung der Anwendung -UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html> -NO_UPDATE_FOUND=No update was found on server! -UPDATE_FOR_HIGHER_DB_FOUND=<html><body>No update for current database was found !<br>But there is version of application (%s)<br>for higher version of database. Since we<br>don't support update of database yet, we<br>can't continue update.<br></body></html> -UPDATE_FOUND_VERSION=<html><body>We found update (%s) for your<br>version of database.<br>Do you wish to continue?</body></html> -UPDATE_FOUND_ALSO_HIGHER_DB=<html><body>We found two updates. One with higher version of<br>database (%s) and other with the same. Since we<br>don't support update of database yet, we can update<br>only to version %s.<br>Do you wish to continue?</body></html> -STATUS_UPD_FAILED_DATA=Data problem. -STATUS_UPD_FAILED_COMM_ERROR=Communication failed. -STATUS_UPD_NO_VALID_UPDATE=No valid update found. -STATUS_UPD_NO_UPDATE=No update found. -STATUS_UPD_UPDATE_FOUND=Update found. -SERVER_STATUS=Server status -NO_STATUS=No status - -# -# Db Check [1] -# -DB_ERROR_ON_LOAD=Fehler beim initialisieren der Datenbank -DB_HEADER=<html>Das DB-Prüfwerkzeug hat festgestellt, dass Sie eine falsche Datenbankversion verwenden.<br><br>Aktuelle DB-Version: %s<br>Benötigte DB-Version: %s<br><br>%s<html> -DB_VERSION_LOWER=Die gegenw\u00E4rtige Version ist kleiner als die ben\u00F6tigte. Das bedeutet,<br>dass Sie zu einer Version geupdated haben, die selbst geupdated werden muss.<br>Um diesen Fehler zu beheben, m\u00FCssen Sie das Verzechnis gehen, das die Sicherungskopie Ihres GGCs enh\u00E4lt<br>(wie in der Anleitung beschrieben), dieses ausf\u00FChren und eine Sicherung erstellen<br>(falls Sie das nicht schon gemacht haben). Danach m\u00FCssen Sie das init_db Skript ausf\u00FChren,<br>das die neue Version der Datenbank erstellen wird. Starten Sie GGC und stellen Sie die Datenbank<br>anhand der vorher erstellten Sicherungskopie wieder her.<br>Ihre Applikation sollte jetzt wieder alle Daten enthalten.<br> -DB_VERSION_HIGHER=Die gegenw\u00E4rtige Version ist gr\u00F6\u00DFer als die ben\u00F6tigte. Dies kann zwei Gr\u00FCnde haben:<br><br>1. Es gabe ein Problem bei der Installation oder beim Update (Dateien fehlten oder das Update wurde unterbrochen).<br>Nach einem Teil-Update wurde die Datenbank geupdated. War dies der Fall, muss das Update wiederholt<br>(ALLE Dateien neu kopiert/installiert) und GGC erneut ausgef\u00FChrt werden.<br><br>2. Ein Downgrade wurde versucht. Dies wird nicht unterst\u00FCzt. Wollen Sie eine \u00E4ltere Version benutzen,<br>m\u00FCssen Sie eine komplette Sicherungskopie erstellen, die Anwendung in ein anderes Verzeichnis installieren und<br>die Daten wiederherstellen. Dieses Problem kann auch durch das Einspielen eines Updates behoben werden.<br> - -# -# Error Dialog [1] -# -ERROR_DIALOG=Fehlerdialog -DETAILS=Details -ERROR_SOLUTION=L\u00F6sung -EXCEPTION_LOG=Exception (Stacktrace) -SEND_TO_SERVER=An den Server senden -SENDING_TO_SERVER=Sende an den Server... -SEND_TO_SERVER_TEXT=<html>Diese Funktionalität wurde noch nicht implementiert.<br>Später können Sie uns hiermit Fehlerberichte senden und<br>Lösungsvorschläge erhalten (falls welche existieren).<br></html> -NO_SOLUTION_AVAILABLE=<html>Keine Lösung verfügbar.</html> - -# -# Plug-In [1] -# -DEVICE_METER=Meter -DEVICE_PUMP=Pumpe -DEVICE_CGMS=CGMS -PLUGIN_NOT_INSTALLED=Plugin nicht installiert. -PLUGIN_NA=Plugin nicht verf\u00FCgbar. -PLUGIN_NO_FUNCTIONALITY=Diese Funktionalit\u00E4t wird nicht unterst\u00FCtzt. -DEVICES_USED=Verwendete Ger\u00E4te (eing... [truncated message content] |
From: <and...@us...> - 2016-12-25 13:37:37
|
Revision: 1420 http://sourceforge.net/p/ggc/code/1420 Author: andyrozman Date: 2016-12-25 13:37:33 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Core - moved files into new maven structure Added Paths: ----------- trunk/ggc-core/src/main/java/ggc/ trunk/ggc-core/src/main/java/ggc/core/data/DailyValuesRow.java trunk/ggc-core/src/main/java/ggc/core/data/ExtendedDailyValueHandler.java trunk/ggc-core/src/main/java/ggc/core/data/ExtendedDailyValueType.java trunk/ggc-core/src/main/java/ggc/core/data/defs/DailyValuesExtendedType.java trunk/ggc-core/src/main/java/ggc/core/db/GGCDb.java trunk/ggc-core/src/main/java/ggc/core/db/GGCDbConfig.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodDescriptionH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodGroupH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodUserDescriptionH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodUserGroupH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/MealGroupH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/MealH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/NutritionDefinitionH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/NutritionHomeWeightTypeH.java trunk/ggc-core/src/main/java/ggc/core/db/tool/DbToolApplicationGGC.java trunk/ggc-core/src/main/java/ggc/core/db/tool/InitDb.java trunk/ggc-core/src/main/java/ggc/core/db/tool/data/ trunk/ggc-core/src/main/java/ggc/core/db/tool/defs/ trunk/ggc-core/src/main/java/ggc/core/db/tool/impexp/ trunk/ggc-core/src/main/java/ggc/core/db/tool/init/ trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportDailyValues.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportNutritionDb.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportSettings.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCExporter.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCImporter.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportDailyValues.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportNutrition.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportSettings.java trunk/ggc-core/src/main/java/ggc/core/doc/util/DataAccessDoc.java trunk/ggc-core/src/main/java/ggc/core/test/ImportDacioDb.java trunk/ggc-core/src/main/java/ggc/core/util/DataAccess.java trunk/ggc-core/src/main/java/ggc/shared/Test.java trunk/ggc-core/src/main/resources/GGC_CGMS.hbm.xml trunk/ggc-core/src/main/resources/GGC_Main.hbm.xml trunk/ggc-core/src/main/resources/GGC_New.hbm.xml trunk/ggc-core/src/main/resources/GGC_Nutrition.hbm.xml trunk/ggc-core/src/main/resources/GGC_Other.hbm.xml trunk/ggc-core/src/main/resources/GGC_Pump.hbm.xml trunk/ggc-core/src/main/resources/GGC_de.properties trunk/ggc-core/src/main/resources/GGC_en.properties trunk/ggc-core/src/main/resources/GGC_fr.properties trunk/ggc-core/src/main/resources/GGC_si.properties trunk/ggc-core/src/main/resources/log4j.properties Removed Paths: ------------- trunk/ggc-core/src/GGC_CGMS.hbm.xml trunk/ggc-core/src/GGC_Main.hbm.xml trunk/ggc-core/src/GGC_New.hbm.xml trunk/ggc-core/src/GGC_Nutrition.hbm.xml trunk/ggc-core/src/GGC_Other.hbm.xml trunk/ggc-core/src/GGC_Pump.hbm.xml trunk/ggc-core/src/GGC_de.properties trunk/ggc-core/src/GGC_en.properties trunk/ggc-core/src/GGC_fr.properties trunk/ggc-core/src/GGC_si.properties trunk/ggc-core/src/ggc/ trunk/ggc-core/src/log4j.properties trunk/ggc-core/src/main/java/ggc/core/data/DailyValuesRow.java trunk/ggc-core/src/main/java/ggc/core/data/ExtendedDailyValueHandler.java trunk/ggc-core/src/main/java/ggc/core/data/defs/DailyValuesExtendedType.java trunk/ggc-core/src/main/java/ggc/core/db/GGCDb.java trunk/ggc-core/src/main/java/ggc/core/db/GGCDbConfig.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodDescriptionH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodGroupH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodUserDescriptionH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodUserGroupH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/MealGroupH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/MealH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/NutritionDefinitionH.java trunk/ggc-core/src/main/java/ggc/core/db/hibernate/food/NutritionHomeWeightTypeH.java trunk/ggc-core/src/main/java/ggc/core/db/tool/DbToolApplicationGGC.java trunk/ggc-core/src/main/java/ggc/core/db/tool/DbToolInitDbGGC.java trunk/ggc-core/src/main/java/ggc/core/db/tool/InitDb.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportDailyValues.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportNutritionDb.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportSettings.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCExporter.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCImporter.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportDailyValues.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportNutrition.java trunk/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportSettings.java trunk/ggc-core/src/main/java/ggc/core/doc/util/DataAccessDoc.java trunk/ggc-core/src/main/java/ggc/core/test/ImportDacioDb.java trunk/ggc-core/src/main/java/ggc/core/util/DataAccess.java Deleted: trunk/ggc-core/src/GGC_CGMS.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_CGMS.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core/src/GGC_CGMS.hbm.xml 2016-12-25 13:37:33 UTC (rev 1420) @@ -1,39 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** ggc::CGM SCHEMA ******************* --> - - - <!-- CGMS Data --> - <class name="ggc.core.db.hibernate.cgms.CGMSDataH" table="cgm_data" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="base_type" type="int" /> - <property name="sub_type" type="int" /> - <property name="value" type="string" length="2000" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - - <!-- Pump Data Additional Info--> - <class name="ggc.core.db.hibernate.cgms.CGMSDataExtendedH" table="cgm_data_ext" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="type" type="int" /> - <property name="value" type="string" length="2000" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - -</hibernate-mapping> Deleted: trunk/ggc-core/src/GGC_Main.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Main.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core/src/GGC_Main.hbm.xml 2016-12-25 13:37:33 UTC (rev 1420) @@ -1,81 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** ggc::Main SCHEMA ******************* --> - - - <!-- ****************************************** --> - <!-- *** Patient Data **** --> - <!-- ****************************************** --> - - <!-- DayValueH: last_change=[db=7] --> - <class name="ggc.core.db.hibernate.DayValueH" table="data_dayvalues"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="bg" type="int"/> - <property name="ins1" type="int"/> - <property name="ins2" type="int"/> - <property name="ch" type="float"/> - <property name="meals_ids" type="text"/> - <property name="extended" type="text"/> - <property name="person_id" type="int" not-null="true"/> - <property name="comment" type="string" length="2000"/> - <property name="changed" type="long" not-null="false"/> - </class> - - - <!-- ****************************************** --> - <!-- *** Configuration **** --> - <!-- ****************************************** --> - - <!-- SettingsH: last_change=[db=7] --> - <class name="ggc.core.db.hibernate.SettingsH" table="cfg_settings"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="key" column="el_key" type="string" length="44" not-null="true"/> - <property name="value" column="el_value" type="string" length="255"/> - <property name="type" type="int"/> - <!-- 1-string, 2-int, 3=float --> - <property name="description" type="string" length="255"/> - <property name="person_id" type="int" not-null="true"/> - </class> - - - <!-- ColorSchemeH: last_change=[db=7] --> - <class name="ggc.core.db.hibernate.ColorSchemeH" table="cfg_colorscheme"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="50"/> - <property name="custom_type" type="int"/> - <property name="color_bg" type="int"/> - <property name="color_bg_avg" type="int"/> - <property name="color_bg_low" type="int"/> - <property name="color_bg_high" type="int"/> - <property name="color_bg_target" type="int"/> - <property name="color_ins" type="int"/> - <property name="color_ins1" type="int"/> - <property name="color_ins2" type="int"/> - <property name="color_ins_perbu" type="int"/> - <property name="color_ch" type="int"/> - </class> - - - <!-- - <class name="ggc.core.db.hibernate.DbInfoH" table="db_info"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="key" column="el_key" type="string" length="44" not-null="true"/> - <property name="value" column="el_value" type="string" length="255"/> - <property name="type" type="int"/> - <! 1-string, 2-int, 3=float --> - <!-- <property name="description" type="string" length="255"/> - </class> --> - - -</hibernate-mapping> Deleted: trunk/ggc-core/src/GGC_New.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_New.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core/src/GGC_New.hbm.xml 2016-12-25 13:37:33 UTC (rev 1420) @@ -1,136 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- - Mappings put here and for new functionalities that were not "deployed" yet. This is read only if you start - GGC with dev parameter (on development database with correct columns). If you try to use this on production - Db you will get exception and GGC won't start. - --> - - - <!-- ****************************************** --> - <!-- *** Stocks **** --> - <!-- ****************************************** --> - - <!-- Stock types --> - <!-- - <class name="ggc.core.db.hibernate.StockTypeH" table="stock_types"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="1000" /> - <property name="name_i18n" type="string" length="1000" /> - </class> - --> - - - <class name="ggc.core.db.hibernate.StockSubTypeH" table="stock_subtypes"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="stockTypeId" column="stock_type_id" type="java.lang.Long"/> - <property name="name" type="java.lang.String" length="512"/> - <property name="description" type="java.lang.String" length="2000"/> - <property name="packageContent" column="package_content" type="java.lang.Long"/> - <property name="packageContentUnit" column="package_content_unit" type="java.lang.String" length="100"/> - <property name="usageUnit" column="usage_unit" type="java.lang.Integer"/> - <property name="usageMin" column="usage_min" type="java.lang.Integer"/> - <property name="usageMax" column="usage_max" type="java.lang.Integer"/> - <property name="active" type="java.lang.Boolean"/> - <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/> - <property name="extended" type="text"/> - <property name="comment" type="java.lang.String" length="2000"/> - </class> - - <class name="ggc.core.db.hibernate.StockH" table="stock_stocks"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - - <!-- <property name="stockSubtypeId" column="stock_subtype_id" type="java.lang.Long" /> --> - - <many-to-one name="stockSubtype" class="ggc.core.db.hibernate.StockSubTypeH" fetch="select"> - <column name="stock_subtype_id" not-null="true"/> - </many-to-one> - - <property name="stocktakingId" column="stocktaking_id" type="java.lang.Long"/> - <property name="amount" type="java.lang.Long"/> - <property name="location" type="java.lang.String" length="1000"/> - <property name="validFrom" column="valid_from" type="java.lang.Long"/> - <property name="validTill" column="valid_till" type="java.lang.Long"/> - - <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/> - <property name="extended" type="text"/> - <property name="comment" type="java.lang.String" length="2000"/> - </class> - - - <class name="ggc.core.db.hibernate.StocktakingH" table="stock_stocktaking"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="datetime" column="dt_stocktaking" type="java.lang.Long"/> - <property name="description" type="java.lang.String" length="2000"/> - - <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/> - <property name="extended" type="text"/> - <property name="comment" type="java.lang.String" length="2000"/> - <property name="changed" type="java.lang.Long"/> - </class> - - - <!-- ****************************************** --> - <!-- *** Doctors **** --> - <!-- ****************************************** --> - - - <!-- Doctor types --> - <class name="ggc.core.db.hibernate.doc.DoctorTypeH" table="doc_types"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="1000"/> - <property name="predefined" type="int"/> - </class> - - <!-- Doctor --> - <class name="ggc.core.db.hibernate.doc.DoctorH" table="doc_doctors"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <many-to-one name="doctorType" column="doctor_type_id" class="ggc.core.db.hibernate.doc.DoctorTypeH" - lazy="false"/> - <property name="name" type="string" length="100"/> - <property name="address" type="string" length="2000"/> - <property name="phoneGsm" column="phone_gsm" type="string" length="500"/> - <property name="phone" type="string" length="500"/> - <property name="email" type="string" length="500"/> - <property name="workingTime" column="working_time" type="text"/> - <property name="activeFrom" column="active_from" type="long"/> - <property name="activeTill" column="active_till" type="long"/> - <property name="extended" type="text"/> - <property name="personId" column="person_id" type="int" not-null="true"/> - <property name="comment" type="string" length="4000"/> - </class> - - <!-- Appointment --> - <class name="ggc.core.db.hibernate.doc.DoctorAppointmentH" table="doc_appointment"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <many-to-one name="doctor" class="ggc.core.db.hibernate.doc.DoctorH" lazy="false"/> - <property name="dt_apoint" type="long" not-null="true"/> - <property name="apoint_text" type="string" length="1000"/> - <property name="extended" type="text"/> - <property name="personId" column="person_id" type="int" not-null="true"/> - <property name="comment" type="string" length="4000"/> - </class> - - - <!-- ****************************************** --> - <!-- *** Connect **** --> - <!-- ****************************************** --> - - -</hibernate-mapping> \ No newline at end of file Deleted: trunk/ggc-core/src/GGC_Nutrition.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Nutrition.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core/src/GGC_Nutrition.hbm.xml 2016-12-25 13:37:33 UTC (rev 1420) @@ -1,112 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** GGC::Nutrition SCHEMA ******************* --> - - - <!-- Nutrition Definition - Global --> - <class name="ggc.core.db.hibernate.food.NutritionDefinitionH" table="nutrition_definition"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="weight_unit" type="string" length="50"/> - <property name="tag" type="string" length="50"/> - <property name="name" type="string" length="100"/> - <property name="decimal_places" type="text" length="10"/> - <property name="static_entry" type="int"/> - </class> - - <!-- Nutrition Home Weight Type - Global --> - <class name="ggc.core.db.hibernate.food.NutritionHomeWeightTypeH" table="nutrition_home_weight_type"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="static_entry" type="int"/> - </class> - - - <!-- Food Group - Nutrition 1 --> - <class name="ggc.core.db.hibernate.food.FoodGroupH" table="nutrition_usda_food_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="1000"/> - </class> - - - <!-- Food Description - - Nutrition 1--> - <class name="ggc.core.db.hibernate.food.FoodDescriptionH" table="nutrition_usda_food_description"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="group_id" type="long"/> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="refuse" type="float"/> - <property name="nutritions" type="text"/> - <property name="home_weights" type="text"/> - </class> - - - <!-- Food Group - Nutrition 2 --> - <class name="ggc.core.db.hibernate.food.FoodUserGroupH" table="nutrition_user_food_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="1000"/> - <property name="parent_id" type="long"/> - <property name="changed" type="long" not-null="false"/> - </class> - - - <!-- Food Description - - Nutrition 2--> - <class name="ggc.core.db.hibernate.food.FoodUserDescriptionH" table="nutrition_user_food_description"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="group_id" type="long"/> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="1000"/> - <property name="refuse" type="float"/> - <property name="nutritions" type="text"/> - <property name="home_weights" type="text"/> - <property name="changed" type="long" not-null="false"/> - </class> - - - <class name="ggc.core.db.hibernate.food.MealGroupH" table="meal_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="2000"/> - <property name="parent_id" type="long"/> - <property name="changed" type="long" not-null="false"/> - </class> - - <class name="ggc.core.db.hibernate.food.MealH" table="meal_meal"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="group_id" type="long"/> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="2000"/> - <property name="parts" type="text"/> - <!-- 1:x=1.0;2:y;1:z --> - <!-- type:id type=[1=Nutrition USDBA, 2=Nutrition User ]; id = id in db --> - <property name="nutritions" type="text"/> - <property name="extended" type="text"/> - <property name="comment" type="string" length="2000"/> - <property name="changed" type="long" not-null="false"/> - </class> - -</hibernate-mapping> Deleted: trunk/ggc-core/src/GGC_Other.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Other.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core/src/GGC_Other.hbm.xml 2016-12-25 13:37:33 UTC (rev 1420) @@ -1,48 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** ggc::Other SCHEMA ******************* --> - - <class name="ggc.core.db.hibernate.inet.InetGroupH" table="inet_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="parent" type="string" length="255"/> - - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="2000"/> - <property name="comment" type="string" length="2000"/> - </class> - - - <class name="ggc.core.db.hibernate.inet.InetTypeH" table="inet_type"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255"/> - <property name="name_i18n" type="string" length="255"/> - <property name="description" type="string" length="2000"/> - <property name="comment" type="string" length="2000"/> - </class> - - <class name="ggc.core.db.hibernate.inet.InetLinkGroupH" table="inet_link_group"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="group_id" type="string" length="1000"/> - <property name="link_id" type="string" length="1000"/> - </class> - - <class name="ggc.core.db.hibernate.inet.InetLinkH" table="inet_link"> - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="1000"/> - <property name="description" type="string" length="2000"/> - <property name="comment" type="string" length="2000"/> - </class> - - -</hibernate-mapping> Deleted: trunk/ggc-core/src/GGC_Pump.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Pump.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core/src/GGC_Pump.hbm.xml 2016-12-25 13:37:33 UTC (rev 1420) @@ -1,54 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" > -<hibernate-mapping> - - <!-- ***************** ggc::Pump SCHEMA ******************* --> - - - <!-- Pump Data --> - <class name="ggc.core.db.hibernate.pump.PumpDataH" table="pump_data" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="base_type" type="int" /> - <property name="sub_type" type="int" /> - <property name="value" type="string" length="2000" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - <!-- Pump Data Additional Info--> - <class name="ggc.core.db.hibernate.pump.PumpDataExtendedH" table="pump_data_ext" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="dt_info" type="long" not-null="true"/> - <property name="type" type="int" /> - <property name="value" type="string" length="2000" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - <!-- Pump Profile --> - <class name="ggc.core.db.hibernate.pump.PumpProfileH" table="pump_profile" > - <id name="id" type="long" unsaved-value="0"> - <generator class="org.hibernate.id.AssignedIncrementGenerator"/> - </id> - <property name="name" type="string" length="255" /> - <property name="basal_base" type="float" /> - <property name="basal_diffs" type="text" /> - <property name="active_from" type="long" /> - <property name="active_till" type="long" /> - <property name="extended" type="text" /> - <property name="person_id" type="int" not-null="true" /> - <property name="comment" type="string" length="2000" /> - <property name="changed" type="long" not-null="false" /> - </class> - - -</hibernate-mapping> Deleted: trunk/ggc-core/src/GGC_de.properties =================================================================== --- trunk/ggc-core/src/GGC_de.properties 2016-12-25 13:33:49 UTC (rev 1419) +++ trunk/ggc-core/src/GGC_de.properties 2016-12-25 13:37:33 UTC (rev 1420) @@ -1,843 +0,0 @@ -# -# ###################################################################### -# ### GNU Glucose Control ### -# ###################################################################### -# ### Language: German ### -# ### Created by: Reinhold Rumberger (ru...@us...)### -# ### Version: 0.5 ### -# ### Last change: 02.05.2013 11:05:20 ### -# ###################################################################### -# -# -# Translation status: -# Words/expressions: 648 -# Not translated: 96 (15 %) -# Need to be checked: 110 (17 %) -# -# Translated: 442 (68 %) -# -# -# -## GGC Core# -# Collation Rules - In unicode we can create special rules for sorting where we specify -# sorting order of special characters. This will be used by tree's and special tables. -# For english this is left empty. For all other (that have non-standard, non english -# charcters) we need to set this if we want sorting to be done correctly. -# -COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z - -# -# GGC - Globally used [1] -# -DELETE=L\u00F6schen -ADD=Hinzuf\u00FCgen -EDIT=Bearbeiten -NEW=Neu -EDIT_DEL_SHORT=Bearb./L\u00F6schen -FEATURE=Feature -IMPLEMENTED_VERSION=wird in Version %s implementiert -OR=oder -INFORMATION=Information -QUESTION=Frage -YES=Ja -NO=Nein -COMMING_IN_VERSION=Kommt in Version %s -NOT_WORKING_100PRO=Funktioniert noch nicht zu 100% -NOT_TESTED_100PRO=Noch nicht zu 100% getestet -NOT_USED=Nicht verwendet - -# -# ggc.datamodels [1] -# -NO_NAME=Kein Name -TIME=Zeit -BG=BZ -INS_1=Ins1 -INS_2=Ins2 -INS_3=Ins3 -INSULIN_1=Insulin 1 -INSULIN_2=Insulin 2 -INSULIN_3=Insulin 3 -BU=KH -ACT=Ac. -COMMENT=Kommentar -DATE_MUST_BE_IN_FORMAT=Datum muss folgendes Format haben -TIME_MUST_BE_IN_FORMAT=Zeit muss folgendes Format haben -ERROR_PARSING_DATE=Fehler beim Einlesen des Datums -DATETIME=Datum/Zeit -PUMP_INSULIN=Pumpen-Insulin - -# -# Main Frame (Info panels) & Other places [1] -# - -# general -BG_TARGET=BZ-Ziel - -# hba1c -NO_EXPRESSIVENESS=Keine Aussagekraft -LITTLE_EXPRESSIVENESS=Geringe Aussagekraft -STANDARD_EXPRESSIVENESS=Mittlere Aussagekraft -GOOD_EXPRESSIVENESS=Hohe Aussagekraft - -# -# Daily Values Stats [1] -# - -# main -CH_LONG=Kohlehydrate -ACTIVITY=Bewegung -FOOD=Lebensmittel -UPDATE_FROM_FOOD=KH aktualisieren -EDIT_FOOD=Lebensmittel Db [1] -DATE_TIME=Datum/Zeit -FOOD_SET=Lebensmittelgruppe [%s] - -# meals -FOOD_BY_DESCRIPTION=Beschreibung [2] -FOOD_BY_DESCRIPTION_TITLE=Nahrungsmittel nach Beschreibung -DESCRIBE_FOODS=<html><b>Beschreiben Sie Nahrungsmittel, die Sie gegessen haben</b> (wenn Sie KH in eckige Klammern [] einschließen, künnen KH automatisch errechnet werden)</html> -CALCULATE=Berechnen -NO_DESCRIPTIONS_WITH_CH=Es wurden keine Beschreibungen mit KH-Definitionen\nim Nahrungsbeschreibungsbereich gefunden.\nSollten Sie einen Fehler gemacht haben,\nbearbeiten Sie den Text noch einmal.\n -CH=KH - -# -# Main GUI Panels [1] -# -ADD_ROW=Neuer Eintrag -EDIT_ROW=Eintrag \u00E4ndern -CLOSE=Schlie\u00DFen -COURSE_GRAPH=Verlaufsdiagramm -SPREAD_GRAPH=Spread Graph -TO_BE_DRAWN=Einzuzeichnen -CONNECT_VALUES_FOR_ONE_DAY=Werte eines Tages verbinden -SUM_BU=Summe KH -SUM=Summe -SUM_INSULIN=Summe IE -AVG_BG_PER_DAY=mittlerer BZ pro Tag -INS_PER_DAY=Ins. pro Tag -MEALS=Mahlzeiten -INS_SLASH_BU=Ins/KH -DRAW=Zeichnen -DAILYGRAPHFRAME=Tagesdiagramm -DAILYSTATSFRAME=Tagesstatistiken -SAVE=Speichern -DELETE_ROW=Eintrag L\u00F6schen -LOWEST=Niedrigster -STD_DEV=Std. Abw. -READINGS=Werte -HIGHEST=H\u00F6chster -AVG_BG=Mittl. BZ -BLOOD_GLUCOSE=Blutzucker -BREAD_UNITS=Broteinheiten -AVG=Mittl. -INSULIN=Insulin -URINE=Urin -DOSE=Dosis -TOTAL=Summe -AVG_INS=Mittl. IE -DOSE_INS=Insulindosis -CANCEL=Abbrechen -OK=OK -HELP=Hilfe -ADD_NEW_VALUES=Neue Werte eintragen -COURSEGRAPHFRAME=Verlaufsdiagramm -FREQGRAPHFRAME=Frequenzdiagramm -GRAPH=Diagramm -ADD_NEW_ROW_TO_TABLE=F\u00FCgt eine neue Wertereihe in die Tabelle ein. -DELETE_SELECTED_ROWS=L\u00F6sche ausgew\u00E4hlte Zeilen. -SELECT_ROW_FIRST=Bitte zuerst einen Eintrag ausw\u00E4hlen! -READINGS_SLASH_DAY=Werte/Tag -VALUATION=Wertung -INIT=Initialisierung -READY=Fertig -UNKNOWN=Unbekannt -COMMENTS=Anmerkungen -ARE_YOU_SURE_DELETE=Wollen Sie diesen Eintrag wirklich l\u00F6schen? -ARE_YOU_SURE_DELETE_ROW=Wollen Sie diesen Eintrag wirklich l\u00F6schen? - -# -# GGC Little (GUI) [2] -# -DAILY_VALUES=Tageswerte -SHOW_DAILY_GRAPH=Diagramm anzeigen -DAILY_CONTROL=Daily Control -MN_QUIT_LT_DESC=GGC Little beenden -CURRENT_DATE_HAS_CHANGED=Das Datum hat sich ge\u00E4ndert! Ihre Aktion wird deshalb verworfen und die Tabelle aktualisiert! -TB_ADD_ROW_DESC=Neuer Eintrag f\u00FCr diesen Tag -TB_EDIT_ROW_DESC=Eintrag f\u00FCr diesen Tag bearbeiten -TB_DELETE_ROW_DESC=Eintrag f\u00FCr diesen Tag l\u00F6schen -TB_READ_METER_LT_DESC=Daten vom Me\u00DFger\u00E4t auslesen -TB_ABOUT_DESC=\u00DCber GGC Little -TB_SHOW_GRAPH_DESC=Diagramm f\u00FCr diesen Tag anzeigen -GGC_LITTLE_TITLE=GNU Gluco Control Little -TAB_CONTROL=Steuerung -TAB_SCHEDULE=Terminplan -TAB_PLUGIN=Plug-ins -TAB_STOCKS=Bestand -PLUGIN_IMPLEMENTED_VERSION=Dieses Plug-in wird in Version %s implementiert! -METER_PLUGIN_PANEL=Me\u00DFger\u00E4te-Plug-in -PUMP_PLUGIN_PANEL=Pumpen-Plug-in - -# -# GGC Little (System Tray) [3] -# -SHOW_APP=Anzeigen -SHOW_APP_DESC=GGC Little anzeigen -HIDE_APP=Verstecken -HIDE_APP_DESC=GGC Little verstecken -EXIT_APP=Beenden -EXIT_APP_DESC=GGC Little beenden - -# -# Menus (BE CAREFUL about mnemonics used) Set mnemonic with & before mnemonic letter [1] -# - -# main menus -MN_FILE=&Datei -MN_DATA=Pen/Spritze -MN_DATA_GRAPH=Diagramme -MN_DOCTOR=&Arzt -MN_FOOD=&Ern\u00E4hrung -MN_PRINTING=D&rucken -MN_TOOLS=&Werkzeuge -MN_HELP=&Hilfe - -# file -MN_LOGIN=Ein&loggen -MN_LOGIN_DESC=Patient einloggen -MN_LOGOUT=Ausl&oggen -MN_LOGOUT_DESC=Ausloggen -MN_QUIT=B&eenden -MN_QUIT_DESC=GGC beenden - -# data -MN_DAILY=&Tages\u00FCbersicht -MN_DAILY_DESC=Tagesstatistik betrachten -MN_COURSE=&Verlauf -MN_COURSE_DESC=Verlauf betrachten -MN_SPREAD=Ver&teilung -MN_SPREAD_DESC=Verteilung betrachten -MN_FREQUENCY=&Frequenz -MN_FREQUENCY_DESC=Wertefrequenz betrachten -MN_HBA1C=&HbA1c -MN_HBA1C_DESC=HbA1c betrachten -MN_DATA_RATIO=Verh\u00E4ltnis -MN_DATA_RATIO_DESC=Verh\u00E4ltnis-Einstellungen -MN_RATIO_BASE=Basis -MN_RATIO_BASE_DESC=Basisverh\u00E4ltniseinstellungen (1 pro Tag) -MN_RATIO_EXTENDED=Erweitert -MN_RATIO_EXTENDED_DESC=Erweiterte Verh\u00E4ltniseinstellungen (mehr als 1 pro Tag) -MN_RATIO_CALC=&Verh\u00E4ltnisrechner -MN_RATIO_CALC_DESC=Berechnet verschiedene Verh\u00E4ltnisse (Insulin/KH, ...) - -# tools -MN_DB_MAINT=&Datenbank-Wartung -MN_DB_MAINT_DESC=Funktionen f\u00FCr die Wartung der Datenbank -MN_DB_BACKUP=Datenbank &sichern -MN_DB_BACKUP_DESC=Sichert die GGC-Datenbank -MN_DB_RESTORE=Datenbank &wiederherstellen -MN_DB_RESTORE_DESC=Stellt die GGC-Datenbank anhand einer Sicherung wieder her -MN_MISC_SYNCHRONIZE=&Synchronisierung -MN_MISC_SYNCHRONIZE_DESC=Datenabgleich mit anderen GGC Instanzen -MN_PREFERENCES=&Einstellungen -MN_PREFERENCES_DESC=Einstellungen - -# help -MN_ABOUT=\u00DC&ber -MN_ABOUT_DESC=\u00DCber GGC -MN_CHECK_FOR_UPDATE=Nach &Updates suchen -MN_CHECK_FOR_UPDATE_DESC=Pr\u00FCft, ob eine neue Version verf\u00FCgbar ist - -# food -MN_NUTRDB_USDB=N\u00E4hrstoff-DB (&USDA) -MN_NUTRDB_USDB_DESC=Datenbank mit N\u00E4hrstoff-Informationen, ver\u00F6ffentlicht vom USDA -MN_NUTRDB_USER=N\u00E4hrstoff-DB (&Benutzer) -MN_NUTRDB_USER_DESC=N\u00E4hrstoff-Datenbank des Benutzers -MN_MEALS=&Mahlzeiten-DB -MN_MEALS_DESC=Datenbank mit vollst\u00E4ndigen Mahlzeiten - -# printing -MN_REPORTS=&Data -MN_REPORTS_DESC=Selbstkontrolldaten-Berichte -MN_PDF_SIMPLE=&Einfach -MN_PDF_SIMPLE_DESC=Einfacher PDF-Bericht (monatl.) -MN_PDF_EXT=&Ausf\u00FChrlich -MN_PDF_EXT_DESC=Ausf\u00FChrlicher PDF-Bericht (monatl.) - -# doctors -MN_DOCS=\u00C4&rzte -MN_DOCS_DESC=\u00C4rzte -MN_APPOINT=&Termine -MN_APPOINT_DESC=Termine f\u00FCr Arztbesuche -MN_STOCKS=&Bestand -MN_STOCKS_DESC=Bestand medizinischer Ausr\u00FCstung - -# -# ggc.gui.calendar [2] -# -ENDING_DATE=Enddatum -STARTING_DATE=Startdatum -1_WEEK=1 Woche -1_MONTH=1 Monat -3_MONTHS=3 Monate -CUSTOM=Benutzerdefiniert -DATE_RANGE_SELECTOR=Wahl des Zeitraumes -SU=So -MO=Mo -TU=Di -WE=Mi -TH=Do -FR=Fr -SA=Sa -JANUARY=Januar -FEBRUARY=Februar -MARCH=M\u00E4rz -APRIL=April -MAY=Mai -JUNE=Juni -JULY=Juli -AUGUST=August -SEPTEMBER=September -OCTOBER=Oktober -NOVEMBER=November -DECEMBER=Dezember - -# -# Main GUI Panels [1] -# -GENERAL_INFORMATION=Allgemeine Informationen -YOUR_NAME=Ihr Name -BOLUS_INSULIN=Bolusinsulin -BASAL_INSULIN=Basalinsulin -GLUCOMETER=Messger\u00E4t -BG_UNIT=Ma\u00DFeinheit -HBA1C=HbA1c -YOUR_CURRENT_HBA1C=Ihr aktueller HbA1c -NO_READINGS=Keine Werte -NO_DATASOURCE=Keine Datenquelle -SCHEDULE=Terminplan -YOUR_NEXT_APPOINTMENT=Ihr n\u00E4chster Termin -APP_WILL_BE_FOUND_HERE=wird hier zu finden sein... -STATISTICS_FOR_LAST_WEEK=Statistiken f\u00FCr vorige Woche -BG_STATISTICS=BZ Statistiken -BU_STATISTICS=KH Statistiken -BU_PER_DAY=KH pro Tag -AVG_MEAL_SIZE=KH pro Mahlzeit -MEALS_PER_DAY=Mahlzeiten pro Tag -STATISTICS=Statistiken -PER_DAY=pro Tag -AVG_DOSE_SIZE=Mittl. Dosis -DOSES_PER_DAY=Dosen pro Tag -OTHER_INFO=Sonstiges -STOCK=Bestand -STOCK_DATA_HERE=Daten zu Ihrer medizinischen Ausr\u00FCstung -STO_WILL_BE_FOUND_HERE=wird hier zu finden sein... -NOT_YET=BISHER NOCH NICHT! -BOLUS_INSULIN_SHORT=Bolus -BASAL_INSULIN_SHORT=Basal -AVERAGE=Durchschnitt -DOSES=Dosen - -# -# Hba1c Dialog [1] -# -CALCULATED_HBA1C=Errechneter HbA1c - -# -# Configuration [1] -# -APPLY=Anwenden -ERROR=Fehler -INVALID_NAME=Ung\u00FCltiger Name -PREFERENCES=Einstellungen -GENERAL=Allgemeines -MEDICAL_DATA=Medizinische Daten -COLORS_AND_FONTS=Farbe & Schrift -RENDERING_QUALITY=Darstellungsqualit\u00E4t -SOME_VALUES_CHANGED_LIKE_TO_SAVE=Einige Werte haben sich ge\u00E4ndert. Wollen Sie diese speichen? -VALUES_CHANGED=Ge\u00E4nderte Werte -CHOOSE_A_COLOR=W\u00E4hlen Sie eine Farbe -BG_HIGH_ZONE=\u00DCberzuckerbereich -BG_TARGET_ZONE=Zielbereich -BG_LOW_ZONE=Unterzuckerbereich -BG_AVERAGE=BZ Mittelwert -INS_SLASH_BU_QUOTIENT=Ins/KH -NAME=Name -ABBR=Abk. -HIGH_BG=\u00DCberzuckergrenze -LOW_BG=Unterzuckergrenze -TARGET_HIGH_BG=Obergrenze Zielbereich -TARGET_LOW_BG=Untergrenze Zielbereich -INSULIN_SETTINGS=Insulineinstellungen -BLOOD_GLUCOSE_SETTINGS=Blutzuckereinstellungen -BLOOD_GLUCOSE_UNIT_SETTING=BZ-Einheiteneinstellungen -BLOOD_GLUCOSE_SETTINGS_1=BZ-Einstellungen (mg/dl) -BLOOD_GLUCOSE_SETTINGS_2=BZ-Einstellungen (mmol/l) -HOST=Host -PORT=Port -USERNAME=Benutzername -PASSWORD=Passwort -OPTIONS=Optionen -ANTIALIASING=Kantengl\u00E4ttung -COLOR_RENDERING=Farbdarstellung -DITHERING=Dithering -FRACTIONAL_METRICS=Fractional Metrics -INTERPOLATION=Interpolation -TEXT_ANTIALIASING=Kantengl\u00E4ttung Schrift -RENDERING=Darstellung -DE=Deutsch -EN=Englisch -SI=Slowenisch -YOUR_LANGUAGE=Ihre Sprache -COLOR_SCHEME_SELECT=Farbschemawahl -SELECTED_COLOR_SCHEME=Gew\u00E4hltes Farbschema -NEW_SCHEME=Neues Schema -COLORS=Farben -COLOR_SCHEME_PREDEFINED=Die Farbe eines vordefinierten Farbschemas kann nicht ver\u00E4ndert werden. -USE_AS_TEMPLATE=Folgendes Schema als Vorlage benutzen -CREATE_NEW_SCHEME=Neues Schema erstellen -EDIT_DELETE_SCHEME=Schema Bearbeiten/L\u00F6schen -TYPE_NAME_BEFORE=Geben Sie den Name ein und klicken Sie OK. -SCHEME_NAME_ALREADY_USED=Dieses Schema existiert bereits!\nBitte w\u00E4hlen Sie einen anderen Namen. -PREDEFINED_SCHEME_CANT_BE_CHANGED=Der Name eines vordefinierten Schemas kann nicht ge\u00E4ndert, und das Schema nicht gel\u00F6scht werden! -EXECUTABLE_FILES=Ausf\u00FChrbare Dateien (*.exe) -SELECT_PDF_VIEWER=Wahl des PDF-Betrachters -COLOR_PREVIEW=Farbschema Vorschau -ACTION=Aktion -ACTION_DELETE=L\u00F6schen -ACTION_EDIT=Bearbeiten -SELECTED_SCHEME=Aktives Schema -NEW_NAME=Neuer Name -SELECT_ACTION_OR_CANCEL=Sie sollten eine Aktion oder 'Abbrechen' w\u00E4hlen -GENERAL_SETTINGS=Allgemeine Einstellungen -DATABASE_SETTINGS=Datenbank -DATABASE_SETTINGS_DESC=<html><body><b><i>Warnung! \u00C4ndern Sie diese Einstellung nur wenn Sie wissen, was Sie tun!</i></b><br>Die meisten Daten und Einstellungen befinden sich in der Datenbank selbst. In der Konfigurationsdatei befinden sich nur Einstellungen zu Sprache, Datenbank und Look&Feel.<br><i>\u00C4nderungen werden sich erst nach einem Neustart auswirken.</i></body></html> -SELECTED_DATABASE=Gew\u00E4hlte Datenbank -LAF_SETTINGS=Look & Feel Einstellungen -LAF_SETTINGS_DESC=<html><body><i>\u00C4nderungen werden sich erst nach einem Neustart von GGC auswirken.</i></body></html> -SELECTED_LAF_TYPE_NAME=L&F w\u00E4hlen (Name) -SELECTED_LAF_TYPE_CLASS=L&F w\u00E4hlen (Klasse) -SELECTED_SKINLF_DEF=Gew\u00E4hlter Skin f\u00FCr SkinLF -SELECT_SKINLF_SKIN=W\u00E4hlen Sie eine Oberfl\u00E4che f\u00FCr die Skin L&F-Bibliothek -SELECT=Ausw\u00E4hlen... -BASIC_SETTINGS=Grundeinstellungen -EMPTY_VALUE=Leerer Wert -PDF_VIEWER_SETTINGS=PDF-Betrachter Einstellungen -PDF_VIEWER=PDF-Betrachter -BROWSE=Ausw\u00E4hlen... -LUNCH_START_TIME=Mittagszeit ab (hh:mm) -DINNER_START_TIME=Abendszeit ab (hh:mm) -NIGHT_START_TIME=Nacht ab (hh:mm) - -# Mode -MODE=Modus -APPLICATION_MODE=Anwendungsmodus -PEN_INJECTION_MODE=Pen-/Spritzen-Modus -PUMP_MODE=Pumpenmodus -APPLICATION_MODE_DESC=<html><body>Der Modus unterbindet nicht die Verwendung von Teilen der Anwendung. Er w\u00E4hlt nur die richtigen Daten f\u00FCr die Anzeige der Statistiken und die richtigen Symbole f\u00FCr die Toolbar aus.</body></html> -PEN_INJECTION_MODE_SETTINGS=Pen-/-Spritzmodus Einstellungen -PUMP_MODE_SETTINGS=Pumpenmodus Einstellungen -BASAL_PRECISSION=Basaldosis Genauigkeit -BOLUS_PRECISSION=Bolusdosis Genauigkeit -MAX_BASAL=Max. Basaldosis -MAX_BOLUS=Max. Bolusdosis -TBR_TYPE_SELECTOR=Tempor\u00E4rer Basalratentyp -TBR_TYPE_BOTH=Beide -TBR_TYPE_UNIT=Einheit (U) -TBR_TYPE_PROC=Prozent (%) -TBR_TYPE_CHOICE=Choice in GGC -PROCENT_MIN=Prozent Min. -UNIT_MIN=Einheit Min. -TASK_MIN=Min -TASK_MAX=Max -TASK_STEP=Schritt - -# Language -LANGUAGE=Sprache -LANGPACK_VERSION=Sprachpaket -LANG_WITH_HELP=Sprachen mit Hilfe -LANG_WITHOUT_HELP=Sprachen ohne Hilfe -SELECT_LANGUAGE=Sprachwahl -NO_HELP_AVAILABLE=Keine Hilfe verf\u00FCgbar -HELP_AVAILABLE=Hilfe verf\u00FCgbar -LANG_DESC=<html><body>Die Übersetzung der Anwendung findet getrennt von deren Entwicklung statt, weshalb die Übersetzung meistens etwas veraltet ist. Übersetzungen werden vor allem von Freiwilligen außerhalb des Projekts gepflegt, deshalb sind wir nicht direkt für Fehler in der Übersetzung, oder wann die n\u00E4chste Übersetzung verfügbar ist verantwortlich. Wenn Sie Fehler finden, können Sie uns gerne kontaktieren und wir werden sie baldmöglichst beheben.<br>Wenn etwas noch nicht übersetzt wurde, wird der Ausdruck in der Standardsprache (Englisch) angezeigt.<br>Wenn Sie bei der Übersetzung helfen wollen, kontaktieren Sie uns bitte via E-Maill: gg...@at....</body></html> -NOTE_RESTART=<html><body><b>Warnung:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html> -NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><b>Warnung:</b>Dieses Feature ist noch nicht aktiviert. Bis auf weiteres verwenden Sie bitte die Sprachwahl im Allgemeines-Reiter. Wenn dieses Feature aktiviert wird, wird diese Warnung und die Sprachwahl im Allgemeines-Reiter entfernt.</font></body></html> - -# -# ggc.util [6] -# -UNNAMED_USER=Unbekannter Benutzer -THIS_FILE_WAS_AUTOMATICALY_GENERATED=Diese Datei wurde automatisch generiert. -YOUR_VERSION=Ihre Version -AVAILABLE_VERSION=Verf\u00FCgbare Version -NO_NEW_VERSION=Keine aktuellere Version verf\u00FCgbar. -CHECK_FOR_NEW_VERSION=Auf neue Version \u00FCberpr\u00FCfen -HOST_UNAVAILABLE_INFO=Server nicht verf\u00FCgbar -HOST_UNAVAILABLE_MSG=Konnte nicht mit ggc.sourceforge.net verbinden! - -# -# Graphs [2] -# -DAYS_WITH_READINGS_0_1=Tage mit 0 oder 1 Messung -DAYS_WITH_READINGS_2_3=Tage mit 2 oder 3 Messungen -DAYS_WITH_READINGS_4_5=Tage mit 4 oder 5 Messungen -DAYS_WITH_READINGS_6_7=Tage mit 6 oder 7 Messungen -DAYS_WITH_READINGS_MORE_7=Tage mit 8+ Messungen -AXIS_TIME_LABEL=Zeit (Std) -AXIS_VALUE_LABEL=BZ (%s) -FORMAT_DATE_DAYS=dd.MM.yyyy -FORMAT_DATE_HOURS=HH:mm -GRAPH_NO_DATA_AVAILABLE_CHANGE=Keine Daten verf\u00FCgbar. W\u00E4hlen Sie eine andere Zeitspanne und/oder zu zeichnende Elemente und klicken Sie "Zeichnen"! - -# -# Database Tool [5] -# -DB_TOOL=Database Hibernate Tool -DB_CONFIGURATION=Datenbankeinstellungen -DB_PRESS_HELP=Klicken Sie auf den Hilfe-Knopf um detaillierte Informationen zu den Verbindungseinstellungen zu bekommen. -DB_CONFIG_DESC=<html><head></head><body><p>Dieses Tool ist daf\u00FCr da, Ihre Datenbank f\u00FCr diese Anwendung zu konfigurieren. Bitte setzen Sie alle Einstellungsmöglichkeiten korrekt und versuchen Sie dann, eine Verbindung mit der Datenbank herzustellen (Benutzername, Passwort und Datenbank Name müssen korrekt sein). Ist der Verbindungsversuch erfolgreich, stimmen die Einstellungen.</p><p>Jetzt sind Sie bereit, Tabellen mit Hilfe von Hibernate zu erstellen.. Sie müssen alle JARs zum Classpath hinzufügen, bevor Sie die zweite Option (Datenbank initialisieren) starten. Sie müssen vorsichtig sein! Wenn Sie die Datenbank bereits eingerichtet und mit Daten befüllt haben, wird "Datenbank initialisieren" alle Daten zerstören.<p><body><html> -DATABASE_TYPE=DB-Typ -DATABASE_CLASSNAME=DB-Klasse -HIBERNATE_DIALECT=Hibernate Dialekt -JDBC_URL=JDBC URL -HOSTNAME=Hostname -DATABASE=Datenbank - -# -# Printing - Base [2] -# -PRINTING=Drucken -TYPE_OF_REPORT=Berichttyp -SELECT_YEAR_AND_MONTH=Monat w\u00E4hlen -REPORT_FOOTER=Dieser Bericht stammt von "GGC - GNU Gluco Control", frei verf\u00FCgbar unter http://ggc.sourceforge.net -FOR=F\u00FCr -PRINTING_SETTINGS_NOT_SET=<html>Druckeinstellungen (PDF-Anzeigeprogramm) nicht gesetzt oder inkorrekt.</html> -PRINTING_SETTINGS_NOT_SET_SOL=<html>Gehen Sie zu Werkzeuge->Einstellungen->Drucken<br>und geben Sie den Pfad zum PDF-Anzeigeprogramm an.</html> -PDF_VIEVER_RUN_ERROR=<html>Fehler beim Aufruf des PDF-Anzeigeprogramms:<br>Unbekannter Fehler</html> -SELECT_STARTING_RANGE=Select starting range -SELECT_ENDING_RANGE=Select ending range - -# -# Printing [2] -# -INS_SHORT=Ins -CH_SHORT=KH -BREAKFAST=Fr\u00FChst\u00FCck -LUNCH=Mittagessen -DINNER=Abendessen -NIGHT=Nacht -SIMPLE_MONTHLY_REPORT=Einfacher Bericht (monatl.) -EXTENDED_MONTHLY_REPORT=Ausf\u00FChrlicher Bericht (monatl.) -FOOD_MENU_BASE=Food Menu Base (CH only) -FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins) -FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG) -FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ) - -# -# Stocks [5] -# -STOCKS=Bestand - -# -# Appointments [5] -# -APPOINTMENTS=Arzttermine - -# -# About [1] -# -SYSTEM_PROPERTIES=Systemeigenschaften -ABOUT=\u00DCber -PROPERTY=Eigenschaft -VALUE=Wert -LICENCE=Lizenz: -CREDITS=Mitwirkende -LIBRARIES=Bibliotheken -MAIN=Main -ABOUT_GGC=\u00DCber GNU Gluco Control -GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam -SEE_CREDITS=(siehe Mitwirkende) -GGC_TITLE=GNU Gluco Control -CURRENT_DEVELOPERS=Aktive Entwickler -PREVIOUS_DEVELOPERS=Ehemalige Entwickler - -# -# Doctor types [5] -# -ADDICTION_MEDICINE=Addiction Medicine -ADOLESCENT_MEDICINE=Adolescent Medicine -AIDS_HIV_CARE=AIDS/HIV Care -ANESTHESIOLOGY=Anesthesiology -ASTHMA_ALLERGY_IMMUNOLOGY=Asthma, Allergy & Immunology -BREAST_CANCER_SURGERY=Brustkrebschirurgie -CARDIAC_SURGERY=Herzchirurgie -CHILD_CARE=Child care (pediatrics) -CARDIOLOGY=Kardiologie -COLORECTAL_SURGERY=Colorectal Surgery -COSMETIC_SURGERY=Cosmetic Surgery -CRITICAL_CARE=Critical Care -DENTAL_SPECIALTIES=Dental Specialties -DERMATOLOGY=Dermatologie -DIABETES=Diabetes -EMERGENCY_MEDICINE=Emergency Medicine -ENDOCRINOLOGY=Endokrinologie -EPILEPSY=Epilepsie -FAMILY_MEDICINE=Family Medicine -GASTROENTEROLOGY=Gastroenterologie -GENERAL_SURGERY=Allgemeine Chirurgie -GENERAL_INTERNAL_MEDICINE=General Internal Medicine -GERIATRICS=Geriatrics -GYNECOLOGIC_ONCOLOGY=Gyn\u00E4kologische Onkologie -GYNECOLOGY=Gyn\u00E4kologie -HAND_SURGERY=Hand Surgery -HEAD_AND_NECK_SURGERY=Head and Neck Surgery -HEADACHE=Headache -HEMATOLOGY=H\u00E4matologie -HOSPITAL_INTERNAL_MEDICINE=Hospital Internal Medicine -INFECTIOUS_DISEASES=Infectious Diseases -INFERTILITY_MEDICINE=Infertility Medicine -INTERNAL_MEDICINE=Internal Medicine -LABORATORY_MEDICINE=Laboratory Medicine -MIDWIFE=Midwife (CNM) -MEDICAL_GENETICS=Medical Genetics -METABOLISM=Stoffwechsel -MOVEMENT_DISORDERS=Movement Disorders -NEONATOLOGY=Neonatology -NEPHROLOGY=Nephrologie -NEUROLOGY=Neurologie -NEURO_OPTHALMOLOGY=Neuro-ophthalmology -NEUROSURGERY=Neurochirurgie -NUCLEAR_MEDICINE=Nuclear Medicine -NUTRITION_MEDICINE=Nutrition Medicine -OBSTETRICS_AND_GYNECOLOGY=Geburtshilfe und Gyn\u00E4kologie -ONCOLOGY_MEDICAL=Oncology Medical -ONCOLOGY_RADIATION=Oncology Radiation -OPTHALMOLOGY=Augenheilkunde -ORAL_MAXILLOFACIAL_SURGERY=Oral/Maxillofacial Surgery -ORTHOPEDIC_SURGERY=Orthopedic Surgery -OTOLARYNGOLOGY=Otolaryngology (ENT) -OTOLOGY=Otology -PAIN_MANAGEMENT=Pain Management -PATHOLOGY=Pathologie -PEDIATRIC=Kinderheilkunde -PEDIATRIC_SPECIALISTS=Pediatric Specialists -PERINATOLOGY=Geburtshilfe -PHYSIATRY=Physiatry -PHYSICAL_REHABILITATION=Physical Rehabilitation -PLASTIC_RECONSTRUCTIVE_SURGERY=Plastic/Reconstructive Surgery -PODIATRY=Fu\u00DForthop\u00E4die -PROSTATE_CARE=Prostate Care -PSYCHIATRY=Psychiatrie -PSYCHOLOGY=Psychologie -PULMONARY_MEDICINE=Pulmonary Medicine -RADIOLOGY=Radiologie -RADIATION_ONCOLOGY=Radiation Oncology -REPRODUCTIVE_ENDOCRINOLOGY_INFERTILITY=Reproductive Endocrinology and Infertility -RHEUMATOLOGY=Rheumatologie -SLEEP_DISOREDERS=Schlafst\u00F6rungen -SPORTS_MEDICINE=Sportmedizin -THORACIC_SURGERY=Thoracic Surgery -TRANSPLANT=Transplantation -UROLOGY=Urologie -VASCULAR_SURGERY=Gef\u00E4\u00DFchirurgie - -# -# Doctor [5] -# -DOCTORS=\u00C4rzte -FILTER=Filter -FILTER_VISIBLE=Sichtbare -FILTER_ALL=Alle - -# -# Ratio's: Base [1] -# -RATIO_BASE=Grundverh\u00E4ltnis -INSULIN_CARB_RATIO=Insulin/KH-Verh\u00E4ltnis -SENSITIVITY_FACTOR_LONG=<html>Empfindlichkeitsfaktor<br>(Insulin/BZ-Verh\u00E4ltnis)</html> -FILL_RATIO_ENTRIES=<html>Bitte f¨llen Sie die ersten beiden Einträge dieses Formulars aus,<br>oder brechen Sie den Vorgang ab.</html> - -# -# Ratio's: Extended [1] -# -RATIO_EXTENDED=Erweitertes Verh\u00E4ltnis -RATIO_ENTRY_ADD=Neuer Verh\u00E4ltniseintrag -RATIO_ENTRY_EDIT=Verh\u00E4ltniseintrag bearbeiten -TIME_FROM=Von -TIME_TILL=Bis -PROCENT_OF_BASE=Prozent (der Basis) -PROCENT_OF_BASE_SHORT=% der Basis -CH_INSULIN_RATIO_SHORT=KH/Ins -BG_INSULIN_RATIO_SHORT=BZ/Ins -BG_OH_RATIO_SHORT=BZ/KH -CHECK_RATIOEXTENDED_DATA_OK=<html><body>You filled all data about<br>extended ratio's for whole<br>day successfuly !<br></body></html> -CHECK_RATIOEXTENDED_FAILED=<html><body>You filled data about extended<br>ratio's incorrectly. All minutes<br>of the day must be included (from<br>0:00 till 23:59)!<br></body></html> - -# -# Ratio's: Calculator [4] -# -RATIO_CALCULATOR=Verh\u00E4ltnisrechner -TYPE_SOURCE_DATA=Art der Quelldaten -TYPE_SOURCE_MANUAL=Manuelle Daten -TYPE_SOURCE_DB=Datenbank Daten -TDD_FOR_CALCULATION=Total Daily Dose (TDD) For Calculation -RATIO_TIME_SELECT_DESC=<html>Sie müssen einen Zeitraum für die Rechnung wählen. Sind Ihre Werte stabil (keine größeren Änderungen), dürfte ein größerer Zeitraum bessere Resultate liefern. Gibt es jedoch größere Änderungen, oder befinden Sie sich mitten in einer Bolus-/Basalratenneueinstellung, sollten Sie einen kleineren Zeitraum wählen.</html> -2_WEEKS=2 Wochen -3_WEEKS=3 Wochen -DB_DATA_STATUS=Db Data Status -DB_DATA_NOT_READY=Nicht bereit! -DB_DATA_READY=Bereit -GET_DATA=Daten abrufen -RULE_500=500er-Regel (schnellwirkende Insuline) -RULE_450=450er-Regel (Normalinsuline) -RULE_300=300er-Regel (kleine Kinder) -RULE_1800=1800er-Regel (schnellwirkende Insuline) -RULE_1500=1500er-Regel (Normalinsuline) -SELECT_RANGE=Zeitraum w\u00E4hlen -SELECT_RULE=Regel w\u00E4hlen -SENSITIVITY_FACTOR=Empfindlichkeitsfaktor -CALCULATION=Rechnung -INS_CH_RATIO_PROC=1E Insulin f\u00FCr %s g KH -INS_BG_RATIO=Ins/BZ-Verh\u00E4ltnis -INS_BG_RATIO_PROC=1E Insulin verringert den BZ um %s %s -CH_BG_RATIO=KH/BZ-Verh\u00E4ltnis -CH_BG_RATIO_PROC=1 %s Zunahme f\u00FCr %s g KH -TDD_MUST_BE_GREATER_THAN_ZERO=<html><body>Total Daily Dose (TDD) must be greater than<br>zero. Recheck the value and start calculation<br>again.</body></html> -RATIO_CALCULATOR_NOT_IMPLEMENTED=<html><body>This part of Ratio Calculator not implemented<br>yet.</body></html> -RATIOS_NOT_DONE=<html><body>You never run calculation of Ratio's.<br>Either run it and click OK to transfer<br>calculated data, or use Cancel to exit.</body></html> -RATIO_DB_IMPORT_NA=<html><body>Importing data from Db, doesn't work yet.<br>You can only enter data manually.</body></html> - -# -# Bolus Helper [1] -# -BOLUS_HELPER=Bolus Helper -READ_RATIOS=Read Ratios -CH_INSULIN_RATIO=CH / Insulin Ratio -BG_INSULIN_RATIO=BG / Insulin Ratio -BG_OH_RATIO=BG / CH Ratio -CORRECTION_DOSE=Correction Dose -CARB_DOSE=Dose for covering CH -TOGETHER=Together -TOGETHER_ROUNDED=Together (rounded) -NO_BG_MEASURE=No BG measurment. -NO_CARBS_DEFINED=CH not set. -UNIT_SHORT=U - -# -# Tools [1] -# -METERS_PLUGIN=Messger\u00E4te-Plug-in -PUMPS_PLUGIN=Pumpen-Plug-in -CGMS_PLUGIN=CGMS Tool Plug-in -NUTRITION_PLUGIN=Nutrition Tool Plug-in -STATUS_NOT_INSTALLED=Nicht installiert -STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00FCgbar) -STATUS_INSTALLED=Installiert (Version %s) -PLUGIN_NOT_INSTALLED_OR_AVAILABLE=%s nicht installiert und/oder verf\u00FCgbar. - -# -# Backup/Restore [1] -# - -# backup -BACKUP=Sicherung -BACKUP_DB_TITLE=Sicherung der GGC-Datenbank -BACKUP_DB_TITLE_SHORT=Datenbanksicherung -SELECT_ELEMENTS_TO_BACKUP=W\u00E4hlen Sie die zu sichernden Elemente - -# progress -TOTAL_PROGRESS=Fortschritt insgesamt -BACKUP_NOT_STARTED_YET=Sicherung wurde noch nicht gestartet. -CURRENT_TASK=Aktuelle Aufgabe -NO_TASK_STARTED=Keine Aufgabe - -# elements -GGC_BACKUP=GGC-Sicherung -NUTRITION_OBJECTS=Nahrungsobjekte -USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen -MEAL_GROUPS=Mahlzeit-Gruppen -FOODS=Ern\u00E4hrung -TASK=Aufgabe -SETTINGS=Einstellungen -CONFIGURATION=Configuration -COLOR_SCHEMES=Color Schemes - -# restore -RESTORE_DB_TITLE=Wiederherstellung der GGC-Datenbank -RESTORE_DB_TITLE_SHORT=Datenbankwiederherstellung -RESTORE=Wiederherstellen -RESTORE_NOT_STARTED_YET=Wiederherstellung wurde noch nicht gestarted. -RESTORE_SELECTOR_DESC=<html>Select file from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html> -SELECT_ELEMENTS_TO_RESTORE=Elemente zum Wiederherstellen w\u00E4hlen: -DAILY_VALUES_APPEND=<html>Wollen Sie diese Werte an die vorhandenen Tageswerte anhängen? Falls die Datenbank diese Einträge bereits enthält, könnten diese dadurch dupliziert werden. Neue Einträge werden ohne Vergleich mit bereits existierenden hinzugefügt.</html> -FILE_FILTER_DBE=*.dbe - Datenbank Export Dateien -FILE_FILTER_ZIP=*.zip - Archiv (sollte *.dbe enthalten) -SELECT_FILE_TO_RESTORE=Wiederherzustellende Datei ausw\u00E4hlen -NEXT_STEP=Weiter - -# -# Update [1] -# -LEGEND=Legende -NEWEST=Neueste Version -NOT_UPDATED=Nicht aktualisiert -NOT_UPDATABLE=Nicht aktualisierbar -UNKNOWN_STATUS=Unbekannter Status -CHECK_SERVER=Server \u00FCberpr\u00FCfen -RUN_UPDATE=Aktualisieren! -CURRENT_VERSION=Aktuelle Version -SERVER_VERSION=Version auf dem Server -UPDATEABLE=Aktualisierbarkeit -UPDATE_APPLICATION=Aktualisierung der Anwendung -UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html> -NO_UPDATE_FOUND=No update was found on server! -UPDATE_FOR_HIGHER_DB_FOUND=<html><body>No update for current database was found !<br>But there is version of application (%s)<br>for higher version of database. Since we<br>don't support update of database yet, we<br>can't continue update.<br></body></html> -UPDATE_FOUND_VERSION=<html><body>We found update (%s) for your<br>version of database.<br>Do you wish to continue?</body></html> -UPDATE_FOUND_ALSO_HIGHER_DB=<html><body>We found two updates. One with higher version of<br>database (%s) and other with the same. Since we<br>don't support update of database yet, we can update<br>only to version %s.<br>Do you wish to continue?</body></html> -STATUS_UPD_FAILED_DATA=Data problem. -STATUS_UPD_FAILED_COMM_ERROR=Communication failed. -STATUS_UPD_NO_VALID_UPDATE=No valid update found. -STATUS_UPD_NO_UPDATE=No update found. -STATUS_UPD_UPDATE_FOUND=Update found. -SERVER_STATUS=Server status -NO_STATUS=No status - -# -# Db Check [1] -# -DB_ERROR_ON_LOAD=Fehler beim initialisieren der Datenbank -DB_HEADER=<html>Das DB-Prüfwerkzeug hat festgestellt, dass Sie eine falsche Datenbankversion verwenden.<br><br>Aktuelle DB-Version: %s<br>Benötigte DB-Version: %s<br><br>%s<html> -DB_VERSION_LOWER=Die gegenw\u00E4rtige Version ist kleiner als die ben\u00F6tigte. Das bedeutet,<br>dass Sie zu einer Version geupdated haben, die selbst geupdated werden muss.<br>Um diesen Fehler zu beheben, m\u00FCssen Sie das Verzechnis gehen, das die Sicherungskopie Ihres GGCs enh\u00E4lt<br>(wie in der Anleitung beschrieben), dieses ausf\u00FChren und eine Sicherung erstellen<br>(falls Sie da... [truncated message content] |
From: <and...@us...> - 2016-12-25 13:33:52
|
Revision: 1419 http://sourceforge.net/p/ggc/code/1419 Author: andyrozman Date: 2016-12-25 13:33:49 +0000 (Sun, 25 Dec 2016) Log Message: ----------- Core - mvn structure Added Paths: ----------- trunk/ggc-core/src/main/ trunk/ggc-core/src/main/java/ trunk/ggc-core/src/main/resources/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 13:20:32
|
Revision: 1418 http://sourceforge.net/p/ggc/code/1418 Author: andyrozman Date: 2016-12-25 13:20:29 +0000 (Sun, 25 Dec 2016) Log Message: ----------- Core 0.8.0 - DailyValuesExtended changes - hibernate objects - changes for DbTool implementation: init, export - GGC Db changes Modified Paths: -------------- trunk/ggc-core/src/GGC_Main.hbm.xml trunk/ggc-core/src/GGC_en.properties trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java trunk/ggc-core/src/ggc/core/data/ExtendedDailyValueHandler.java trunk/ggc-core/src/ggc/core/data/defs/DailyValuesExtendedType.java trunk/ggc-core/src/ggc/core/db/GGCDb.java trunk/ggc-core/src/ggc/core/db/GGCDbConfig.java trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodDescriptionH.java trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodGroupH.java trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserDescriptionH.java trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserGroupH.java trunk/ggc-core/src/ggc/core/db/hibernate/food/MealGroupH.java trunk/ggc-core/src/ggc/core/db/hibernate/food/MealH.java trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionDefinitionH.java trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionHomeWeightTypeH.java trunk/ggc-core/src/ggc/core/db/tool/DbToolApplicationGGC.java trunk/ggc-core/src/ggc/core/db/tool/InitDb.java trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportDailyValues.java trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportNutritionDb.java trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportSettings.java trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCExporter.java trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCImporter.java trunk/ggc-core/src/ggc/core/db/tool/transfer/ImportDailyValues.java trunk/ggc-core/src/ggc/core/db/tool/transfer/ImportNutrition.java trunk/ggc-core/src/ggc/core/db/tool/transfer/ImportSettings.java trunk/ggc-core/src/ggc/core/doc/util/DataAccessDoc.java trunk/ggc-core/src/ggc/core/test/ImportDacioDb.java trunk/ggc-core/src/ggc/core/util/DataAccess.java Added Paths: ----------- trunk/ggc-core/src/ggc/core/data/ExtendedDailyValueType.java trunk/ggc-core/src/ggc/core/db/tool/data/ trunk/ggc-core/src/ggc/core/db/tool/data/GGCDatabaseTableConfiguration.java trunk/ggc-core/src/ggc/core/db/tool/data/GGCDatabaseVersionConfiguration.java trunk/ggc-core/src/ggc/core/db/tool/defs/ trunk/ggc-core/src/ggc/core/db/tool/defs/GGCImportExportContext.java trunk/ggc-core/src/ggc/core/db/tool/impexp/ trunk/ggc-core/src/ggc/core/db/tool/impexp/DbImportExportDto.java trunk/ggc-core/src/ggc/core/db/tool/impexp/GGCDbExportConverter.java trunk/ggc-core/src/ggc/core/db/tool/impexp/GGCDbExporter.java trunk/ggc-core/src/ggc/core/db/tool/impexp/GGCDbImportConverter.java trunk/ggc-core/src/ggc/core/db/tool/impexp/GGCDbImporter.java trunk/ggc-core/src/ggc/core/db/tool/init/ trunk/ggc-core/src/ggc/core/db/tool/init/DbToolApplicationInitDbGGC.java trunk/ggc-core/src/ggc/core/db/tool/init/GGCCustomDbInitTasks.java trunk/ggc-core/src/ggc/core/db/tool/init/GGCDbToolInitDbRunner.java trunk/ggc-core/src/ggc/core/db/tool/init/InitDb2.java trunk/ggc-core/src/ggc/core/db/tool/init/tasks/ trunk/ggc-core/src/ggc/core/db/tool/init/tasks/GGCInitDbSettings.java trunk/ggc-core/src/ggc/shared/Test.java Removed Paths: ------------- trunk/ggc-core/src/ggc/core/db/tool/DbToolInitDbGGC.java Modified: trunk/ggc-core/src/GGC_Main.hbm.xml =================================================================== --- trunk/ggc-core/src/GGC_Main.hbm.xml 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/GGC_Main.hbm.xml 2016-12-25 13:20:29 UTC (rev 1418) @@ -9,7 +9,7 @@ <!-- *** Patient Data **** --> <!-- ****************************************** --> - <!-- Day values --> + <!-- DayValueH: last_change=[db=7] --> <class name="ggc.core.db.hibernate.DayValueH" table="data_dayvalues"> <id name="id" type="long" unsaved-value="0"> <generator class="org.hibernate.id.AssignedIncrementGenerator"/> @@ -31,7 +31,7 @@ <!-- *** Configuration **** --> <!-- ****************************************** --> - + <!-- SettingsH: last_change=[db=7] --> <class name="ggc.core.db.hibernate.SettingsH" table="cfg_settings"> <id name="id" type="long" unsaved-value="0"> <generator class="org.hibernate.id.AssignedIncrementGenerator"/> @@ -45,6 +45,7 @@ </class> + <!-- ColorSchemeH: last_change=[db=7] --> <class name="ggc.core.db.hibernate.ColorSchemeH" table="cfg_colorscheme"> <id name="id" type="long" unsaved-value="0"> <generator class="org.hibernate.id.AssignedIncrementGenerator"/> @@ -63,6 +64,8 @@ <property name="color_ch" type="int"/> </class> + + <!-- <class name="ggc.core.db.hibernate.DbInfoH" table="db_info"> <id name="id" type="long" unsaved-value="0"> <generator class="org.hibernate.id.AssignedIncrementGenerator"/> @@ -70,9 +73,9 @@ <property name="key" column="el_key" type="string" length="44" not-null="true"/> <property name="value" column="el_value" type="string" length="255"/> <property name="type" type="int"/> - <!-- 1-string, 2-int, 3=float --> - <property name="description" type="string" length="255"/> - </class> + <! 1-string, 2-int, 3=float --> + <!-- <property name="description" type="string" length="255"/> + </class> --> </hibernate-mapping> Modified: trunk/ggc-core/src/GGC_en.properties =================================================================== --- trunk/ggc-core/src/GGC_en.properties 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/GGC_en.properties 2016-12-25 13:20:29 UTC (rev 1418) @@ -1156,3 +1156,14 @@ # IMPORT_FILE=Import file +# +# !G! Db Tool Configuration +# +DBTT_SETTINGS=Settings +DBTT_DOCTOR_TYPES=Doctor Types +DBTT_FOOD_GROUPS=Food Groups +DBTT_FOOD_DESCRIPTION=Food Description +DBTT_NUTRITION_DATA=Food Nutrition Data +DBTT_HOME_WEIGHT_TYPES=Home Weight Types +DBTT_HOME_WEIGHT_DATA=Food Home Weight Data +DBTT_NUTRITION_DEFINITIONS=Nutrition Definitions Modified: trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java =================================================================== --- trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -1,16 +1,16 @@ package ggc.core.data; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.Map; import java.util.StringTokenizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.atech.db.ext.ExtendedCapable; -import com.atech.db.ext.ExtendedHandler; +import com.atech.db.ext.ExtendedEnumHandler; import com.atech.utils.ATDataAccessAbstract; import com.atech.utils.data.ATechDate; import com.atech.utils.data.ATechDateType; @@ -82,26 +82,23 @@ ConfigurationManagerWrapper configurationManagerWrapper = m_da.getConfigurationManagerWrapper(); boolean debug = false; - HashMap<String, String> ht_extended = new HashMap<String, String>(); + ExtendedEnumHandler extendedHandler = null; + Map<ExtendedDailyValueType, String> mapExtended = new HashMap<ExtendedDailyValueType, String>(); public DailyValuesRow() { - this.datetime = null; - this.bg = 0; - this.ins1 = 0; - this.ins2 = 0; - this.ch = 0.0f; - this.extended = null; - this.comment = ""; - - this.ht_extended = this.getExtendedHandler().loadExtended(extended); + this(0L, 0, 0, 0, 0.0f, null, ""); } public DailyValuesRow(long datetime, int bg, int ins1, int ins2, float ch, String extended, String comment) { - this.datetime = new ATechDate(ATechDateType.DateAndTimeMin, datetime); + if (datetime == 0) + this.datetime = null; + else + this.datetime = new ATechDate(ATechDateType.DateAndTimeMin, datetime); + this.bg = bg; this.ins1 = ins1; this.ins2 = ins2; @@ -109,21 +106,22 @@ this.extended = extended; this.comment = comment; - this.ht_extended = this.getExtendedHandler().loadExtended(extended); + setExtendedHandler(); + this.mapExtended = this.extendedHandler.loadExtended(extended); } public DailyValuesRow(long datetime, int bg, int ins1, int ins2, float ch, String activity, String urine, String comment) { - // loadExtended(); + setExtendedHandler(); this.datetime = new ATechDate(ATechDateType.DateAndTimeMin, datetime); this.bg = bg; this.ins1 = ins1; this.ins2 = ins2; this.ch = ch; - this.setExtendedValue(ExtendedDailyValueHandler.EXTENDED_ACTIVITY, activity, false); - this.setExtendedValue(ExtendedDailyValueHandler.EXTENDED_URINE, urine, false); + this.setExtendedValue(ExtendedDailyValueType.Activity, activity, false); + this.setExtendedValue(ExtendedDailyValueType.Urine, urine, false); // this.activity = activity; // this.urine = urine; this.comment = comment; @@ -142,32 +140,41 @@ this.comment = dv.getComment(); m_dv = dv; - this.ht_extended = this.getExtendedHandler().loadExtended(extended); + + setExtendedHandler(); + this.mapExtended = this.extendedHandler.loadExtended(extended); } - public DailyValuesRow(long datetime, String BG, String Ins1, String Ins2, String CH, String act, String urine, - String Comment, ArrayList<String> lst_meals) + // public DailyValuesRow(long datetime, String BG, String Ins1, String Ins2, + // String CH, String act, String urine, + // String Comment, ArrayList<String> lst_meals) + // { + // setExtendedHandler(); + // this.datetime = new ATechDate(ATechDateType.DateAndTimeMin, datetime); + // this.bg = DataAccess.getIntValueFromString(BG, 0); + // this.ins1 = dataAccess.getIntValueFromString(Ins1, 0); + // this.ins2 = dataAccess.getIntValueFromString(Ins2, 0); + // this.ch = dataAccess.getIntValueFromString(CH, 0); + // + // this.setExtendedValue(ExtendedDailyValueType.Activity, act, false); + // this.setExtendedValue(ExtendedDailyValueType.Urine, urine, false); + // + // // this.meals = dv.getMeals_ids(); + // // this.extended = dv.getExtended(); + // this.comment = Comment; + // + // } + + private void setExtendedHandler() { - this.datetime = new ATechDate(ATechDateType.DateAndTimeMin, datetime); - this.bg = DataAccess.getIntValueFromString(BG, 0); - this.ins1 = m_da.getIntValueFromString(Ins1, 0); - this.ins2 = m_da.getIntValueFromString(Ins2, 0); - this.ch = m_da.getIntValueFromString(CH, 0); - - this.setExtendedValue(ExtendedDailyValueHandler.EXTENDED_ACTIVITY, act, false); - this.setExtendedValue(ExtendedDailyValueHandler.EXTENDED_URINE, urine, false); - - // this.meals = dv.getMeals_ids(); - // this.extended = dv.getExtended(); - this.comment = Comment; - + this.extendedHandler = (ExtendedEnumHandler) m_da.getExtendedHandler("DailyValuesRow"); } public boolean areMealsSet() { - if (m_da.isValueSet(this.meals) || this.isExtendedValueSet(ExtendedDailyValueHandler.EXTENDED_FOOD_DESCRIPTION)) + if (m_da.isValueSet(this.meals) || this.isExtendedValueSet(ExtendedDailyValueType.FoodDescription)) return true; else return false; @@ -183,7 +190,7 @@ { if (m_da.isValueSet(this.meals)) return 1; - else if (this.isExtendedValueSet(ExtendedDailyValueHandler.EXTENDED_FOOD_DESCRIPTION)) + else if (this.isExtendedValueSet(ExtendedDailyValueType.FoodDescription)) return 2; else return 0; @@ -240,8 +247,8 @@ // ";Ins2=" + Ins2 + ";BE=" + BE + ";Act=" + Act + ";Comment=" + Comment // + ";"; return "DailyValuesRow [dt=" + getDateTime() + ";bg=" + bg + ";ins1=" + ins1 + ";ins2=" + ins2 + ";CH=" + ch - + ";activity=" + getExtendedValue(ExtendedDailyValueHandler.EXTENDED_ACTIVITY) + ";urine=" - + getExtendedValue(ExtendedDailyValueHandler.EXTENDED_URINE) + ";comment=" + comment + "]"; + + ";activity=" + getExtendedValue(ExtendedDailyValueType.Activity) + ";urine=" + + getExtendedValue(ExtendedDailyValueType.Urine) + ";comment=" + comment + "]"; } @@ -607,7 +614,7 @@ */ public String getIns1AsStringDecimal() { - return getDecimalValue(this.ins1, this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS1)); + return getDecimalValue(this.ins1, this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin1)); } @@ -617,7 +624,7 @@ */ public String getIns2AsStringDecimal() { - return getDecimalValue(this.ins2, this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS2)); + return getDecimalValue(this.ins2, this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin2)); } @@ -790,7 +797,7 @@ */ public String getActivity() { - return this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_ACTIVITY); + return this.getExtendedValue(ExtendedDailyValueType.Activity); } @@ -801,7 +808,7 @@ */ public float getIns3() { - return m_da.getFloatValueFromString(this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_INSULIN_3), 0.0f); + return m_da.getFloatValueFromString(this.getExtendedValue(ExtendedDailyValueType.Insulin3), 0.0f); } @@ -812,7 +819,7 @@ */ public void setIns3(float val) { - this.setExtendedValue(ExtendedDailyValueHandler.EXTENDED_INSULIN_3, "" + val, true); + this.setExtendedValue(ExtendedDailyValueType.Insulin3, "" + val, true); } @@ -823,7 +830,7 @@ */ public void setIns3(String val) { - this.setExtendedValue(ExtendedDailyValueHandler.EXTENDED_INSULIN_3, val, true); + this.setExtendedValue(ExtendedDailyValueType.Insulin3, val, true); } @@ -833,14 +840,12 @@ if (configurationManagerWrapper.getIns1Type() == DataAccess.INSULIN_DOSE_BASAL) { - sum += getDecimalValueAsFloat(this.ins1, - this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS1)); + sum += getDecimalValueAsFloat(this.ins1, this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin1)); } if (configurationManagerWrapper.getIns2Type() == DataAccess.INSULIN_DOSE_BASAL) { - sum += getDecimalValueAsFloat(this.ins2, - this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS2)); + sum += getDecimalValueAsFloat(this.ins2, this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin2)); } if (configurationManagerWrapper.getIns3Type() == DataAccess.INSULIN_DOSE_BASAL) @@ -864,14 +869,12 @@ if (configurationManagerWrapper.getIns1Type() == DataAccess.INSULIN_DOSE_BOLUS) { - sum += getDecimalValueAsFloat(this.ins1, - this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS1)); + sum += getDecimalValueAsFloat(this.ins1, this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin1)); } if (configurationManagerWrapper.getIns2Type() == DataAccess.INSULIN_DOSE_BOLUS) { - sum += getDecimalValueAsFloat(this.ins2, - this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS2)); + sum += getDecimalValueAsFloat(this.ins2, this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin2)); } if (configurationManagerWrapper.getIns3Type() == DataAccess.INSULIN_DOSE_BOLUS) @@ -893,16 +896,16 @@ { int count = 0; - if (configurationManagerWrapper.getIns1Type() == DataAccess.INSULIN_DOSE_BASAL) - if (getDecimalValueAsFloat(this.ins1, - this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS1)) > 0) - { - count++; - } + if ((configurationManagerWrapper.getIns1Type() == DataAccess.INSULIN_DOSE_BASAL) && // + (getDecimalValueAsFloat(this.ins1, + this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin1)) > 0)) + { + count++; + } if (configurationManagerWrapper.getIns2Type() == DataAccess.INSULIN_DOSE_BASAL) if (getDecimalValueAsFloat(this.ins2, - this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS2)) > 0) + this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin2)) > 0) { count++; } @@ -923,14 +926,14 @@ if (configurationManagerWrapper.getIns1Type() == DataAccess.INSULIN_DOSE_BOLUS) if (getDecimalValueAsFloat(this.ins1, - this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS1)) > 0) + this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin1)) > 0) { count++; } if (configurationManagerWrapper.getIns2Type() == DataAccess.INSULIN_DOSE_BOLUS) if (getDecimalValueAsFloat(this.ins2, - this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS2)) > 0) + this.getExtendedValue(ExtendedDailyValueType.DecimalPartInsulin2)) > 0) { count++; } @@ -947,43 +950,43 @@ public void setActivity(String val) { - setExtendedValue(ExtendedDailyValueHandler.EXTENDED_ACTIVITY, val, true); + setExtendedValue(ExtendedDailyValueType.Activity, val, true); } public String getFoodDescription() { - return this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_FOOD_DESCRIPTION); + return this.getExtendedValue(ExtendedDailyValueType.FoodDescription); } public void setFoodDescription(String val) { - setExtendedValue(ExtendedDailyValueHandler.EXTENDED_FOOD_DESCRIPTION, val, true); + setExtendedValue(ExtendedDailyValueType.FoodDescription, val, true); } public String getFoodDescriptionCH() { - return this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_FOOD_CH); + return this.getExtendedValue(ExtendedDailyValueType.FoodCarbohydrate); } public void setFoodDescriptionCH(String val) { - setExtendedValue(ExtendedDailyValueHandler.EXTENDED_FOOD_CH, val, true); + setExtendedValue(ExtendedDailyValueType.FoodCarbohydrate, val, true); } public String getUrine() { - return this.getExtendedValue(ExtendedDailyValueHandler.EXTENDED_URINE); + return this.getExtendedValue(ExtendedDailyValueType.Urine); } public void setUrine(String val) { - setExtendedValue(ExtendedDailyValueHandler.EXTENDED_URINE, val, true); + setExtendedValue(ExtendedDailyValueType.Urine, val, true); } @@ -1041,7 +1044,7 @@ m_dv.setDt_info(datetime.getATDateTimeAsLong()); m_dv.setIns1(ins1); m_dv.setIns2(ins2); - m_dv.setExtended(this.getExtendedHandler().saveExtended(ht_extended)); + m_dv.setExtended(this.getExtendedHandler().saveExtended(mapExtended)); m_dv.setPerson_id((int) m_da.getCurrentUserId()); m_dv.setMeals_ids(this.meals); } @@ -1053,7 +1056,7 @@ m_dv.setDt_info(datetime.getATDateTimeAsLong()); m_dv.setIns1(ins1); m_dv.setIns2(ins2); - m_dv.setExtended(this.getExtendedHandler().saveExtended(ht_extended)); + m_dv.setExtended(this.getExtendedHandler().saveExtended(mapExtended)); m_dv.setPerson_id((int) m_da.getCurrentUserId()); m_dv.setMeals_ids(this.meals); } @@ -1168,9 +1171,9 @@ } - public ExtendedHandler getExtendedHandler() + public ExtendedEnumHandler getExtendedHandler() { - return m_da.getExtendedHandler("DailyValuesRow"); + return (ExtendedEnumHandler) m_da.getExtendedHandler("DailyValuesRow"); } @@ -1180,9 +1183,9 @@ * @param type * @return */ - public String getExtendedValue(int type) + public String getExtendedValue(ExtendedDailyValueType type) { - return this.getExtendedHandler().getExtendedValue(type, this.ht_extended); + return this.extendedHandler.getExtendedValue(type, this.mapExtended); } @@ -1193,9 +1196,9 @@ * @param value * @param set_checked */ - public void setExtendedValue(int type, String value, boolean set_checked) + public void setExtendedValue(ExtendedDailyValueType type, String value, boolean set_checked) { - boolean set = this.getExtendedHandler().setExtendedValue(type, value, this.ht_extended); + boolean set = this.extendedHandler.setExtendedValue(type, value, this.mapExtended); if (set_checked && set) { @@ -1210,18 +1213,18 @@ * @param type * @return */ - public boolean isExtendedValueSet(int type) + public boolean isExtendedValueSet(ExtendedDailyValueType type) { - return this.getExtendedHandler().isExtendedValueSet(type, this.ht_extended); + return this.getExtendedHandler().isExtendedValueSet(type, this.mapExtended); } /** * Create Extended */ - public void createExtended() + public void createExtendedString() { - this.extended = this.getExtendedHandler().saveExtended(this.ht_extended); + this.extended = this.getExtendedHandler().saveExtended(this.mapExtended); } Modified: trunk/ggc-core/src/ggc/core/data/ExtendedDailyValueHandler.java =================================================================== --- trunk/ggc-core/src/ggc/core/data/ExtendedDailyValueHandler.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/data/ExtendedDailyValueHandler.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -1,10 +1,7 @@ package ggc.core.data; -import java.util.Hashtable; +import com.atech.db.ext.ExtendedEnumHandler; -import com.atech.db.ext.ExtendedHandler; -import com.atech.utils.ATDataAccessAbstract; - /** * Application: GGC - GNU Gluco Control * @@ -30,7 +27,7 @@ * @author Andy {an...@at...} */ -public class ExtendedDailyValueHandler extends ExtendedHandler +public class ExtendedDailyValueHandler extends ExtendedEnumHandler<ExtendedDailyValueType> { // private String extended; @@ -40,45 +37,15 @@ // private boolean changed = false; // boolean debug = false; - // FIXME enum - public static final int EXTENDED_ACTIVITY = 0; - public static final int EXTENDED_URINE = 1; - public static final int EXTENDED_FOOD_DESCRIPTION = 2; - public static final int EXTENDED_FOOD_CH = 3; - public static final int EXTENDED_DECIMAL_PART_INS1 = 4; - public static final int EXTENDED_DECIMAL_PART_INS2 = 5; - public static final int EXTENDED_INSULIN_3 = 6; - public static final int EXTENDED_SOURCE = 7; - - private static final int EXTENDED_MAX = 7; - - - public ExtendedDailyValueHandler(ATDataAccessAbstract da) + public ExtendedDailyValueHandler() { - super(da); + super(ExtendedDailyValueType.None, "DailyValuesRow"); } + // @Override + // public String getExtendedObject() + // { + // return "DailyValuesRow"; + // } - @Override - public void initExtended() - { - ext_mapped_types = new Hashtable<Integer, String>(); - - ext_mapped_types.put(ExtendedDailyValueHandler.EXTENDED_URINE, "URINE"); - ext_mapped_types.put(ExtendedDailyValueHandler.EXTENDED_ACTIVITY, "ACTIVITY"); - ext_mapped_types.put(ExtendedDailyValueHandler.EXTENDED_FOOD_DESCRIPTION, "FOOD_DESCRIPTION"); - ext_mapped_types.put(ExtendedDailyValueHandler.EXTENDED_FOOD_CH, "FOOD_DESC_CH"); - ext_mapped_types.put(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS1, "DECIMAL_INS1"); - ext_mapped_types.put(ExtendedDailyValueHandler.EXTENDED_DECIMAL_PART_INS2, "DECIMAL_INS2"); - ext_mapped_types.put(ExtendedDailyValueHandler.EXTENDED_INSULIN_3, "INSULIN_3"); - ext_mapped_types.put(ExtendedDailyValueHandler.EXTENDED_SOURCE, "SOURCE"); - } - - - @Override - public String getExtendedObject() - { - return "DailyValuesRow"; - } - } Added: trunk/ggc-core/src/ggc/core/data/ExtendedDailyValueType.java =================================================================== --- trunk/ggc-core/src/ggc/core/data/ExtendedDailyValueType.java (rev 0) +++ trunk/ggc-core/src/ggc/core/data/ExtendedDailyValueType.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -0,0 +1,101 @@ +package ggc.core.data; + +import java.util.HashMap; +import java.util.Map; + +import com.atech.db.ext.ExtendedEnumType; + +public enum ExtendedDailyValueType implements ExtendedEnumType<ExtendedDailyValueType> +{ + + None("NONE"), // + Activity("ACTIVITY"), // + Urine("URINE"), // + Urine_mgdL("URINE_MGDL"), // + Urine_mmolL("URINE_MMOLL"), // + FoodDescription("FOOD_DESCRIPTION"), // + FoodCarbohydrate("FOOD_DESC_CH"), // + + DecimalPartInsulin1("DECIMAL_INS1"), // + DecimalPartInsulin2("DECIMAL_INS2"), // + Insulin3("INSULIN_3"), // + Source("SOURCE"), // + GlucometerMarkers("GLUCOMETER_MARKERS"), // + + ; + + int code; + String i18nKey; + String translation; + + static Map<String, ExtendedDailyValueType> mapByKey; + static Map<String, ExtendedDailyValueType> mapByName; + + + static + { + mapByKey = new HashMap<String, ExtendedDailyValueType>(); + mapByName = new HashMap<String, ExtendedDailyValueType>(); + + for (ExtendedDailyValueType vt : values()) + { + mapByKey.put(vt.getI18nKey(), vt); + mapByName.put(vt.name(), vt); + } + } + + + ExtendedDailyValueType(String i18nKey) + { + this.i18nKey = i18nKey; + } + + + public ExtendedDailyValueType getEnumTypeByKey(String key) + { + return mapByKey.get(key); + } + + + public ExtendedDailyValueType getEnumTypeByName(String key) + { + return mapByName.get(key); + } + + + public String getI18nKey() + { + return this.i18nKey; + } + + + public String getTranslation() + { + return this.translation; + } + + + public void setTranslation(String translation) + { + this.translation = translation; + } + + + public String getName() + { + return name(); + } + + + public boolean useI18nKey() + { + return true; + } + + + public ExtendedDailyValueType[] getAllValues() + { + return values(); + } + +} Modified: trunk/ggc-core/src/ggc/core/data/defs/DailyValuesExtendedType.java =================================================================== --- trunk/ggc-core/src/ggc/core/data/defs/DailyValuesExtendedType.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/data/defs/DailyValuesExtendedType.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -25,6 +25,7 @@ * Author: Andy {an...@at...} */ +@Deprecated public enum DailyValuesExtendedType { Activity(0), // Modified: trunk/ggc-core/src/ggc/core/db/GGCDb.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/GGCDb.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/GGCDb.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -58,6 +58,8 @@ // HibernateDb { + public static String CURRENT_DB_VERSION = "7"; + // public static final int DB_CONFIG_LOADED = 1; // public static final int DB_INITIALIZED = 2; // public static final int DB_STARTED = 3; @@ -80,13 +82,7 @@ private int m_loadStatus = 0; - /* - * public ArrayList<MeterCompanyH> meter_companies = null; public - * Hashtable<String,ArrayList<MeterH>> meters_by_cmp = null; public - * Hashtable<String,MeterH> meters_full = null; - */ - // --- // --- DB Settings // --- @@ -1357,7 +1353,7 @@ Criteria criteria = this.getSession().createCriteria(StocktakingH.class); setPersonId(criteria); // criteria.add(Restrictions.eq("personId", (int) - // m_da.getCurrentUserId())); + // dataAccess.getCurrentUserId())); criteria.setProjection(Projections.max("datetime")); Object o = criteria.uniqueResult(); Modified: trunk/ggc-core/src/ggc/core/db/GGCDbConfig.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/GGCDbConfig.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/GGCDbConfig.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -68,7 +68,7 @@ private static final Logger LOG = LoggerFactory.getLogger(GGCDbConfig.class); - private String[] db_files = { "GGC_Main.hbm.xml", // + private String[] db_files = { "DbInfo.hbm.xml", "GGC_Main.hbm.xml", // "GGC_Nutrition.hbm.xml", // "GGC_Other.hbm.xml", // "GGC_Pump.hbm.xml", // @@ -93,6 +93,12 @@ } + public GGCDbConfig(String val) + { + super(val); + } + + /** * Get Db Name * Modified: trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodDescriptionH.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodDescriptionH.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodDescriptionH.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -6,8 +6,10 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import com.atech.db.hibernate.HibernateObject; + /** @author Hibernate CodeGenerator */ -public class FoodDescriptionH implements Serializable +public class FoodDescriptionH extends HibernateObject implements Serializable { /** Modified: trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodGroupH.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodGroupH.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodGroupH.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -6,8 +6,10 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import com.atech.db.hibernate.HibernateObject; + /** @author Hibernate CodeGenerator */ -public class FoodGroupH implements Serializable +public class FoodGroupH extends HibernateObject implements Serializable { /** Modified: trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserDescriptionH.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserDescriptionH.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserDescriptionH.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -6,8 +6,10 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import com.atech.db.hibernate.HibernateObject; + /** @author Hibernate CodeGenerator */ -public class FoodUserDescriptionH implements Serializable +public class FoodUserDescriptionH extends HibernateObject implements Serializable { /** Modified: trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserGroupH.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserGroupH.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/hibernate/food/FoodUserGroupH.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -6,8 +6,10 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import com.atech.db.hibernate.HibernateObject; + /** @author Hibernate CodeGenerator */ -public class FoodUserGroupH implements Serializable +public class FoodUserGroupH extends HibernateObject implements Serializable { /** Modified: trunk/ggc-core/src/ggc/core/db/hibernate/food/MealGroupH.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/hibernate/food/MealGroupH.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/hibernate/food/MealGroupH.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -6,8 +6,10 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import com.atech.db.hibernate.HibernateObject; + /** @author Hibernate CodeGenerator */ -public class MealGroupH implements Serializable +public class MealGroupH extends HibernateObject implements Serializable { /** Modified: trunk/ggc-core/src/ggc/core/db/hibernate/food/MealH.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/hibernate/food/MealH.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/hibernate/food/MealH.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -6,8 +6,10 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import com.atech.db.hibernate.HibernateObject; + /** @author Hibernate CodeGenerator */ -public class MealH implements Serializable +public class MealH extends HibernateObject implements Serializable { private static final long serialVersionUID = 8237292183858746065L; Modified: trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionDefinitionH.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionDefinitionH.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionDefinitionH.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -6,8 +6,10 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import com.atech.db.hibernate.HibernateObject; + /** @author Hibernate CodeGenerator */ -public class NutritionDefinitionH implements Serializable +public class NutritionDefinitionH extends HibernateObject implements Serializable { /** Modified: trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionHomeWeightTypeH.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionHomeWeightTypeH.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/hibernate/food/NutritionHomeWeightTypeH.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -6,8 +6,10 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import com.atech.db.hibernate.HibernateObject; + /** @author Hibernate CodeGenerator */ -public class NutritionHomeWeightTypeH implements Serializable +public class NutritionHomeWeightTypeH extends HibernateObject implements Serializable { /** Modified: trunk/ggc-core/src/ggc/core/db/tool/DbToolApplicationGGC.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/tool/DbToolApplicationGGC.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/tool/DbToolApplicationGGC.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -1,18 +1,16 @@ package ggc.core.db.tool; import java.io.BufferedWriter; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.util.Calendar; -import java.util.Enumeration; -import java.util.GregorianCalendar; -import java.util.Hashtable; -import java.util.Properties; -import javax.swing.UIManager; +import com.atech.db.hibernate.HibernateConfiguration; +import com.atech.db.hibernate.tool.app.DbToolApplicationInitDb; +import com.atech.db.hibernate.tool.app.DbToolApplicationInterface; +import com.atech.db.hibernate.tool.app.DbToolApplicationLAF; +import com.atech.db.hibernate.tool.data.DatabaseConfiguration; -import com.atech.db.hibernate.tool.DatabaseSettings; -import com.atech.db.hibernate.tool.DbToolApplicationInterface; +import ggc.core.db.GGCDb; +import ggc.core.db.GGCDbConfig; +import ggc.core.db.tool.init.DbToolApplicationInitDbGGC; /* New methods : @@ -53,202 +51,32 @@ * Author: andyrozman {an...@at...} */ -public class DbToolApplicationGGC implements DbToolApplicationInterface +public class DbToolApplicationGGC extends DbToolApplicationLAF implements DbToolApplicationInterface { - private int selected_db = 0; - private String selected_lang = "en"; + private boolean m_changed = false; + private HibernateConfiguration hibernateConfiguration; + DbToolApplicationInitDb dbToolApplicationInitDb; - Hashtable<String, String> config_db_values = null; - // LF - String selected_LF_Class = "com.l2fprod.gui.plaf.skin.SkinLookAndFeel"; // class - String selected_LF_Name = "SkinLF"; // name - String skinLFSelected = "blueMetalthemepack.zip"; - - Object[] availableLF = null; - Object[] availableLFClass = null; - Hashtable<String, String> availableLF_full = null; - int skinlf_LF = 0; - - private Hashtable<String, DatabaseSettings> staticDatabases; - private Hashtable<String, DatabaseSettings> customDatabases; - private Hashtable<String, DatabaseSettings> allDatabases; - - private boolean m_changed = false; - /** * Constuctor */ public DbToolApplicationGGC() { - this.staticDatabases = new Hashtable<String, DatabaseSettings>(); - this.customDatabases = new Hashtable<String, DatabaseSettings>(); - this.allDatabases = new Hashtable<String, DatabaseSettings>(); - initStaticDbs(); - loadAvailableLFs(); - } + super(); - /** - * Get Selected Language - * - * @return - */ - public String getSelectedLanguage() - { - return this.selected_lang; } - /** - * Set Selected Language - * - * @param lang - */ - public void setSelectedLanguage(String lang) - { - this.selected_lang = lang; - } - /** - * Load Available LFs - */ - public void loadAvailableLFs() + @Override + public void initDefaults() { - availableLF_full = new Hashtable<String, String>(); - UIManager.LookAndFeelInfo[] info = UIManager.getInstalledLookAndFeels(); - - availableLF = new Object[info.length + 1]; - availableLFClass = new Object[info.length + 1]; - - int i; - for (i = 0; i < info.length; i++) - { - String name = info[i].getName(); - String className = info[i].getClassName(); - - availableLF_full.put(name, className); - availableLF[i] = name; - availableLFClass[i] = className; - } - - availableLF_full.put("SkinLF", "com.l2fprod.gui.plaf.skin.SkinLookAndFeel"); - availableLF[i] = "SkinLF"; - availableLFClass[i] = "com.l2fprod.gui.plaf.skin.SkinLookAndFeel"; - skinlf_LF = i; } - /** - * Get Avilable LFs - * - * @return - */ - public Object[] getAvailableLFs() - { - return availableLF; - } /** - * Get Available LFs Class - * @return - */ - public Object[] getAvailableLFsClass() - { - return this.availableLFClass; - } - - /** - * Get Selected LF Index - * @return - */ - public int getSelectedLFIndex() - { - for (int i = 0; i < this.availableLFClass.length; i++) - { - if (this.availableLFClass[i].equals(this.selected_LF_Class)) - return i; - } - - return this.skinlf_LF; - - } - - /** - * Set Selected LF - * - * @param index - * @param skin - */ - public void setSelectedLF(int index, String skin) - { - - if (this.getSelectedLFIndex() != index) // .getSkinLFIndex() - { - this.selected_LF_Class = (String) this.availableLFClass[index]; // class - this.selected_LF_Name = (String) this.availableLF[index]; // name - this.m_changed = true; - } - - if (!skin.equals(this.skinLFSelected)) - { - this.skinLFSelected = skin; - this.m_changed = true; - } - - } - - /** - * Get Selected LF Skin - * @return - */ - public String getSelectedLFSkin() - { - return this.skinLFSelected; - } - - /** - * Get SkinLF Index - * - * @return - */ - public int getSkinLFIndex() - { - return this.skinlf_LF; - } - - /** - * Is SkinLF Selected - * - * @return - */ - public boolean isSkinLFSelected() - { - return isSkinLFSelected(getSelectedLFIndex()); - } - - /** - * Is SkinLF Selected - * - * @param index - * @return - */ - public boolean isSkinLFSelected(int index) - { - return this.skinlf_LF == index; - } - - /* - * private void setDefaultLF() - * { - * this.selected_LF_Class = "com.l2fprod.gui.plaf.skin.SkinLookAndFeel"; // - * class - * this.selected_LF_Name = "SkinLF"; // name - * this.skinLFSelected = "blueMetalthemepack.zip"; - * this.m_changed = true; - * } - */ - - /** * Init Static Dbs */ public void initStaticDbs() @@ -256,6 +84,7 @@ // load all static database info } + /** * Get Application Name * @@ -266,6 +95,7 @@ return "GNU Gluco Control"; } + /** * Get Application Database Config * @@ -276,371 +106,96 @@ return "../data/GGC_Config.properties"; } - /** - * Load Config - */ - public void loadConfig() + + @Override + public void addDefaultApplicationDatabase() { + addDatabaseSetting("DB0_CONN_NAME", "Internal Database"); + addDatabaseSetting("DB0_DB_NAME", "HypersonicSQL File"); + addDatabaseSetting("DB0_CONN_DRIVER_CLASS", "org.hsqldb.jdbcDriver"); + addDatabaseSetting("DB0_CONN_URL", "jdbc:hsqldb:file:../data/ggc_db"); + addDatabaseSetting("DB0_CONN_USERNAME", "sa"); + addDatabaseSetting("DB0_CONN_PASSWORD", ""); + addDatabaseSetting("DB0_HIBERNATE_DIALECT", "org.hibernate.dialect.HSQLDialect"); + } - config_db_values = new Hashtable<String, String>(); - Properties props = new Properties(); + @Override + public void loadApplicationSpecific(String key, String value) + { - boolean config_loaded = true; + } - try - { - FileInputStream in = new FileInputStream(getApplicationDatabaseConfig()); - props.load(in); - } - catch (Exception ex) - { - config_loaded = false; - } - if (config_loaded) - { - - for (Enumeration<Object> en = props.keys(); en.hasMoreElements();) - { - String str = (String) en.nextElement(); - - if (str.startsWith("DB")) - { - addDatabaseSetting(str, (String) props.get(str)); - // config_db_values.put(str, (String)props.get(str)); - } - else - { - - if (str.equals("LF_NAME")) - { - selected_LF_Name = (String) props.get(str); - } - else if (str.equals("LF_CLASS")) - { - selected_LF_Class = (String) props.get(str); - } - else if (str.equals("SKINLF_SELECTED")) - { - // System.out.println("!!!!!!!!!!!!!!!!! " + - // (String)props.get(str)); - skinLFSelected = (String) props.get(str); - } - else if (str.equals("SELECTED_DB")) - { - selected_db = Integer.parseInt((String) props.get(str)); - } - else if (str.equals("SELECTED_LANG")) - { - selected_lang = (String) props.get(str); - } - else - { - System.out.println("DbToolApplicationGGC:loadConfig:: Unknown parameter : '" + str + "'"); - } - - } - - } - - } - else - { - - // we don't have config, we try to create basic one - - System.out - .println("DbToolApplicationGGC: Config file not found. Creating new config file with default settings."); - - try - { - addDatabaseSetting("DB0_CONN_NAME", "Internal Database"); - addDatabaseSetting("DB0_DB_NAME", "HypersonicSQL File"); - addDatabaseSetting("DB0_CONN_DRIVER_CLASS", "org.hsqldb.jdbcDriver"); - addDatabaseSetting("DB0_CONN_URL", "jdbc:hsqldb:file:../data/ggc_db"); - addDatabaseSetting("DB0_CONN_USERNAME", "sa"); - addDatabaseSetting("DB0_CONN_PASSWORD", ""); - addDatabaseSetting("DB0_HIBERNATE_DIALECT", "org.hibernate.dialect.HSQLDialect"); - } - catch (Exception ex) - { - System.out.println("Exception on create default config: " + ex); - } - - selected_db = 0; - selected_lang = "en"; - - saveConfig(); - - } - - } - - private String getCurrentTimeAsUserReadableString() + @Override + public void saveApplicationSpecific(BufferedWriter bw) { - GregorianCalendar gc = new GregorianCalendar(); - gc.setTimeInMillis(System.currentTimeMillis()); - return gc.get(Calendar.DAY_OF_MONTH) + "." + (gc.get(Calendar.MONTH) + 1) + "." + gc.get(Calendar.YEAR) + " " - + gc.get(Calendar.HOUR_OF_DAY) + ":" + gc.get(Calendar.MINUTE) + ":" + gc.get(Calendar.SECOND); - } - /** - * Save Config - */ - public void saveConfig() - { - System.out.println("SAVEEEEEEEEEEEEE !!!"); - - try - { - - // Properties props = new Properties(); - BufferedWriter bw = new BufferedWriter(new FileWriter(getApplicationDatabaseConfig())); - - bw.write("#\n" + "# GGC_Config (Settings for GGC)\n" + "#" + getCurrentTimeAsUserReadableString() + "\n" - + "#\n" + "# Don't edit by hand\n" - + "# Only settings need for application startup are written here. All other info\n" - + "# is stored in database\n" + "#\n\n" + "#\n# Databases settings\n#\n"); - - // int count_db = 0; - - // for (int i=0; i<this.allDatabases.size(); i++) fix, only - // non-static db data should be written - for (int i = 0; i < this.allDatabases.size(); i++) - { - DatabaseSettings dbs = this.allDatabases.get("" + i); - dbs.write(bw); - } - - bw.write("\n\n#\n# Look and Feel Settings\n#\n\n"); - bw.write("LF_NAME=" + selected_LF_Name + "\n"); - - // props.put("LF_NAME", selected_LF_Name); - - selected_LF_Class = availableLF_full.get(selected_LF_Name); - - bw.write("LF_CLASS=" + selected_LF_Class + "\n"); - - // props.put("LF_CLASS", selected_LF_Name); - bw.write("SKINLF_SELECTED=" + skinLFSelected + "\n"); - // props.put("SKINLF_SELECTED", skinLFSelected); - - bw.write("\n\n#\n# Db Selector\n#\n"); - bw.write("SELECTED_DB=" + selected_db + "\n"); - - bw.write("\n\n#\n# Language Selector\n#\n"); - bw.write("SELECTED_LANG=" + selected_lang + "\n"); - - bw.close(); - - } - catch (Exception ex) - { - System.out.println("DataAccess::saveConfig::Exception> " + ex); - ex.printStackTrace(); - } - - } - - /** - * Get First Available Database - * - * @return get number of first database (this can be either 0 or 1) - */ - public int getFirstAvailableDatabase() + @Override + public String getConfigFileComment() { - return 1; + return null; } + /** - * Get Static Databases + * Get Selected Database * * @return */ - public Hashtable<String, DatabaseSettings> getStaticDatabases() + public DatabaseConfiguration getSelectedDatabase() { - return this.staticDatabases; + return null; } - /** - * Get Custom Databases - * - * @return - */ - public Hashtable<String, DatabaseSettings> getCustomDatabases() + + public boolean doesApplicationHaveDbInfo() { - return this.customDatabases; + return true; } - /** - * Get All Databases - * - * @return - */ - public Hashtable<String, DatabaseSettings> getAllDatabases() + + public boolean doesApplicationSupportFillDb() { - return this.allDatabases; + return false; } - // NEW - /** - * Get All Databases Names As Array - * @return - */ - public String[] getAllDatabasesNamesAsArray() - { - String[] arr = new String[this.allDatabases.size()]; - for (int i = 0; i < this.allDatabases.size(); i++) - { - arr[i] = this.allDatabases.get("" + i).name; - - } - - return arr; - } - - // NEW - /** - * Get All Databases Names Plus As Array - * @return - */ - public String[] getAllDatabasesNamesPlusAsArray() + public DbToolApplicationInitDb getInitDbInstance() { - String[] arr = new String[this.allDatabases.size()]; + if (this.dbToolApplicationInitDb == null) + this.dbToolApplicationInitDb = new DbToolApplicationInitDbGGC(this); - for (int i = 0; i < this.allDatabases.size(); i++) - { - arr[i] = i + " - " + this.allDatabases.get("" + i).name; - - } - - return arr; - + return this.dbToolApplicationInitDb; } - /** - * Get Database - * - * @param index - * @return - */ - public DatabaseSettings getDatabase(int index) - { - return null; - } - /** - * Get Selected Database - * - * @return - */ - public DatabaseSettings getSelectedDatabase() + public String getCurrentDatabaseVersion() { - return null; + return GGCDb.CURRENT_DB_VERSION; } - // NEW - /** - * Get Selected Database Index - * @return - */ - public int getSelectedDatabaseIndex() + + public boolean doesApplicationSupportInit() { - return this.selected_db; + return true; } - // NEW - /** - * Add Database Settings - * - * @param setting - * @param value - */ - public void addDatabaseSetting(String setting, String value) + + public HibernateConfiguration getHibernateConfiguration() { - int dbnum = Integer.parseInt(setting.substring(2, 3)); - - // if (dbnum<this.getFirstAvailableDatabase()) - // return; - - if (this.customDatabases.containsKey("" + dbnum)) + if (this.hibernateConfiguration == null) { - // we have database - DatabaseSettings dbs = this.customDatabases.get("" + dbnum); - addDatabaseSetting(dbs, setting, value); + this.hibernateConfiguration = new GGCDbConfig(""); } - else - { - // new database - DatabaseSettings dbs = new DatabaseSettings(); - dbs.number = dbnum; - addDatabaseSetting(dbs, setting, value); - this.customDatabases.put("" + dbnum, dbs); - this.allDatabases.put("" + dbnum, dbs); - } - // System.out.println(dbnum); - + return this.hibernateConfiguration; } - // NEW - /** - * Add Database Settings - * - * @param ds - * @param setting - * @param value - */ - public void addDatabaseSetting(DatabaseSettings ds, String setting, String value) - { - String sett = setting.substring(setting.indexOf("_") + 1); - // System.out.println(sett); - - if (sett.equals("CONN_NAME")) - { - ds.name = value; - } - else if (sett.equals("DB_NAME")) - { - ds.db_name = value; - } - else if (sett.equals("CONN_DRIVER")) - { - ds.driver = value; - } - else if (sett.equals("CONN_URL")) - { - ds.url = value; - } - else if (sett.equals("HIBERNATE_DIALECT")) - { - ds.dialect = value; - } - else if (sett.equals("CONN_USERNAME")) - { - ds.username = value; - } - else if (sett.equals("CONN_PASSWORD")) - { - ds.password = value; - } - else if (sett.equals("CONN_DRIVER_CLASS")) - { - ds.driver_class = value; - } - else - { - System.out.println("Unknown DB keyword in config: " + sett); - } - - } - // NEW /** * @@ -675,51 +230,4 @@ */ } - // NEW - /** - * Has Changed - * - * @return - */ - public boolean hasChanged() - { - return this.m_changed; - } - - // NEW - /** - * Set Selected Database Index - * - * @param index - */ - public void setSelectedDatabaseIndex(int index) - { - if (this.selected_db != index) - { - this.selected_db = index; - this.m_changed = true; - } - - } - - /** - * To String - */ - @Override - public String toString() - { - return getApplicationName(); - } - - /** - * Main Startup - * @param args - */ - public static void main(String args[]) - { - DbToolApplicationGGC apl = new DbToolApplicationGGC(); - apl.loadConfig(); - apl.saveConfig(); - } - } Deleted: trunk/ggc-core/src/ggc/core/db/tool/DbToolInitDbGGC.java =================================================================== Modified: trunk/ggc-core/src/ggc/core/db/tool/InitDb.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/tool/InitDb.java 2016-12-25 13:16:57 UTC (rev 1417) +++ trunk/ggc-core/src/ggc/core/db/tool/InitDb.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -137,7 +137,7 @@ dbi.setId(1); dbi.setKey("DB_INFO"); - dbi.setValue(m_da.current_db_version); + dbi.setValue(GGCDb.CURRENT_DB_VERSION); m_db.addHibernate(dbi); } Added: trunk/ggc-core/src/ggc/core/db/tool/data/GGCDatabaseTableConfiguration.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/tool/data/GGCDatabaseTableConfiguration.java (rev 0) +++ trunk/ggc-core/src/ggc/core/db/tool/data/GGCDatabaseTableConfiguration.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -0,0 +1,126 @@ +package ggc.core.db.tool.data; + +import com.atech.db.hibernate.tool.data.DatabaseTableConfiguration; + +import ggc.core.db.hibernate.food.*; + +public enum GGCDatabaseTableConfiguration implements DatabaseTableConfiguration +{ + // core + DayValueH(), // DailyValue - Pen/Injection data + SettingsH(), // Settings + ColorSchemeH(), // Color Scheme for BG Data + + // pump + PumpDataH(), // + PumpDataExtendedH(), // + PumpProfileH(), // + + // cgms + CGMSDataH(), // + CGMSDataExtendedH(), // + + // nutrition + FoodGroupH(1, FoodGroupH.class, // + "id, name, name_i18n, description"), // + FoodDescriptionH(1, FoodDescriptionH.class, // + "id, group_id, name, name_i18n, refuse, nutritions, home_weights"), // + FoodUserGroupH(1, FoodUserGroupH.class, // + "id; name; name_i18n; description; parent_id; changed"), // + FoodUserDescriptionH(1, FoodUserDescriptionH.class, // + "id; name; name_i18n; group_id; refuse; description; home_weights; nutritions; changed"), // + MealH(1, MealH.class, // + "id; name; name_i18n; group_id; description; parts; nutritions; extended; comment; changed"), // + MealGroupH(1, MealGroupH.class, // + "id; name; name_i18n; description; parent_id; changed"), // + NutritionDefinitionH(1, NutritionDefinitionH.class, // + "id; weight_unit; tag; name; decimal_places; static_entry"), // + NutritionHomeWeightTypeH(1, NutritionHomeWeightTypeH.class, // + "id; name; static_entry"), // + + // stocks + StocksXYZ(), // + + // doctors + + // inet + + ; + + // import ggc.core.db.hibernate.food.FoodUserDescriptionH; + // import ggc.core.db.hibernate.food.FoodUserGroupH; + // import ggc.core.db.hibernate.food.MealGroupH; + // import ggc.core.db.hibernate.food.MealH; + + String tableName; + String fullClassName; + + int tableVersion; + Class clazz; + String columns; + + + @Deprecated + GGCDatabaseTableConfiguration() + { + } + + + GGCDatabaseTableConfiguration(int tableVersion, Class clazz, String columns) + { + this(null, tableVersion, clazz, columns); + } + + + GGCDatabaseTableConfiguration(String tableName, int tableVersion, Class clazz, String columns) + { + this.tableName = tableName; + this.fullClassName = clazz.getName(); + + this.tableVersion = tableVersion; + this.clazz = clazz; + this.columns = columns; + } + + + // public String getSqlForExport() + // { + // return null; + // } + + public String getObjectName() + { + return this.name(); + } + + + public Class getObjectClass() + { + return this.clazz; + } + + + public String getTableName() + { + return this.tableName; + } + + + public String getObjectFullName() + { + return fullClassName; + } + + + public int getTableVersion() + { + return this.tableVersion; + } + + + public String getColumns() + { + return this.columns; + } + +} Added: trunk/ggc-core/src/ggc/core/db/tool/data/GGCDatabaseVersionConfiguration.java =================================================================== --- trunk/ggc-core/src/ggc/core/db/tool/data/GGCDatabaseVersionConfiguration.java (rev 0) +++ trunk/ggc-core/src/ggc/core/db/tool/data/GGCDatabaseVersionConfiguration.java 2016-12-25 13:20:29 UTC (rev 1418) @@ -0,0 +1,93 @@ +package ggc.core.db.tool.data; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.atech.db.hibernate.tool.data.DatabaseTableConfiguration; +import com.atech.db.hibernate.tool.data.DatabaseVersionConfiguration; + +public enum GGCDatabaseVersionConfiguration implements DatabaseVersionConfiguration +{ + GGC_DB_V7("7"), // current + GGC_DB_V8("8"), // future + + ; + + static Map<String, GGCDatabaseVersionConfiguration> keyMap; + static Map<GGCDatabaseVersionConfiguration, List<GGCDatabaseTableConfiguration>> tableDbVersionMap; + + String dbVersionText; + + static + { + keyMa... [truncated message content] |
From: <and...@us...> - 2016-12-25 13:16:58
|
Revision: 1417 http://sourceforge.net/p/ggc/code/1417 Author: andyrozman Date: 2016-12-25 13:16:57 +0000 (Sun, 25 Dec 2016) Log Message: ----------- ggc-desktop-app added pom ggc-plugins added pom Added Paths: ----------- trunk/ggc-desktop-app/ trunk/ggc-desktop-app/pom.xml trunk/ggc-plugins/pom.xml Added: trunk/ggc-desktop-app/pom.xml =================================================================== --- trunk/ggc-desktop-app/pom.xml (rev 0) +++ trunk/ggc-desktop-app/pom.xml 2016-12-25 13:16:57 UTC (rev 1417) @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-root</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>GGC Desktop App</name> + <artifactId>ggc-desktop-app</artifactId> + <packaging>pom</packaging> + + <!-- + <modules> + <module>ggc-help</module> + </modules> + --> + +</project> Added: trunk/ggc-plugins/pom.xml =================================================================== --- trunk/ggc-plugins/pom.xml (rev 0) +++ trunk/ggc-plugins/pom.xml 2016-12-25 13:16:57 UTC (rev 1417) @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-root</artifactId> + <version>0.8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>GGC Plugins</name> + <artifactId>ggc-plugins</artifactId> + <packaging>pom</packaging> + + <!-- + <modules> + <module>ggc-help</module> + </modules> +--> + +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 12:00:10
|
Revision: 1416 http://sourceforge.net/p/ggc/code/1416 Author: andyrozman Date: 2016-12-25 12:00:08 +0000 (Sun, 25 Dec 2016) Log Message: ----------- adding 2nd level root projects for ggc - ggc-desktop-app - ggc-android-app - ggc-plugins - ggc-desktop-app Added Paths: ----------- trunk/ggc-doctor-app/ trunk/ggc-plugins/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 11:53:31
|
Revision: 1415 http://sourceforge.net/p/ggc/code/1415 Author: andyrozman Date: 2016-12-25 11:53:28 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Support - moved ggc-language-tool - moved ggc-usb - moved ggc-test Modified Paths: -------------- trunk/ggc-support/ggc-usb/freebsd/bin/run_freebsd.sh trunk/ggc-support/ggc-usb/linux/bin/run_linux.sh trunk/ggc-support/ggc-usb/mac/bin/run_mac.bash Added Paths: ----------- trunk/ggc-support/ggc-language_tool/ trunk/ggc-support/ggc-test/ trunk/ggc-support/ggc-usb/ Removed Paths: ------------- trunk/ggc-language_tool/ trunk/ggc-test/ trunk/ggc-usb/ Modified: trunk/ggc-support/ggc-usb/freebsd/bin/run_freebsd.sh =================================================================== --- trunk/ggc-usb/freebsd/bin/run_freebsd.sh 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-usb/freebsd/bin/run_freebsd.sh 2016-12-25 11:53:28 UTC (rev 1415) @@ -4,14 +4,14 @@ # ******** Set Java Path (calling setenv_java if exists) **** # ********************************************************************** if [ -x ./setenv_java_freebsd.sh ]; then - . ./setenv_java_freebsd.sh + . setenv_java_freebsd.sh fi # ********************************************************************** # ******** Set ATech Tools Startup Jar **** # ********************************************************************** -. ./setenv_atech.sh +. setenv_atech.sh # ********************************************************************** Modified: trunk/ggc-support/ggc-usb/linux/bin/run_linux.sh =================================================================== --- trunk/ggc-usb/linux/bin/run_linux.sh 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-usb/linux/bin/run_linux.sh 2016-12-25 11:53:28 UTC (rev 1415) @@ -11,14 +11,14 @@ # ******** Set Java Path (calling setenv_java if exists) **** # ********************************************************************** if [ -f ./setenv_java_linux.sh ]; then - . ./setenv_java_linux.sh + . setenv_java_linux.sh fi # ********************************************************************** # ******** Set ATech Tools Startup Jar **** # ********************************************************************** -. ./setenv_atech.sh +. setenv_atech.sh # ********************************************************************** Modified: trunk/ggc-support/ggc-usb/mac/bin/run_mac.bash =================================================================== --- trunk/ggc-usb/mac/bin/run_mac.bash 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-usb/mac/bin/run_mac.bash 2016-12-25 11:53:28 UTC (rev 1415) @@ -11,7 +11,7 @@ # ********************************************************************** # ******** Set ATech Tools Startup Jar **** # ********************************************************************** -. ./setenv_atech.bash +. setenv_atech.bash # ********************************************************************** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 11:49:57
|
Revision: 1414 http://sourceforge.net/p/ggc/code/1414 Author: andyrozman Date: 2016-12-25 11:49:54 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Support - added new project - moved ggc-help here Added Paths: ----------- trunk/ggc-support/ggc-help/ trunk/ggc-support/ggc-help/docs/Changelog.txt trunk/ggc-support/ggc-help/docs/HelpFiles.ods trunk/ggc-support/ggc-help/docs/HelpSupportInGGC.doc trunk/ggc-support/ggc-help/pom.xml trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html Removed Paths: ------------- trunk/ggc-help/ trunk/ggc-support/ggc-help/docs/Changelog.txt trunk/ggc-support/ggc-help/docs/HelpSupportInGGC.doc trunk/ggc-support/ggc-help/pom.xml trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm Deleted: trunk/ggc-support/ggc-help/docs/Changelog.txt =================================================================== --- trunk/ggc-help/docs/Changelog.txt 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-help/docs/Changelog.txt 2016-12-25 11:49:54 UTC (rev 1414) @@ -1,8 +0,0 @@ - -Changelog for GGC Help (Help for GGC) -===================================== - -0.2 [26.4.2015] - * Inital version in this format. Before this was in ggc-lang.jar, now there is no ggc-lang anymore - and instead we have this separate module just for help - * Added documentation for Help \ No newline at end of file Copied: trunk/ggc-support/ggc-help/docs/Changelog.txt (from rev 1397, trunk/ggc-help/docs/Changelog.txt) =================================================================== --- trunk/ggc-support/ggc-help/docs/Changelog.txt (rev 0) +++ trunk/ggc-support/ggc-help/docs/Changelog.txt 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,18 @@ + +Changelog for GGC Help (Help for GGC) +===================================== + +0.2.2 [18.5.2016] [Andy] +- added pages for Doctors module (WIP) +- added pages for Graph_CGMS + + +0.2.1 + * added some pages that were missing and preparing document for Bob (person who will probably prepare GGC Help) + * added pages to en + + +0.2 [26.4.2015] + * Inital version in this format. Before this was in ggc-lang.jar, now there is no ggc-lang anymore + and instead we have this separate module just for help + * Added documentation for Help \ No newline at end of file Copied: trunk/ggc-support/ggc-help/docs/HelpFiles.ods (from rev 1397, trunk/ggc-help/docs/HelpFiles.ods) =================================================================== (Binary files differ) Deleted: trunk/ggc-support/ggc-help/docs/HelpSupportInGGC.doc =================================================================== (Binary files differ) Copied: trunk/ggc-support/ggc-help/docs/HelpSupportInGGC.doc (from rev 1397, trunk/ggc-help/docs/HelpSupportInGGC.doc) =================================================================== (Binary files differ) Deleted: trunk/ggc-support/ggc-help/pom.xml =================================================================== --- trunk/ggc-help/pom.xml 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-help/pom.xml 2016-12-25 11:49:54 UTC (rev 1414) @@ -1,55 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> - </parent> - - <name>GGC Help Project</name> - - <artifactId>ggc-help</artifactId> - <version>${ggc-help.version}</version> - - - <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> - <sourceDirectory>src/main/java</sourceDirectory> - <scriptSourceDirectory>src/main/resources</scriptSourceDirectory> - <testSourceDirectory>src/test/java</testSourceDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - </build> - - <dependencies> - <dependency> - <groupId>com.atech-software</groupId> - <artifactId>atech-tools</artifactId> - </dependency> - - - <dependency> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </dependency> - - </dependencies> -</project> Copied: trunk/ggc-support/ggc-help/pom.xml (from rev 1368, trunk/ggc-help/pom.xml) =================================================================== --- trunk/ggc-support/ggc-help/pom.xml (rev 0) +++ trunk/ggc-support/ggc-help/pom.xml 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,48 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../ggc-master-pom/pom.xml</relativePath> + </parent> + + <name>GGC Help Project</name> + + <artifactId>ggc-help</artifactId> + <version>${ggc-help.version}</version> + + + <build> + <directory>target</directory> + <outputDirectory>target/classes</outputDirectory> + <finalName>${project.artifactId}-${project.version}</finalName> + <testOutputDirectory>target/test-classes</testOutputDirectory> + <sourceDirectory>src/main/java</sourceDirectory> + <scriptSourceDirectory>src/main/resources</scriptSourceDirectory> + <testSourceDirectory>src/test/java</testSourceDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + </testResources> + </build> + + <dependencies> + <dependency> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </dependency> + </dependencies> +</project> Deleted: trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml =================================================================== --- trunk/ggc-help/src/main/resources/help/en/GGCTOC.xml 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml 2016-12-25 11:49:54 UTC (rev 1414) @@ -1,164 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net--> - -<toc version="1.0"> - <tocitem text="GGC Help " target="GGC_Main"> - <tocitem text="File "> - <tocitem text="Login " target="GGC_File_Login"/> - <tocitem text="Logout " target="GGC_File_Logout"/> - </tocitem> - - <tocitem text="Pen/Injection"> - - <tocitem text="Daily "> - <tocitem text="Daily Entries View" target="GGC_BG_Daily_View"/> - <tocitem text="Daily Entries Add" target="GGC_BG_Daily_Add"/> - <tocitem text="Bolus Helper" target="GGC_PenInj_BolusHelper"/> - <tocitem text="Meals, Foods Selector" target="GGC_MFS_Daily_Selector"/> - <tocitem text="Meals, Foods Parts Selector" target="GGC_MFS_Item_Selector"/> - <tocitem text="Food by Description" target="GGC_Tools_FoodDescription"/> - </tocitem> - - <tocitem text="Graph "> - <tocitem text="Course Graph" target="GGC_BG_Graph_Course"/> - <tocitem text="Spread Graph" target="GGC_BG_Graph_Spread"/> - <tocitem text="Frequency Graph" target="GGC_BG_Graph_Frequency"/> - </tocitem> - - <tocitem text="HbA1c "> - <tocitem text="HbA1c View" target="GGC_BG_HbA1c"/> - </tocitem> - - <tocitem text="Ratio "> - <tocitem text="Base Ratio" target="GGC_Ratio_Base"/> - <tocitem text="Extended Ratio" target="GGC_Ratio_Extended"/> - <tocitem text="Ratio Calculator" target="GGC_Ratio_Calculator"/> - </tocitem> - </tocitem> - - <tocitem text="Food "> - <tocitem text="USDA Database "> - <tocitem text="Main " target="GGC_Food_USDA_Main"/> - <tocitem text="Group View " target="GGC_Food_USDA_Group"/> - <tocitem text="Food View " target="GGC_Food_USDA_View"/> - </tocitem> - - <tocitem text="User Database "> - <tocitem text="Main " target="GGC_Food_User_Main"/> - <tocitem text="Food Add/Edit " target="GGC_Food_User_Food_Edit"/> - <tocitem text="Food View " target="GGC_Food_User_Food_View"/> - <tocitem text="Group Add/Edit " target="GGC_Food_User_Group_Edit"/> - <tocitem text="Group View " target="GGC_Food_User_Group_View"/> - <tocitem text="Nutrition Selector Main " target="GGC_Food_User_Select_Nutrition_Main"/> - <tocitem text="Nutrition Selector " target="GGC_Food_User_Select_Nutrition"/> - <tocitem text="Home Weight Selector Main " target="GGC_Food_User_Select_HomeWeight_Main"/> - <tocitem text="Home Weight Selector " target="GGC_Food_User_Select_HomeWeight"/> - </tocitem> - - <tocitem text="Meals Database "> - <tocitem text="Main " target="GGC_Food_Meal_Main"/> - <tocitem text="Group Add/Edit " target="GGC_Food_Meal_Group_Edit"/> - <tocitem text="Group View " target="GGC_Food_Meal_Group_View"/> - <tocitem text="Meal Add/Edit " target="GGC_Food_Meal_Meal_Edit"/> - <tocitem text="Meal View " target="GGC_Food_Meal_Meal_View"/> - <tocitem text="Food Parts Selector " target="GGC_Food_Meal_Select_FoodParts"/> - </tocitem> - </tocitem> - - <tocitem text="Printing "> - <tocitem text="Pen/Injection Data" target="GGC_PenInj_Print"/> - <tocitem text="Food Menus" target="GGC_Food_Print"/> - <tocitem text="Pump Data" target="PumpTool_Print"/> - </tocitem> - - <tocitem text="Preferences"> - <tocitem text="Mode" target="GGC_Prefs_Mode"/> - <tocitem text="General" target="GGC_Prefs_General"/> - <tocitem text="Medical Data" target="GGC_Prefs_MedicalData"/> - <tocitem text="Colors & Fonts" target="GGC_Prefs_Colors_Fonts"/> - <tocitem text="Rendering Quality" target="GGC_Prefs_Rendering"/> - <tocitem text="Printing" target="GGC_Prefs_Printing"/> - <tocitem text="Language" target="GGC_Prefs_Language"/> - </tocitem> - - <tocitem text="Tools"> - <tocitem text="Update" target="GGC_Tools_Update"/> - <tocitem text="Backup" target="GGC_Tools_Backup"/> - <tocitem text="Restore File Selector" target="GGC_Tools_Restore_File_Selector"/> - <tocitem text="Restore" target="GGC_Tools_Restore"/> - <tocitem text="Bolus Helper" target="GGC_Tools_BolusHelper"/> - </tocitem> - - - <tocitem text="Plug-ins "> - - <tocitem text="Meter Tool"> - <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/> - <tocitem text="Reading View" target="DeviceTool_Reading_View"/> - <tocitem text="Export Data" target="DeviceTool_Export_Data"/> - <tocitem text="Configuration" target="DeviceTool_Configuration"/> - <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/> - <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/> - <tocitem text="List" target="DeviceTool_List"/> - <tocitem text="File Import" target="DeviceTool_File_Import"/> - <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/> - </tocitem> - - <tocitem text="Pump Tool"> - <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/> - <tocitem text="Reading View" target="DeviceTool_Reading_View"/> - <tocitem text="Reading Configuration View" target="DeviceTool_Reading_Config_View"/> - <tocitem text="Export Data" target="DeviceTool_Export_Data"/> - <tocitem text="Configuration" target="DeviceTool_Configuration"/> - <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/> - <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/> - <tocitem text="List" target="DeviceTool_List"/> - <tocitem text="File Import" target="DeviceTool_File_Import"/> - <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/> - - <tocitem text="Manual Entry / Pump Data Overview"> - - <tocitem text="Pump Data Overview" target="PumpTool_Data_Overview"/> - <tocitem text="Pump Data Add/Edit" target="PumpTool_Data_AddEdit"/> - <tocitem text="Add Additional Data 1" target="PumpTool_Data_Additional_1"/> - <tocitem text="Add Additional Data 2" target="PumpTool_Data_Additional_2"/> - - <tocitem text="Bolus Helper" target="GGC_Tools_BolusHelper"/> - <tocitem text="Food by Description" target="GGC_Tools_FoodDescription"/> - - <tocitem text="Profile Selector" target="PumpTool_Profile_Selector"/> - <tocitem text="Profile Editor" target="PumpTool_Profile_Editor"/> - - <tocitem text="Profile Type Selector" target="PumpTool_Profile_Type_Selector"/> - <tocitem text="Profile Entry Editor" target="PumpTool_Profile_Entry_Editor"/> - </tocitem> - - - <tocitem text="HbA1c "> - <tocitem text="HbA1c View " target="GGC_BG_HbA1c"/> - </tocitem> - - <tocitem text="Ratio "> - <tocitem text="Base Ratio" target="GGC_Ratio_Base"/> - <tocitem text="Extended Ratio" target="GGC_Ratio_Extended"/> - <tocitem text="Ratio Calculator" target="GGC_Ratio_Calculator"/> - </tocitem> - </tocitem> - - - <tocitem text="CGMS Tool"> - <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/> - <tocitem text="Reading View" target="DeviceTool_Reading_View"/> - <tocitem text="Export Data" target="DeviceTool_Export_Data"/> - <tocitem text="Configuration" target="DeviceTool_Configuration"/> - <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/> - <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/> - <tocitem text="List" target="DeviceTool_List"/> - <tocitem text="File Import" target="DeviceTool_File_Import"/> - <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/> - </tocitem> - - </tocitem> - -</tocitem> -</toc> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml (from rev 1397, trunk/ggc-help/src/main/resources/help/en/GGCTOC.xml) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" + "http://java.sun.com/products/javahelp/toc_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net--> + +<toc version="1.0"> + <tocitem text="GGC Help " target="GGC_Main"> + <tocitem text="File "> + <tocitem text="Login " target="GGC_File_Login"/> + <tocitem text="Logout " target="GGC_File_Logout"/> + </tocitem> + + <tocitem text="Pen/Injection"> + + <tocitem text="Daily "> + <tocitem text="Daily Entries View" target="GGC_BG_Daily_View"/> + <tocitem text="Daily Entries Add" target="GGC_BG_Daily_Add"/> + <tocitem text="Bolus Helper" target="GGC_PenInj_BolusHelper"/> + <tocitem text="Meals, Foods Selector" target="GGC_MFS_Daily_Selector"/> + <tocitem text="Meals, Foods Parts Selector" target="GGC_MFS_Item_Selector"/> + <tocitem text="Food by Description" target="GGC_Tools_FoodDescription"/> + </tocitem> + + <tocitem text="Graph "> + <tocitem text="Course Graph" target="GGC_BG_Graph_Course"/> + <tocitem text="Spread Graph" target="GGC_BG_Graph_Spread"/> + <tocitem text="Frequency Graph" target="GGC_BG_Graph_Frequency"/> + + + </tocitem> + + <tocitem text="HbA1c "> + <tocitem text="HbA1c View" target="GGC_BG_HbA1c"/> + </tocitem> + + <tocitem text="Ratio "> + <tocitem text="Base Ratio" target="GGC_Ratio_Base"/> + <tocitem text="Extended Ratio" target="GGC_Ratio_Extended"/> + <tocitem text="Ratio Calculator" target="GGC_Ratio_Calculator"/> + </tocitem> + </tocitem> + + <tocitem text="Food"> + <tocitem text="USDA Database "> + <tocitem text="Main " target="GGC_Food_USDA_Main"/> + <tocitem text="Group View " target="GGC_Food_USDA_Group"/> + <tocitem text="Food View " target="GGC_Food_USDA_View"/> + </tocitem> + + <tocitem text="User Database "> + <tocitem text="Main " target="GGC_Food_User_Main"/> + <tocitem text="Food Add/Edit " target="GGC_Food_User_Food_Edit"/> + <tocitem text="Food View " target="GGC_Food_User_Food_View"/> + <tocitem text="Group Add/Edit " target="GGC_Food_User_Group_Edit"/> + <tocitem text="Group View " target="GGC_Food_User_Group_View"/> + <tocitem text="Nutrition Selector Main " target="GGC_Food_User_Select_Nutrition_Main"/> + <tocitem text="Nutrition Selector " target="GGC_Food_User_Select_Nutrition"/> + <tocitem text="Home Weight Selector Main " target="GGC_Food_User_Select_HomeWeight_Main"/> + <tocitem text="Home Weight Selector " target="GGC_Food_User_Select_HomeWeight"/> + </tocitem> + + <tocitem text="Meals Database "> + <tocitem text="Main " target="GGC_Food_Meal_Main"/> + <tocitem text="Group Add/Edit " target="GGC_Food_Meal_Group_Edit"/> + <tocitem text="Group View " target="GGC_Food_Meal_Group_View"/> + <tocitem text="Meal Add/Edit " target="GGC_Food_Meal_Meal_Edit"/> + <tocitem text="Meal View " target="GGC_Food_Meal_Meal_View"/> + <tocitem text="Food Parts Selector " target="GGC_Food_Meal_Select_FoodParts"/> + </tocitem> + </tocitem> + + <tocitem text="Printing "> + <tocitem text="Pen/Injection Data" target="GGC_PenInj_Print"/> + <tocitem text="Food Menus" target="GGC_Food_Print"/> + <tocitem text="Pump Data" target="PumpTool_Print"/> + </tocitem> + + <tocitem text="Graphs"> + <tocitem text="Graphs for CGMS" target="CGMSTool_Graphs"/> + </tocitem> + + <tocitem text="Preferences"> + <tocitem text="Mode" target="GGC_Prefs_Mode"/> + <tocitem text="General" target="GGC_Prefs_General"/> + <tocitem text="Medical Data" target="GGC_Prefs_MedicalData"/> + <tocitem text="Colors & Fonts" target="GGC_Prefs_Colors_Fonts"/> + <tocitem text="Rendering Quality" target="GGC_Prefs_Rendering"/> + <tocitem text="Printing" target="GGC_Prefs_Printing"/> + <tocitem text="Language" target="GGC_Prefs_Language"/> + </tocitem> + + <tocitem text="Misc"> + <tocitem text="Doctors"> + <tocitem text="Doctor's List" target="Doc_DocList"/> + <tocitem text="Add/Edit Doctor" target="Doc_DoctorDialog"/> + <tocitem text="Add/Edit Doctor Type" target="Doc_DocTypeDialog"/> + <tocitem text="Doctor Type Selector" target="Doc_DocTypeSelector"/> + <tocitem text="Add/Edit Working Time" target="Doc_WorkingTimeDialog"/> + <tocitem text="Add/Edit Time (from Working Time)" target="Doc_WorkingTimeTimeDialog"/> + </tocitem> + </tocitem> + + + <tocitem text="Tools"> + <tocitem text="Update" target="GGC_Tools_Update"/> + <tocitem text="Backup" target="GGC_Tools_Backup"/> + <tocitem text="Restore File Selector" target="GGC_Tools_Restore_File_Selector"/> + <tocitem text="Restore" target="GGC_Tools_Restore"/> + <tocitem text="Bolus Helper" target="GGC_Tools_BolusHelper"/> + </tocitem> + + + <tocitem text="Plug-ins "> + + <tocitem text="Meter Tool"> + <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/> + <tocitem text="Reading View" target="DeviceTool_Reading_View"/> + <tocitem text="Export Data" target="DeviceTool_Export_Data"/> + <tocitem text="Configuration" target="DeviceTool_Configuration"/> + <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/> + <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/> + <tocitem text="List" target="DeviceTool_List"/> + <tocitem text="File Import" target="DeviceTool_File_Import"/> + <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/> + </tocitem> + + <tocitem text="Pump Tool"> + <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/> + <tocitem text="Reading View" target="DeviceTool_Reading_View"/> + <tocitem text="Reading Configuration View" target="DeviceTool_Reading_Config_View"/> + <tocitem text="Export Data" target="DeviceTool_Export_Data"/> + <tocitem text="Configuration" target="DeviceTool_Configuration"/> + <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/> + <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/> + <tocitem text="List" target="DeviceTool_List"/> + <tocitem text="File Import" target="DeviceTool_File_Import"/> + <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/> + + <tocitem text="Manual Entry / Pump Data Overview"> + + <tocitem text="Pump Data Overview" target="PumpTool_Data_Overview"/> + <tocitem text="Pump Data Add/Edit" target="PumpTool_Data_AddEdit"/> + <tocitem text="Add Additional Data 1" target="PumpTool_Data_Additional_1"/> + <tocitem text="Add Additional Data 2" target="PumpTool_Data_Additional_2"/> + + <tocitem text="Bolus Helper" target="GGC_Tools_BolusHelper"/> + <tocitem text="Food by Description" target="GGC_Tools_FoodDescription"/> + + <tocitem text="Profile Selector" target="PumpTool_Profile_Selector"/> + <tocitem text="Profile Editor" target="PumpTool_Profile_Editor"/> + + <tocitem text="Profile Type Selector" target="PumpTool_Profile_Type_Selector"/> + <tocitem text="Profile Entry Editor" target="PumpTool_Profile_Entry_Editor"/> + </tocitem> + + + <tocitem text="HbA1c "> + <tocitem text="HbA1c View " target="GGC_BG_HbA1c"/> + </tocitem> + + <tocitem text="Ratio "> + <tocitem text="Base Ratio" target="GGC_Ratio_Base"/> + <tocitem text="Extended Ratio" target="GGC_Ratio_Extended"/> + <tocitem text="Ratio Calculator" target="GGC_Ratio_Calculator"/> + </tocitem> + </tocitem> + + + <tocitem text="CGMS Tool"> + <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/> + <tocitem text="Reading View" target="DeviceTool_Reading_View"/> + <tocitem text="Export Data" target="DeviceTool_Export_Data"/> + <tocitem text="Configuration" target="DeviceTool_Configuration"/> + <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/> + <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/> + <tocitem text="List" target="DeviceTool_List"/> + <tocitem text="File Import" target="DeviceTool_File_Import"/> + <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/> + </tocitem> + + </tocitem> + + </tocitem> +</toc> \ No newline at end of file Deleted: trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm =================================================================== --- trunk/ggc-help/src/main/resources/help/en/Map.jhm 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm 2016-12-25 11:49:54 UTC (rev 1414) @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net--> - -<map version="1.0"> - <mapID target="top" url="pages/GGC_Main.html "/> - <mapID target="popup_icon" url="images/popup.gif "/> - - - <mapID target="GGC_Main" url="pages/GGC_Main.html"/> - - <mapID target="GGC_File_Login" url="pages/GGC_File_Login.html"/> - <mapID target="GGC_File_Logout" url="pages/GGC_File_Logout.html"/> - - - <mapID target="GGC_BG_Daily_View" url="pages/GGC_BG_Daily_View.html"/> - <mapID target="GGC_BG_HbA1c" url="pages/GGC_BG_HbA1c.html"/> - - <mapID target="GGC_BG_Graph_Daily" url="pages/GGC_BG_Graph_Daily.html"/> - <mapID target="GGC_BG_Graph_Spread" url="pages/GGC_BG_Graph_Spread.html"/> - <mapID target="GGC_BG_Graph_Course" url="pages/GGC_BG_Graph_Course.html"/> - <mapID target="GGC_BG_Daily_Add" url="pages/GGC_BG_Daily_Add.html"/> - <mapID target="GGC_BG_Graph_Frequency" url="pages/GGC_BG_Graph_Frequency.html"/> - - - <mapID target="GGC_MFS_Daily_Selector" url="pages/GGC_MFS_Daily_Selector.html"/> - <mapID target="GGC_MFS_Item_Selector" url="pages/GGC_MFS_Item_Selector.html"/> - - - <mapID target="GGC_Ratio_Base" url="pages/GGC_Ratio_Base.html"/> - <mapID target="GGC_Ratio_Extended" url="pages/GGC_Ratio_Extended.html"/> - <mapID target="GGC_Ratio_Calculator" url="pages/GGC_Ratio_Calculator.html"/> - - - <mapID target="GGC_Prefs_Main" url="pages/GGC_Prefs_Main.html"/> - <mapID target="GGC_Prefs_Mode" url="pages/GGC_Prefs_Mode.html"/> - <mapID target="GGC_Prefs_General" url="pages/GGC_Prefs_General.html"/> - <mapID target="GGC_Prefs_Colors_Fonts" url="pages/GGC_Prefs_Colors_Fonts.html"/> - <mapID target="GGC_Prefs_Rendering" url="pages/GGC_Prefs_Rendering.html"/> - <mapID target="GGC_Prefs_MedicalData" url="pages/GGC_Prefs_MedicalData.html"/> - <mapID target="GGC_Prefs_Printing" url="pages/GGC_Prefs_Printing.html"/> - <mapID target="GGC_Prefs_Language" url="pages/GGC_Prefs_Language.html"/> - - - <mapID target="GGC_PenInj_Print" url="pages/GGC_PenInj_Print.html"/> - <mapID target="GGC_Food_Print" url="pages/GGC_Food_Print.html"/> - - - <mapID target="GGC_Food_Meal_Main" url="pages/GGC_Food_Meal_Main.html"/> - <mapID target="GGC_Food_User_Select_HomeWeight" url="pages/GGC_Food_User_Select_HomeWeight.html"/> - <mapID target="GGC_Food_Meal_Meal_View" url="pages/GGC_Food_Meal_Meal_View.html"/> - <mapID target="GGC_Food_Meal_Select_FoodParts" url="pages/GGC_Food_Meal_Select_FoodParts.html"/> - <mapID target="GGC_Food_User_Food_View" url="pages/GGC_Food_User_Food_View.html"/> - <mapID target="GGC_Food_User_Select_Nutrition" url="pages/GGC_Food_User_Select_Nutrition.html"/> - <mapID target="GGC_Food_Meal_Group_View" url="pages/GGC_Food_Meal_Group_View.html"/> - <mapID target="GGC_Food_User_Group_View" url="pages/GGC_Food_User_Group_View.html"/> - <mapID target="GGC_Food_User_Group_Edit" url="pages/GGC_Food_User_Group_Edit.html"/> - <mapID target="GGC_Food_Meal_Meal_Edit" url="pages/GGC_Food_Meal_Meal_Edit.html"/> - <mapID target="GGC_Food_User_Food_Edit" url="pages/GGC_Food_User_Food_Edit.html"/> - <mapID target="GGC_Food_User_Select_Nutrition_Main" url="pages/GGC_Food_User_Select_Nutrition_Main.html"/> - <mapID target="GGC_Food_User_Main" url="pages/GGC_Food_User_Main.html"/> - <mapID target="GGC_Food_USDA_View" url="pages/GGC_Food_USDA_View.html"/> - <mapID target="GGC_Food_User_Select_HomeWeight_Main" url="pages/GGC_Food_User_Select_HomeWeight_Main.html"/> - <mapID target="GGC_Food_USDA_Group" url="pages/GGC_Food_USDA_Group.html"/> - <mapID target="GGC_Food_Meal_Group_Edit" url="pages/GGC_Food_Meal_Group_Edit.html"/> - <mapID target="GGC_Food_USDA_Main" url="pages/GGC_Food_USDA_Main.html"/> - - - <mapID target="GGC_Tools_Update" url="pages/GGC_Tools_Update.html"/> - <mapID target="GGC_Tools_Backup" url="pages/GGC_Tools_Backup.html"/> - <mapID target="GGC_Tools_Restore" url="pages/GGC_Tools_Restore.html"/> - <mapID target="GGC_Tools_Restore_File_Selector" url="pages/GGC_Tools_Restore_File_Selector.html"/> - <mapID target="GGC_Tools_BolusHelper" url="pages/GGC_Tools_BolusHelper.html"/> - <mapID target="GGC_Tools_FoodDescription" url="pages/GGC_Tools_FoodDescription.html"/> - - - <mapID target="DeviceTool_Read_Instruction" url="pages/DeviceTool_Read_Instruction.html"/> - <mapID target="DeviceTool_Reading_View" url="pages/DeviceTool_Reading_View.html"/> - <mapID target="DeviceTool_Reading_Config_View" url="pages/DeviceTool_Reading_Config_View.html"/> - <mapID target="DeviceTool_Export_Data" url="pages/DeviceTool_Export_Data.html"/> - <mapID target="DeviceTool_Configuration" url="pages/DeviceTool_Configuration.html"/> - <mapID target="DeviceTool_Configuration_DeviceSelector" url="pages/DeviceTool_Configuration_DeviceSelector.html"/> - <mapID target="DeviceTool_Configuration_PortSelector" url="pages/DeviceTool_Configuration_PortSelector.html"/> - <mapID target="DeviceTool_List" url="pages/DeviceTool_List.html"/> - <mapID target="DeviceTool_File_Import" url="pages/DeviceTool_File_Import.html"/> - <mapID target="DeviceTool_File_Import_Type" url="pages/DeviceTool_File_Import_Type.html"/> - - - <mapID target="PumpTool_Print" url="pages/PumpTool_Print.html"/> - - <mapID target="PumpTool_Data_Overview" url="pages/PumpTool_Data_Overview.html"/> - <mapID target="PumpTool_Data_AddEdit" url="pages/PumpTool_Data_AddEdit.html"/> - <mapID target="PumpTool_Data_Additional_1" url="pages/PumpTool_Data_Additional_1.html"/> - <mapID target="PumpTool_Data_Additional_2" url="pages/PumpTool_Data_Additional_2.html"/> - <mapID target="PumpTool_Profile_Selector" url="pages/PumpTool_Profile_Selector.html"/> - <mapID target="PumpTool_Profile_Editor" url="pages/PumpTool_Profile_Editor.html"/> - <mapID target="PumpTool_Profile_Type_Selector" url="pages/PumpTool_Profile_Editor.html"/> - <mapID target="PumpTool_Profile_Entry_Editor" url="pages/PumpTool_Profile_Entry_Editor.html"/> - - - <mapID target="images.popup" url="images/popup.gif"/> - -</map> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm (from rev 1397, trunk/ggc-help/src/main/resources/help/en/Map.jhm) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" + "http://java.sun.com/products/javahelp/map_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net--> + +<map version="1.0"> + <mapID target="top" url="pages/GGC_Main.html "/> + <mapID target="popup_icon" url="images/popup.gif "/> + + + <mapID target="GGC_Main" url="pages/GGC_Main.html"/> + + <mapID target="GGC_File_Login" url="pages/GGC_File_Login.html"/> + <mapID target="GGC_File_Logout" url="pages/GGC_File_Logout.html"/> + + + <mapID target="GGC_BG_Daily_View" url="pages/GGC_BG_Daily_View.html"/> + <mapID target="GGC_BG_Daily_Add" url="pages/GGC_BG_Daily_Add.html"/> + + <mapID target="GGC_BG_HbA1c" url="pages/GGC_BG_HbA1c.html"/> + <mapID target="GGC_BG_Graph_Daily" url="pages/GGC_BG_Graph_Daily.html"/> + <mapID target="GGC_BG_Graph_Spread" url="pages/GGC_BG_Graph_Spread.html"/> + <mapID target="GGC_BG_Graph_Course" url="pages/GGC_BG_Graph_Course.html"/> + <mapID target="GGC_BG_Graph_Frequency" url="pages/GGC_BG_Graph_Frequency.html"/> + + + <mapID target="GGC_MFS_Daily_Selector" url="pages/GGC_MFS_Daily_Selector.html"/> + <mapID target="GGC_MFS_Item_Selector" url="pages/GGC_MFS_Item_Selector.html"/> + + + <mapID target="GGC_Ratio_Base" url="pages/GGC_Ratio_Base.html"/> + <mapID target="GGC_Ratio_Extended" url="pages/GGC_Ratio_Extended.html"/> + <mapID target="GGC_Ratio_Calculator" url="pages/GGC_Ratio_Calculator.html"/> + <mapID target="GGC_Ratio_Entry" url="pages/GGC_Ratio_Entry.html"/> + + + <mapID target="GGC_Prefs_Main" url="pages/GGC_Prefs_Main.html"/> + <mapID target="GGC_Prefs_Mode" url="pages/GGC_Prefs_Mode.html"/> + <mapID target="GGC_Prefs_General" url="pages/GGC_Prefs_General.html"/> + <mapID target="GGC_Prefs_Colors_Fonts" url="pages/GGC_Prefs_Colors_Fonts.html"/> + <mapID target="GGC_Prefs_Rendering" url="pages/GGC_Prefs_Rendering.html"/> + <mapID target="GGC_Prefs_MedicalData" url="pages/GGC_Prefs_MedicalData.html"/> + <mapID target="GGC_Prefs_Printing" url="pages/GGC_Prefs_Printing.html"/> + <mapID target="GGC_Prefs_Language" url="pages/GGC_Prefs_Language.html"/> + <mapID target="GGC_Prefs_Pump" url="pages/GGC_Prefs_Pump.html"/> + <mapID target="GGC_Prefs_CGMS" url="pages/GGC_Prefs_CGMS.html"/> + + + <mapID target="GGC_PenInj_Print" url="pages/GGC_Print_Pen.html"/> + <!-- FIx keywords --> + <mapID target="GGC_Food_Print" url="pages/GGC_Print_FoodMenu.html"/> + <mapID target="PumpTool_Print" url="pages/GGC_Print_Pump.html"/> + <mapID target="CGMSTool_Print" url="pages/GGC_Print_CGMS.html"/> + + <mapID target="CGMSTool_Graphs" url="pages/GGC_Graph_CGMS.html"/> + + + <mapID target="GGC_Food_USDA_Main" url="pages/GGC_Food_USDA_Main.html"/> + <mapID target="GGC_Food_USDA_View" url="pages/GGC_Food_USDA_View.html"/> + <mapID target="GGC_Food_USDA_Group" url="pages/GGC_Food_USDA_Group.html"/> + + <mapID target="GGC_Food_User_Main" url="pages/GGC_Food_User_Main.html"/> + <mapID target="GGC_Food_User_Food_View" url="pages/GGC_Food_User_Food_View.html"/> + <mapID target="GGC_Food_User_Food_Edit" url="pages/GGC_Food_User_Food_Edit.html"/> + <mapID target="GGC_Food_User_Group_View" url="pages/GGC_Food_User_Group_View.html"/> + <mapID target="GGC_Food_User_Group_Edit" url="pages/GGC_Food_User_Group_Edit.html"/> + + <mapID target="GGC_Food_User_Group_Select" url="pages/GGC_Food_User_Select_Group.html"/> + <mapID target="GGC_Food_User_Select_Nutrition_Main" url="pages/GGC_Food_User_Select_Nutrition_Main.html"/> + <mapID target="GGC_Food_User_Select_Nutrition" url="pages/GGC_Food_User_Select_Nutrition.html"/> + <mapID target="GGC_Food_User_Select_HomeWeight_Main" url="pages/GGC_Food_User_Select_HomeWeight_Main.html"/> + <mapID target="GGC_Food_User_Select_HomeWeight" url="pages/GGC_Food_User_Select_HomeWeight.html"/> + + + <mapID target="GGC_Food_Meal_Main" url="pages/GGC_Food_Meal_Main.html"/> + <mapID target="GGC_Food_Meal_Meal_View" url="pages/GGC_Food_Meal_Meal_View.html"/> + <mapID target="GGC_Food_Meal_Meal_Edit" url="pages/GGC_Food_Meal_Meal_Edit.html"/> + <mapID target="GGC_Food_Meal_Select_FoodParts" url="pages/GGC_Food_Meal_Select_FoodParts.html"/> + <mapID target="GGC_Food_Meal_Group_View" url="pages/GGC_Food_Meal_Group_View.html"/> + <mapID target="GGC_Food_Meal_Group_Edit" url="pages/GGC_Food_Meal_Group_Edit.html"/> + + + <mapID target="GGC_Tools_Update" url="pages/GGC_Tools_Update.html"/> + <mapID target="GGC_Tools_Backup" url="pages/GGC_Tools_Backup.html"/> + <mapID target="GGC_Tools_Restore" url="pages/GGC_Tools_Restore.html"/> + <mapID target="GGC_Tools_Restore_File_Selector" url="pages/GGC_Tools_Restore_File_Selector.html"/> + <mapID target="GGC_Tools_BolusHelper" url="pages/GGC_Tools_BolusHelper.html"/> + <mapID target="GGC_Tools_FoodDescription" url="pages/GGC_Tools_FoodDescription.html"/> + + + <mapID target="DeviceTool_Read_Instruction" url="pages/DeviceTool_Read_Instruction.html"/> + <mapID target="DeviceTool_Reading_View" url="pages/DeviceTool_Reading_View.html"/> + <mapID target="DeviceTool_Reading_Config_View" url="pages/DeviceTool_Reading_Config_View.html"/> + <mapID target="DeviceTool_Export_Data" url="pages/DeviceTool_Export_Data.html"/> + <mapID target="DeviceTool_Configuration" url="pages/DeviceTool_Configuration.html"/> + <mapID target="DeviceTool_Configuration_DeviceSelector" url="pages/DeviceTool_Configuration_DeviceSelector.html"/> + <mapID target="DeviceTool_Configuration_PortSelector" url="pages/DeviceTool_Configuration_PortSelector.html"/> + <mapID target="DeviceTool_List" url="pages/DeviceTool_List.html"/> + <mapID target="DeviceTool_File_Import" url="pages/DeviceTool_File_Import.html"/> + <mapID target="DeviceTool_File_Import_Type" url="pages/DeviceTool_File_Import_Type.html"/> + + + <mapID target="PumpTool_Data_Overview" url="pages/PumpTool_Data_Overview.html"/> + <mapID target="PumpTool_Data_AddEdit" url="pages/PumpTool_Data_AddEdit.html"/> + <mapID target="PumpTool_Data_Additional_1" url="pages/PumpTool_Data_Additional_1.html"/> + <mapID target="PumpTool_Data_Additional_2" url="pages/PumpTool_Data_Additional_2.html"/> + <mapID target="PumpTool_Profile_Selector" url="pages/PumpTool_Profile_Selector.html"/> + <mapID target="PumpTool_Profile_Editor" url="pages/PumpTool_Profile_Editor.html"/> + <mapID target="PumpTool_Profile_Entry_Editor" url="pages/PumpTool_Profile_Entry_Editor.html"/> + <mapID target="PumpTool_Profile_Type_Selector" url="pages/PumpTool_Profile_Type_Selector.html"/> + + <!-- Doctor --> + <mapID target="Doc_DocList" url="pages/GGC_Doc_DocList.html"/> + <mapID target="Doc_DoctorDialog" url="pages/GGC_Doc_DoctorDialog.html"/> + <mapID target="Doc_DocTypeDialog" url="pages/GGC_Doc_DocTypeAddEdit.html"/> + <mapID target="Doc_DocTypeSelector" url="pages/GGC_Doc_DocTypeSelector.html"/> + <mapID target="Doc_WorkingTimeDialog" url="pages/GGC_Doc_WorkingTimeDialog.html"/> + <mapID target="Doc_WorkingTimeTimeDialog" url="pages/GGC_Doc_WorkingTimeTimeDialog.html"/> + + <mapID target="images.popup" url="images/popup.gif"/> + +</map> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,7 @@ +<html> +<body> +<h1>Doctor's List</h1> + + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,7 @@ +<html> +<body> +<h1>Add/Edit Doctor Type</h1> + + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,7 @@ +<html> +<body> +<h1>Doctor Type Selector</h1> + + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,7 @@ +<html> +<body> +<h1>Add/Edit Doctor</h1> + + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,7 @@ +<html> +<body> +<h1>Add/Edit Working Time</h1> + + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,7 @@ +<html> +<body> +<h1>Add/Edit Time (for Working Time)</h1> + + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,8 @@ +<html> +<body> +<h1>User Db - Select Group</h1> +<br> +This help file is not available yet. English help should be available (at least) in version 1.0. + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,7 @@ +<html> +<title>Graphs - CGMS</title> + +<body> +<h1>Graphs - CGMS</h1> +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,8 @@ +<html> +<body> +<h1>Preferences - CGMS</h1> +<br> +This help file is not available yet. English help should be available (at least) in version 1.0. + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,8 @@ +<html> +<body> +<h1>Preferences - Pump</h1> +<br> +This help file is not available yet. English help should be available (at least) in version 1.0. + +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,7 @@ +<html> +<title>Printing CGMS Data</title> + +<body> +<h1>Printing Pump Data</h1> +</body> +</html> \ No newline at end of file Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html) =================================================================== --- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html (rev 0) +++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html 2016-12-25 11:49:54 UTC (rev 1414) @@ -0,0 +1,10 @@ +<html> +<title>Ratio - Extended - Entry</title> + +<body> +<h1>Ratio - Extended</h1> +<br> +This help file is not available yet. English help should be available (at least) in version 1.0. + +</body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 11:47:39
|
Revision: 1413 http://sourceforge.net/p/ggc/code/1413 Author: andyrozman Date: 2016-12-25 11:47:37 +0000 (Sun, 25 Dec 2016) Log Message: ----------- GGC Support - added new project - moved ggc-help here Added Paths: ----------- trunk/ggc-support/ggc-support/ trunk/ggc-support/ggc-support/data/ trunk/ggc-support/ggc-support/developers/ trunk/ggc-support/ggc-support/doc/ trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt trunk/ggc-support/ggc-support/eclipse/ trunk/ggc-support/ggc-support/lib/ trunk/ggc-support/pom.xml Removed Paths: ------------- trunk/ggc-help/pom.xml trunk/ggc-support/data/ trunk/ggc-support/developers/ trunk/ggc-support/doc/ trunk/ggc-support/eclipse/ trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt trunk/ggc-support/lib/ Deleted: trunk/ggc-help/pom.xml =================================================================== --- trunk/ggc-help/pom.xml 2016-12-25 11:30:16 UTC (rev 1412) +++ trunk/ggc-help/pom.xml 2016-12-25 11:47:37 UTC (rev 1413) @@ -1,48 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>net.sf.ggc</groupId> - <artifactId>ggc-parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>../ggc-master-pom/pom.xml</relativePath> - </parent> - - <name>GGC Help Project</name> - - <artifactId>ggc-help</artifactId> - <version>${ggc-help.version}</version> - - - <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> - <sourceDirectory>src/main/java</sourceDirectory> - <scriptSourceDirectory>src/main/resources</scriptSourceDirectory> - <testSourceDirectory>src/test/java</testSourceDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - </build> - - <dependencies> - <dependency> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </dependency> - </dependencies> -</project> Deleted: trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh =================================================================== --- trunk/ggc-support/doc/deployment/createFullDependencies.sh 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh 2016-12-25 11:47:37 UTC (rev 1413) @@ -1,125 +0,0 @@ -#!/bin/sh - -export GGC_VERSION=0.6 -export GGC_DEPLOY_TARGET=/mnt/d/GGC/deploy -export GGC_ROOT=/home/andy/workspaces/andy-iplayground4/ggc - - - - -echo Prepare target directory - -cd $GGC_DEPLOY_TARGET - -rm -Rf $GGC_VERSION - -mkdir $GGC_VERSION -cd $GGC_VERSION - -echo Copy dependencies -mkdir dependencies -cd dependencies - -echo ... GGC Core -cp $GGC_ROOT/ggc-core/target/dependency/*.* . - -echo ... GGC Plugin Base -cp $GGC_ROOT/ggc-plugin_base/target/dependency/*.* . - -echo ... GGC Nutrition -cp $GGC_ROOT/ggc-nutri/target/dependency/*.* . - -echo ... GGC Help -cp $GGC_ROOT/ggc-help/target/dependency/*.* . - -echo ... GGC Meter Plugin -cp $GGC_ROOT/ggc-meter/target/dependency/*.* . - -echo ... GGC Pump Plugin -cp $GGC_ROOT/ggc-pump/target/dependency/*.* . - -echo ... GGC CGMS Plugin -cp $GGC_ROOT/ggc-cgm/target/dependency/*.* . - -echo ... GGC Desktop -cp $GGC_ROOT/ggc-desktop/target/dependency/*.* . - - -cd .. - - -echo Create repository - -mkdir repository -cd repository - -echo ... GGC Core -cp -R $GGC_ROOT/ggc-core/target/dependency/* . - -echo ... GGC Plugin Base -cp -R $GGC_ROOT/ggc-plugin_base/target/dependency/* . - -echo ... GGC Nutrition -cp -R $GGC_ROOT/ggc-nutri/target/dependency/* . - -echo ... GGC Help -cp -R $GGC_ROOT/ggc-help/target/dependency/* . - -echo ... GGC Meter Plugin -cp -R $GGC_ROOT/ggc-meter/target/dependency/* . - -echo ... GGC Pump Plugin -cp -R $GGC_ROOT/ggc-pump/target/dependency/* . - -echo ... GGC CGMS Plugin -cp -R $GGC_ROOT/ggc-cgm/target/dependency/* . - -echo ... GGC Desktop -cp -R $GGC_ROOT/ggc-desktop/target/dependency/* . - - - -cd .. - - - - -echo Copy documentation - this is done dinamically and sometime statically, check if you added any new docs - -mkdir documentation -cd documentation - -echo ... GGC Desktop -cp -R $GGC_ROOT/ggc-desktop/doc/* . - -echo ... GGC Plugin Base -mkdir tools-base -cp $GGC_ROOT/ggc-plugin_base/docs/* ./tools-base/. - -echo ... GGC Nutrition -mkdir plugin-nutrition -cp $GGC_ROOT/ggc-nutri/docs/* ./plugin-nutrition/. - -echo ... GGC Help -mkdir help -cp $GGC_ROOT/ggc-help/docs/* ./help/. - -echo ... GGC Meter Plugin -mkdir plugin-meter -cp $GGC_ROOT/ggc-meter/docs/* ./plugin-meter/. - -echo ... GGC Pump Plugin -mkdir plugin-pump -cp $GGC_ROOT/ggc-pump/docs/* ./plugin-pump/. - - -echo ... GGC CGMS Plugin -mkdir plugin-cgms -cp $GGC_ROOT/ggc-cgm/doc/* ./plugin-cgms/. - -echo ... GGC Core -mkdir core -cp $GGC_ROOT/ggc-core/docs/* ./core/. - -echo All preparation for GGC deployment finished. - Copied: trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh (from rev 1410, trunk/ggc-support/doc/deployment/createFullDependencies.sh) =================================================================== --- trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh (rev 0) +++ trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh 2016-12-25 11:47:37 UTC (rev 1413) @@ -0,0 +1,162 @@ +#!/bin/sh + +export GGC_VERSION=0.7 +export GGC_DEPLOY_TARGET=/u01/GGC/deploy +export GGC_ROOT=/home/andy/workspaces/andy-iplayground4/ggc + + + + +echo Prepare target directory + +cd $GGC_DEPLOY_TARGET + +rm -Rf $GGC_VERSION + +mkdir $GGC_VERSION +cd $GGC_VERSION + +echo Copy dependencies +mkdir dependencies +cd dependencies + +echo ... GGC Core +cp -R $GGC_ROOT/ggc-core/target/dependency/* . + +echo ... GGC Plugin Base +cp -R $GGC_ROOT/ggc-plugin_base/target/dependency/* . + +echo ... GGC Nutrition +cp -R $GGC_ROOT/ggc-nutri/target/dependency/* . + +echo ... GGC Help +cp -R $GGC_ROOT/ggc-help/target/dependency/* . + +echo ... GGC Meter Plugin +cp -R $GGC_ROOT/ggc-meter/target/dependency/* . + +echo ... GGC Pump Plugin +cp -R $GGC_ROOT/ggc-pump/target/dependency/* . + +echo ... GGC CGMS Plugin +cp -R $GGC_ROOT/ggc-cgm/target/dependency/* . + +echo ... GGC Desktop +cp -R $GGC_ROOT/ggc-desktop/target/dependency/* . +cp $GGC_ROOT/ggc-desktop/target/*.jar . + +cd .. + + +echo Create repository + +mkdir repository +cd repository + +echo ... GGC Core +cp -R $GGC_ROOT/ggc-core/target/dependency/* . + +echo ... GGC Plugin Base +cp -R $GGC_ROOT/ggc-plugin_base/target/dependency/* . + +echo ... GGC Nutrition +cp -R $GGC_ROOT/ggc-nutri/target/dependency/* . + +echo ... GGC Help +cp -R $GGC_ROOT/ggc-help/target/dependency/* . + +echo ... GGC Meter Plugin +cp -R $GGC_ROOT/ggc-meter/target/dependency/* . + +echo ... GGC Pump Plugin +cp -R $GGC_ROOT/ggc-pump/target/dependency/* . + +echo ... GGC CGMS Plugin +cp -R $GGC_ROOT/ggc-cgm/target/dependency/* . + +echo ... GGC Desktop +cp -R $GGC_ROOT/ggc-desktop/target/dependency/* . +cp $GGC_ROOT/ggc-desktop/target/*.jar . + + + +cd .. + + + + +echo Copy documentation - this is done dinamically and sometime statically, check if you added any new docs + +mkdir documentation +cd documentation + +echo ... GGC Desktop +cp -R $GGC_ROOT/ggc-desktop/doc/* . + +echo ... GGC Plugin Base +mkdir tools-base +cp $GGC_ROOT/ggc-plugin_base/docs/* ./tools-base/. + +echo ... GGC Nutrition +mkdir plugin-nutrition +cp $GGC_ROOT/ggc-nutri/docs/* ./plugin-nutrition/. + +echo ... GGC Help +mkdir help +cp $GGC_ROOT/ggc-help/docs/* ./help/. + +echo ... GGC Meter Plugin +mkdir plugin-meter +cp $GGC_ROOT/ggc-meter/docs/* ./plugin-meter/. + +echo ... GGC Pump Plugin +mkdir plugin-pump +cp $GGC_ROOT/ggc-pump/docs/* ./plugin-pump/. + + +echo ... GGC CGMS Plugin +mkdir plugin-cgms +cp $GGC_ROOT/ggc-cgm/doc/* ./plugin-cgms/. + +echo ... GGC Core +mkdir core +cp $GGC_ROOT/ggc-core/docs/* ./core/. + +cd .. + + +echo Create app +mkdir app +cd app + +echo ... GGC Core +cp $GGC_ROOT/ggc-core/target/*.jar . + +echo ... GGC Plugin Base +cp $GGC_ROOT/ggc-plugin_base/target/*.jar . + +echo ... GGC Nutrition +cp $GGC_ROOT/ggc-nutri/target/*.jar . + +echo ... GGC Help +cp $GGC_ROOT/ggc-help/target/*.jar . + +echo ... GGC Meter Plugin +cp $GGC_ROOT/ggc-meter/target/*.jar . + +echo ... GGC Pump Plugin +cp $GGC_ROOT/ggc-pump/target/*.jar . + +echo ... GGC CGMS Plugin +cp $GGC_ROOT/ggc-cgm/target/*.jar . + +echo ... GGC Desktop +cp $GGC_ROOT/ggc-desktop/target/*.jar . + + +cd .. +cd .. + + +echo All preparation for GGC deployment finished. + Deleted: trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt =================================================================== --- trunk/ggc-support/doc/deployment/deployment-HowTo.txt 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt 2016-12-25 11:47:37 UTC (rev 1413) @@ -1,73 +0,0 @@ - -DEPLOYMENT PROCESS (WITH MAVEN) - - -1. Make full build: -mvn clean install in root - - -2. Make dependencies build: -a.) mvn dependency:copy-dependencies -b.) mvn dependency:copy-dependencies "-Dmdep.useRepositoryLayout=true" "-DcopyPom=true" - -mvn dependency:copy-dependencies -Dmdep.useRepositoryLayout=true -DcopyPom=true - - -3. Copy createFullDependencies.sh to ggc root and run it. It will copy all dependencies from all projects into - specified (in .sh) directory. This will also copy together all documentation. - - -4. Compare new dependencies to old one (previous release) and copy them to target deployment directory and - prepare new GGCUpdate.properties configuration. - - -5. Sort copied documentation from step 3 - - -6. Make final deployment artifacts: - - zip deployment of project (GGC-<version>.zip) - - copy all files to windows build environent and create Windows installer - - create update zip (update from 0.3.0 version) - - -7. Send mail to all testers (GGC Testers list) with link to new version. - ---- WAIT 2 weeks and fix problems, start again with step 1 and then skip step 7 or give software for retest - - - -8. Prepare entries for Update Server (xml of GGCUpdate, copy update zip) - - -9. Prepare Web page - - -10. Release deployment files to sf.net and deploy web page - - -a) - -b) -sftp jsmith,foo...@fr... -cd htdocs -put <files> - - - -11. Deploy some documentation to Website if required - - - -12. Tag released version in SVN - -svn copy svn+ssh://and...@sv.../p/ggc/code/trunk \ - svn+ssh://and...@sv.../p/ggc/code/tags/0.6.0 -m "GGC 0.6.0" - - - ---- Useful commands - -A) Create dependency tree - - mvn dependency:tree > deps.txt - Copied: trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt (from rev 1410, trunk/ggc-support/doc/deployment/deployment-HowTo.txt) =================================================================== --- trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt (rev 0) +++ trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt 2016-12-25 11:47:37 UTC (rev 1413) @@ -0,0 +1,76 @@ + +DEPLOYMENT PROCESS (WITH MAVEN) + + +1. Make full build: +mvn clean install in root + + +2. Make dependencies build: +a.) mvn dependency:copy-dependencies +b.) mvn dependency:copy-dependencies "-Dmdep.useRepositoryLayout=true" "-DcopyPom=true" + +mvn dependency:copy-dependencies -Dmdep.useRepositoryLayout=true -DcopyPom=true + + +3. Copy createFullDependencies.sh to ggc root and run it. It will copy all dependencies from all projects into + specified (in .sh) directory. This will also copy together all documentation. + + +4. Compare new dependencies to old one (previous release) and copy them to target deployment directory and + prepare new GGCUpdate.properties configuration. +4.a) Copy .m2 respository difference to atech-software.com: + scp -P 12488 repository_diff.tar.bz2 andy@188.40.149.16:~/ + + +5. Sort copied documentation from step 3 + + +6. Make final deployment artifacts: + - zip deployment of project (GGC-<version>.zip) + - copy all files to windows build environent and create Windows installer + - create update zip (update from 0.3.0 version) + + +7. Send mail to all testers (GGC Testers list) with link to new version. + +--- WAIT 2 weeks and fix problems, start again with step 1 and then skip step 7 or give software for retest + + + +8. Prepare entries for Update Server (xml of GGCUpdate, copy update zip) + + +9. Prepare Web page + + +10. Release deployment files to sf.net and deploy web page + + +a) + +b) +sftp jsmith,foo...@fr... +cd htdocs +put <files> + + + +11. Deploy some documentation to Website if required + + + +12. Tag released version in SVN + +svn copy svn+ssh://and...@sv.../p/ggc/code/trunk \ + svn+ssh://and...@sv.../p/ggc/code/tags/0.6.0 -m "GGC 0.6.0" + +svn copy svn+ssh://and...@sv.../p/atech-tools/code/trunk \ + svn+ssh://and...@sv.../p/atech-tools/code/tags/0.7.13 -m "Atech Tools 0.7.13 for GGC 0.6.1" + +--- Useful commands + +A) Create dependency tree + + mvn dependency:tree > deps.txt + Copied: trunk/ggc-support/pom.xml (from rev 1367, trunk/ggc-help/pom.xml) =================================================================== --- trunk/ggc-support/pom.xml (rev 0) +++ trunk/ggc-support/pom.xml 2016-12-25 11:47:37 UTC (rev 1413) @@ -0,0 +1,21 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>net.sf.ggc</groupId> + <artifactId>ggc-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../ggc-master-pom/pom.xml</relativePath> + </parent> + + <name>GGC Support</name> + <artifactId>support</artifactId> + <version>1.0-SNAPSHOT</version> + + <modules> + <module>ggc-help</module> + </modules> + + +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-12-25 11:30:19
|
Revision: 1412 http://sourceforge.net/p/ggc/code/1412 Author: andyrozman Date: 2016-12-25 11:30:16 +0000 (Sun, 25 Dec 2016) Log Message: ----------- - added ggc-removed to tree - moved ggc-mobile - moved ggc-ppc Modified Paths: -------------- trunk/ggc-removed/ggc-mobile/build/build.xml Added Paths: ----------- trunk/ggc-removed/ trunk/ggc-removed/ggc-mobile/ trunk/ggc-removed/ggc-ppc/ Removed Paths: ------------- trunk/ggc-mobile/ trunk/ggc-ppc/ Modified: trunk/ggc-removed/ggc-mobile/build/build.xml =================================================================== --- trunk/ggc-mobile/build/build.xml 2015-10-06 18:05:41 UTC (rev 1367) +++ trunk/ggc-removed/ggc-mobile/build/build.xml 2016-12-25 11:30:16 UTC (rev 1412) @@ -1,12 +1,12 @@ <?xml version="1.0" ?> -<project name="GGC Mobile" default="build" basedir="."> +<project name="GGC Mobile" default="build" basedir=""> <description> Build file for GGC </description> <!-- Environment properties read from a file ...--> - <property file="./GGCMobileBuild.properties"/> - <property file="./GGCMobileVersion.properties"/> + <property file="GGCMobileBuild.properties"/> + <property file="GGCMobileVersion.properties"/> <!-- These should *not* be modified on the command line! --> <property name="build.dir" value="${outdir.dir}/classes"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-09-13 20:04:23
|
Revision: 1411 http://sourceforge.net/p/ggc/code/1411 Author: andyrozman Date: 2016-09-13 20:04:22 +0000 (Tue, 13 Sep 2016) Log Message: ----------- GGC 0.7.0 Added Paths: ----------- tags/0.7.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-09-13 20:02:39
|
Revision: 1410 http://sourceforge.net/p/ggc/code/1410 Author: andyrozman Date: 2016-09-13 20:02:38 +0000 (Tue, 13 Sep 2016) Log Message: ----------- - final changed files to 0.7.0 Modified Paths: -------------- trunk/ggc-desktop/data/update/GGC_Update.properties trunk/ggc-support/doc/deployment/createFullDependencies.sh trunk/ggc-support/doc/deployment/deployment-HowTo.txt trunk/pom.xml trunk/web_page/inc_download.inc trunk/web_page/inc_news.inc Modified: trunk/ggc-desktop/data/update/GGC_Update.properties =================================================================== --- trunk/ggc-desktop/data/update/GGC_Update.properties 2016-06-30 20:30:13 UTC (rev 1409) +++ trunk/ggc-desktop/data/update/GGC_Update.properties 2016-09-13 20:02:38 UTC (rev 1410) @@ -66,7 +66,7 @@ # # Components # -LAST_COMPONENT=31 +LAST_COMPONENT=32 # @@ -317,6 +317,14 @@ COMPONENT_31_ROOT_DIR=/lib/utils COMPONENT_31_FILES=%ROOT%/table-layout-4.3.0.jar; + +COMPONENT_32_GROUP=3 +COMPONENT_32_NAME=Simple Xml Framework +COMPONENT_32_VERSION=2.7.1 +COMPONENT_32_VERSION_NUM=1 +COMPONENT_32_ROOT_DIR=/lib/utils +COMPONENT_32_FILES=%ROOT%/simple-xml-2.7.1.jar; + # REMOVED COMPONENTS COMPONENT_4_GROUP=1 Modified: trunk/ggc-support/doc/deployment/createFullDependencies.sh =================================================================== --- trunk/ggc-support/doc/deployment/createFullDependencies.sh 2016-06-30 20:30:13 UTC (rev 1409) +++ trunk/ggc-support/doc/deployment/createFullDependencies.sh 2016-09-13 20:02:38 UTC (rev 1410) @@ -1,7 +1,7 @@ #!/bin/sh -export GGC_VERSION=0.6 -export GGC_DEPLOY_TARGET=/mnt/d/GGC/deploy +export GGC_VERSION=0.7 +export GGC_DEPLOY_TARGET=/u01/GGC/deploy export GGC_ROOT=/home/andy/workspaces/andy-iplayground4/ggc @@ -21,30 +21,30 @@ cd dependencies echo ... GGC Core -cp $GGC_ROOT/ggc-core/target/dependency/*.* . +cp -R $GGC_ROOT/ggc-core/target/dependency/* . echo ... GGC Plugin Base -cp $GGC_ROOT/ggc-plugin_base/target/dependency/*.* . +cp -R $GGC_ROOT/ggc-plugin_base/target/dependency/* . echo ... GGC Nutrition -cp $GGC_ROOT/ggc-nutri/target/dependency/*.* . +cp -R $GGC_ROOT/ggc-nutri/target/dependency/* . echo ... GGC Help -cp $GGC_ROOT/ggc-help/target/dependency/*.* . +cp -R $GGC_ROOT/ggc-help/target/dependency/* . echo ... GGC Meter Plugin -cp $GGC_ROOT/ggc-meter/target/dependency/*.* . +cp -R $GGC_ROOT/ggc-meter/target/dependency/* . echo ... GGC Pump Plugin -cp $GGC_ROOT/ggc-pump/target/dependency/*.* . +cp -R $GGC_ROOT/ggc-pump/target/dependency/* . echo ... GGC CGMS Plugin -cp $GGC_ROOT/ggc-cgm/target/dependency/*.* . +cp -R $GGC_ROOT/ggc-cgm/target/dependency/* . echo ... GGC Desktop -cp $GGC_ROOT/ggc-desktop/target/dependency/*.* . +cp -R $GGC_ROOT/ggc-desktop/target/dependency/* . +cp $GGC_ROOT/ggc-desktop/target/*.jar . - cd .. @@ -76,6 +76,7 @@ echo ... GGC Desktop cp -R $GGC_ROOT/ggc-desktop/target/dependency/* . +cp $GGC_ROOT/ggc-desktop/target/*.jar . @@ -121,5 +122,41 @@ mkdir core cp $GGC_ROOT/ggc-core/docs/* ./core/. +cd .. + + +echo Create app +mkdir app +cd app + +echo ... GGC Core +cp $GGC_ROOT/ggc-core/target/*.jar . + +echo ... GGC Plugin Base +cp $GGC_ROOT/ggc-plugin_base/target/*.jar . + +echo ... GGC Nutrition +cp $GGC_ROOT/ggc-nutri/target/*.jar . + +echo ... GGC Help +cp $GGC_ROOT/ggc-help/target/*.jar . + +echo ... GGC Meter Plugin +cp $GGC_ROOT/ggc-meter/target/*.jar . + +echo ... GGC Pump Plugin +cp $GGC_ROOT/ggc-pump/target/*.jar . + +echo ... GGC CGMS Plugin +cp $GGC_ROOT/ggc-cgm/target/*.jar . + +echo ... GGC Desktop +cp $GGC_ROOT/ggc-desktop/target/*.jar . + + +cd .. +cd .. + + echo All preparation for GGC deployment finished. Modified: trunk/ggc-support/doc/deployment/deployment-HowTo.txt =================================================================== --- trunk/ggc-support/doc/deployment/deployment-HowTo.txt 2016-06-30 20:30:13 UTC (rev 1409) +++ trunk/ggc-support/doc/deployment/deployment-HowTo.txt 2016-09-13 20:02:38 UTC (rev 1410) @@ -19,6 +19,8 @@ 4. Compare new dependencies to old one (previous release) and copy them to target deployment directory and prepare new GGCUpdate.properties configuration. +4.a) Copy .m2 respository difference to atech-software.com: + scp -P 12488 repository_diff.tar.bz2 andy@188.40.149.16:~/ 5. Sort copied documentation from step 3 @@ -63,8 +65,9 @@ svn copy svn+ssh://and...@sv.../p/ggc/code/trunk \ svn+ssh://and...@sv.../p/ggc/code/tags/0.6.0 -m "GGC 0.6.0" +svn copy svn+ssh://and...@sv.../p/atech-tools/code/trunk \ + svn+ssh://and...@sv.../p/atech-tools/code/tags/0.7.13 -m "Atech Tools 0.7.13 for GGC 0.6.1" - --- Useful commands A) Create dependency tree Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-06-30 20:30:13 UTC (rev 1409) +++ trunk/pom.xml 2016-09-13 20:02:38 UTC (rev 1410) @@ -22,8 +22,8 @@ <module>ggc-plugin_base</module> <module>ggc-nutri</module> <module>ggc-meter</module> + <module>ggc-cgm</module> <module>ggc-pump</module> - <module>ggc-cgm</module> <module>ggc-desktop</module> </modules> Modified: trunk/web_page/inc_download.inc =================================================================== --- trunk/web_page/inc_download.inc 2016-06-30 20:30:13 UTC (rev 1409) +++ trunk/web_page/inc_download.inc 2016-09-13 20:02:38 UTC (rev 1410) @@ -48,12 +48,20 @@ <h3>GGC Releases</h3> - <h4>Version 0.7.0 [June 2016]</h4> + <h4>Version 0.7.0 [June 2016 (Windows inst. added on September 2016)]</h4> <ul> - <li><b>I am sorry but I couldn't make windows installer this time.</b></li> + <li> + <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_Setup_0.7.0_jre.exe/download"> + GGC 0.7.0 - Windows Installer with Java [Preferred for Windows users]</a> + </li> <li> + <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_Setup_0.7.0.exe/download"> + GGC 0.7.0 - Windows Installer without Java</a> + </li> + + <li> <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_0.7.0.zip/download">GGC 0.7.0 (Full) Zip file</a> </li> @@ -62,6 +70,7 @@ <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_Update_0.7.0.zip/download">GGC 0.7.0 Update Zip file</a> </li> + </ul> <h4>Version 0.6.1 [October 2015]</h4> Modified: trunk/web_page/inc_news.inc =================================================================== --- trunk/web_page/inc_news.inc 2016-06-30 20:30:13 UTC (rev 1409) +++ trunk/web_page/inc_news.inc 2016-09-13 20:02:38 UTC (rev 1410) @@ -19,14 +19,14 @@ correctly. I just got news that it might not work anymore on never Linux (it seems that USB 3.0 support broke support for Carelink USB).<br> Changes in this version:<br> - - I changed menus a little, different grouping - - added graphs from Pen to Pump (this is still work in progress, but at least some things should be working) - - added/changed reports, they now contain also CGMS data (Daily Time Sheet report for Pump) - - added some daily/weekly graphs for CGMS + - I changed menus a little, different grouping<br> + - added graphs from Pen to Pump (this is still work in progress, but at least some things should be working)<br> + - added/changed reports, they now contain also CGMS data (Daily Time Sheet report for Pump)<br> + - added some daily/weekly graphs for CGMS<br> - minor change for Contour USB meters (it seems that library we are using has a bug, so reading of data - takes a long time (about 2 min for all entries)... We are looking to remedy the problem ASAP). + takes a long time (about 2 min for all entries)... We are looking to remedy the problem ASAP).<br> We added development version - of library to our project, so that we can test this and possibly find a solution in near future. + of library to our project, so that we can test this and possibly find a solution in near future.<br> <br> If you find some problems please report and I will try to make a fix release if needed.<br> <br> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-06-30 20:30:17
|
Revision: 1409 http://sourceforge.net/p/ggc/code/1409 Author: andyrozman Date: 2016-06-30 20:30:13 +0000 (Thu, 30 Jun 2016) Log Message: ----------- - web page Modified Paths: -------------- trunk/web_page/LATEST_VERSION.txt trunk/web_page/docs/Changelog trunk/web_page/inc_download.inc trunk/web_page/inc_news.inc Modified: trunk/web_page/LATEST_VERSION.txt =================================================================== --- trunk/web_page/LATEST_VERSION.txt 2016-06-28 21:15:07 UTC (rev 1408) +++ trunk/web_page/LATEST_VERSION.txt 2016-06-30 20:30:13 UTC (rev 1409) @@ -1,4 +1,4 @@ -0.5.0.3 +0.7.0 There is a new version available at http://ggc.sourceforge.net ! Version Information: Modified: trunk/web_page/docs/Changelog =================================================================== --- trunk/web_page/docs/Changelog 2016-06-28 21:15:07 UTC (rev 1408) +++ trunk/web_page/docs/Changelog 2016-06-30 20:30:13 UTC (rev 1409) @@ -603,7 +603,7 @@ all texts for check and select elements were displayed to close to control 2006-04-14 (v0.2.1.10) Andy Rozman <and...@us...> - * moved ggc.gui.PropertiesFrame to ggc.gui.dialogs.PropertiesDialog, and changed internal + * moved ggc.gui.PropertiesFrame to ggc.gui.cfg.PropertiesDialog, and changed internal workings, so that after properties are done, we can save all setting and not just the current as it was till now. * changed DailyStatsDialog to display graph and ti display error if no row was selected. @@ -697,7 +697,7 @@ * Added loading of Hibernate (in seperate thread) and show loading in MainFrame * More usage of DataAccess class, added several functions * Add daily values tables in hibernate - * Added doctors, doctor_type and appointments tables in hibernate + * Added doctors, doctorType and appointments tables in hibernate * Implemented methods and classes for working with daily values in Hibernate * Removed all database support except hibernate * Changed DailyValues and DailyValuesRow @@ -778,7 +778,7 @@ * ggc.util.I18nControl: - moved header to the top - made EN the fallback default locale, as english is the master language file - * ggc.gui.MainFrame: + * ggc.gui.main.MainFrame: - hardcoded skin location in a field at the top of the file instead of somewhere in the code, to make this a tiny little bit more flexible - changed the path in accordance with cvs repository layout Modified: trunk/web_page/inc_download.inc =================================================================== --- trunk/web_page/inc_download.inc 2016-06-28 21:15:07 UTC (rev 1408) +++ trunk/web_page/inc_download.inc 2016-06-30 20:30:13 UTC (rev 1409) @@ -48,7 +48,32 @@ <h3>GGC Releases</h3> + <h4>Version 0.7.0 [June 2016]</h4> + <ul> + <li><b>I am sorry but I couldn't make windows installer this time.</b></li> + + <li> + <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_0.7.0.zip/download">GGC + 0.7.0 (Full) Zip file</a> + </li> + + <li> + <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_Update_0.7.0.zip/download">GGC + 0.7.0 Update Zip file</a> + </li> + + + <h4>Version 0.6.1 [October 2015]</h4> + + <ul> + <li> + <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.6.1/GGC_Update_0.6.1.zip/download">GGC + 0.6.1 Update Zip file</a> + </li> + + </ul> + <h4>Version 0.6.0 [August 2015]</h4> <ul> Modified: trunk/web_page/inc_news.inc =================================================================== --- trunk/web_page/inc_news.inc 2016-06-28 21:15:07 UTC (rev 1408) +++ trunk/web_page/inc_news.inc 2016-06-30 20:30:13 UTC (rev 1409) @@ -3,29 +3,71 @@ <h2 class="head">News</h2> + <table cellpadding="3" cellspacing="0" align="center" width="100%" summary="" class="container"> + <tr class="newsheader"> + <td width="150">2016-06-29</td> + <td>Release 0.7.0</td> + </tr> + <tr> + <td colspan="2"> + It's been long time, again... since the last release... Unfortunately my "real" life got in the way + of GGC development again.<br> + I know I promised that Minimed support comes with next version, but I didn't have time do a lot of + development and testing with Minimed. I can report, that basic support is done, but everything else + is untested. You can test it yourself if you want, but like I said it might not work... If you do the + testing, please send us the log files, so that we can anlyze it and see if it works, or if it works + correctly. I just got news that it might not work anymore on never Linux (it seems that USB 3.0 support + broke support for Carelink USB).<br> + Changes in this version:<br> + - I changed menus a little, different grouping + - added graphs from Pen to Pump (this is still work in progress, but at least some things should be working) + - added/changed reports, they now contain also CGMS data (Daily Time Sheet report for Pump) + - added some daily/weekly graphs for CGMS + - minor change for Contour USB meters (it seems that library we are using has a bug, so reading of data + takes a long time (about 2 min for all entries)... We are looking to remedy the problem ASAP). + We added development version + of library to our project, so that we can test this and possibly find a solution in near future. + <br> + If you find some problems please report and I will try to make a fix release if needed.<br> + <br> + Next release is planned for end of year 2016. I will try to get final version of Minimed + support in project, but it all depends if we can solve Carelink USB problem. There should also + be some new meters added (Menarini and some Arkray models). + <br> + Any help from any of you is greatly appreciated... I try to reply to each mail I get... + </tr> + </table> + + <br><br> + + + <table cellpadding="3" cellspacing="0" align="center" width="100%" summary="" class="container"> <tr class="newsheader"> -<td width="150">2014-08-01</td> +<td width="150">2015-10-08</td> <td>Release 0.6.1</td> </tr> <tr> <td colspan="2"> -You are probably wondering if everything is OK, since new release is already here... And here comes -the explanation... I planned new release at end of year (I usually try to make 2 releases in year, but +You are probably wondering if everything is OK, since new release is already here...<br>And here comes +the explanation...<br>I planned new release at end of year (I usually try to make 2 releases in year, but mostly it happens that there is only one), so I made plan for features and I divided them into simple and hard tasks... Simple are tasks that are now in this release, this includes several bug fixes, basal statistics, fixed graphs for pump (now we have finally all data displayed... sorry no CGMS in Pump Daily Graph for now) and finally -implementation of Contour (and Contour Next) meter, which is our first USB Hid Meter supported (this was also main +implementation of Contour USB (and Contour Next Family) meters, which are our first USB Hid Meters supported (this was also main reason for this release). <br> Now because of this release, it might happen that next release won't be at end of this year, but sometime in -start of next year (probably february). My plan for this (0.7) release is to prepare support for Minimed Pump. While +start of next year (probably february). My plan for next (0.7) release is to prepare support for Minimed Pump. While there are some other tasks to be done, this is my main goal for next release, so when I have this support ready (for ComLink cable and CareLink USB device and for start support will be done only for Pump part, so sorry no CGMS data yet (coming in next release)) you can expect next release. If this is ready by end of year, then you will get release by then, if I encounter some additional problems, then next release will be little later (with help of decoding-carelink project (thanks Ben West) I managed to decode most of data, so everything that I need to do - is incorporate this results, with my current Minimed implementation. I hope this to be done in next few weeks - (perhaps months)). + is incorporate this results, with my current Minimed implementation and extend implementation to Carelink USB device + (so far I only worked with old ComLink cable). I hope this will be done in next few weeks/months. + <br> + This release is update only. Which means that if you are new user you need to install full 0.6.0 and then overwrite + its files, with this new upgrade. Same for existing users... just overwrite files with files in this package. </tr> </table> @@ -36,7 +78,7 @@ <table cellpadding="3" cellspacing="0" align="center" width="100%" summary="" class="container"> <tr class="newsheader"> -<td width="150">2014-08-01</td> +<td width="150">2015-08-01</td> <td>Release 0.6</td> </tr> <tr> @@ -70,7 +112,7 @@ <table cellpadding="3" cellspacing="0" align="center" width="100%" summary="" class="container"> <tr class="newsheader"> -<td width="150">2014-04-29</td> +<td width="150">2015-04-29</td> <td>About next release 0.6 and Help Needed</td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-06-28 21:15:10
|
Revision: 1408 http://sourceforge.net/p/ggc/code/1408 Author: andyrozman Date: 2016-06-28 21:15:07 +0000 (Tue, 28 Jun 2016) Log Message: ----------- - GGC Update - updated for 0.7.0 - master pom with versions updated Modified Paths: -------------- trunk/ggc-desktop/data/update/GGC_Update.properties trunk/ggc-desktop/doc/TO-DO.txt trunk/ggc-desktop/pom.xml trunk/ggc-master-pom/pom.xml Modified: trunk/ggc-desktop/data/update/GGC_Update.properties =================================================================== --- trunk/ggc-desktop/data/update/GGC_Update.properties 2016-06-28 21:02:40 UTC (rev 1407) +++ trunk/ggc-desktop/data/update/GGC_Update.properties 2016-06-28 21:15:07 UTC (rev 1408) @@ -11,8 +11,9 @@ PRODUCT_ID=ggc ROOT=.. -VERSION_NAME=0.6.1 -VERSION_NUMERIC=14 +VERSION_NAME=0.7 +VERSION_NUMERIC=15 + VERSION_DESCRIPTION=Core 0.6.0, Desktop 0.6.0, Meter Tool 2.2.0, Pump Tool 1.5.0, CGMS Tool 1.3.5 @@ -65,7 +66,7 @@ # # Components # -LAST_COMPONENT=30 +LAST_COMPONENT=31 # @@ -83,18 +84,18 @@ # CHANGE COMPONENT_1_GROUP=1 COMPONENT_1_NAME=GGC Desktop App -COMPONENT_1_VERSION=0.6.1 -COMPONENT_1_VERSION_NUM=14 +COMPONENT_1_VERSION=0.7.0 +COMPONENT_1_VERSION_NUM=15 COMPONENT_1_ROOT_DIR=/lib/ggc -COMPONENT_1_FILES=%ROOT%/ggc-desktop-0.6.1.jar +COMPONENT_1_FILES=%ROOT%/ggc-desktop-0.7.0.jar # CHANGE COMPONENT_2_GROUP=1 COMPONENT_2_NAME=GGC Core -COMPONENT_2_VERSION=0.6.1 -COMPONENT_2_VERSION_NUM=14 +COMPONENT_2_VERSION=0.7.0 +COMPONENT_2_VERSION_NUM=15 COMPONENT_2_ROOT_DIR=/lib/ggc -COMPONENT_2_FILES=%ROOT%/ggc-core-0.6.1.jar +COMPONENT_2_FILES=%ROOT%/ggc-core-0.7.0.jar COMPONENT_2_HAS_DB_FILES=true COMPONENT_3_GROUP=1 @@ -110,48 +111,47 @@ COMPONENT_27_GROUP=1 COMPONENT_27_NAME=GGC Help -COMPONENT_27_VERSION=0.2 -COMPONENT_27_VERSION_NUM=1 +COMPONENT_27_VERSION=0.2.2 +COMPONENT_27_VERSION_NUM=2 COMPONENT_27_ROOT_DIR=/lib/ggc -COMPONENT_27_FILES=%ROOT%/ggc-help-0.2.jar +COMPONENT_27_FILES=%ROOT%/ggc-help-0.2.2.jar COMPONENT_5_GROUP=2 COMPONENT_5_NAME=GGC Plugin Base -COMPONENT_5_VERSION=1.0.1 -COMPONENT_5_VERSION_NUM=11 +COMPONENT_5_VERSION=1.2.2 +COMPONENT_5_VERSION_NUM=12 COMPONENT_5_ROOT_DIR=/lib/ggc -COMPONENT_5_FILES=%ROOT%/ggc-plugin-base-1.0.1.jar +COMPONENT_5_FILES=%ROOT%/ggc-plugin-base-1.2.2.jar COMPONENT_20_GROUP=2 COMPONENT_20_NAME=Nutrition Tool -COMPONENT_20_VERSION=1.3.6 -COMPONENT_20_VERSION_NUM=7 +COMPONENT_20_VERSION=1.4.1 +COMPONENT_20_VERSION_NUM=8 COMPONENT_20_ROOT_DIR=/lib/ggc -COMPONENT_20_FILES=%ROOT%/ggc-nutri-tool-1.3.6.jar +COMPONENT_20_FILES=%ROOT%/ggc-nutri-tool-1.4.1.jar -# CHANGE COMPONENT_6_GROUP=2 COMPONENT_6_NAME=Meter Tool -COMPONENT_6_VERSION=2.3.0 -COMPONENT_6_VERSION_NUM=10 +COMPONENT_6_VERSION=2.4.1 +COMPONENT_6_VERSION_NUM=11 COMPONENT_6_ROOT_DIR=/lib/ggc -COMPONENT_6_FILES=%ROOT%/ggc-meter-tool-2.3.0.jar +COMPONENT_6_FILES=%ROOT%/ggc-meter-tool-2.4.1.jar COMPONENT_7_GROUP=2 COMPONENT_7_NAME=Pump Tool -COMPONENT_7_VERSION=1.6.0 -COMPONENT_7_VERSION_NUM=10 +COMPONENT_7_VERSION=2.0.1 +COMPONENT_7_VERSION_NUM=11 COMPONENT_7_ROOT_DIR=/lib/ggc -COMPONENT_7_FILES=%ROOT%/ggc-pump-tool-1.6.0.jar +COMPONENT_7_FILES=%ROOT%/ggc-pump-tool-2.0.1.jar COMPONENT_8_GROUP=2 COMPONENT_8_NAME=CGMS Tool -COMPONENT_8_VERSION=1.3.3 -COMPONENT_8_VERSION_NUM=3 +COMPONENT_8_VERSION=1.5.1 +COMPONENT_8_VERSION_NUM=4 COMPONENT_8_ROOT_DIR=/lib/ggc -COMPONENT_8_FILES=%ROOT%/ggc-cgms-tool-1.3.3.jar +COMPONENT_8_FILES=%ROOT%/ggc-cgms-tool-1.5.1.jar COMPONENT_9_GROUP=3 @@ -173,10 +173,10 @@ COMPONENT_11_GROUP=3 COMPONENT_11_NAME=Atech Tools -COMPONENT_11_VERSION=0.7.13 -COMPONENT_11_VERSION_NUM=12 +COMPONENT_11_VERSION=0.8.2 +COMPONENT_11_VERSION_NUM=13 COMPONENT_11_ROOT_DIR=/lib/utils -COMPONENT_11_FILES=%ROOT%/atech-tools-0.7.13.jar;%ROOT%/joda-time-2.8.2.jar +COMPONENT_11_FILES=%ROOT%/atech-tools-0.8.2.jar;%ROOT%/joda-time-2.8.2.jar COMPONENT_12_GROUP=3 COMPONENT_12_NAME=iText Pdf Library @@ -269,10 +269,10 @@ # CHANGE COMPONENT_25_GROUP=3 COMPONENT_25_NAME=NeuronRobotics Java Serial API (Java 1.5) -COMPONENT_25_VERSION=3.9.3.1 -COMPONENT_25_VERSION_NUM=2 +COMPONENT_25_VERSION=3.13.0-DEV +COMPONENT_25_VERSION_NUM=3 COMPONENT_25_ROOT_DIR=/lib/utils -COMPONENT_25_FILES=%ROOT%/nrjavaserial-j15-3.9.3.1.jar +COMPONENT_25_FILES=%ROOT%/nrjavaserial-j15-3.13.0-DEV.jar COMPONENT_26_GROUP=3 COMPONENT_26_NAME=Commons Lang @@ -286,11 +286,11 @@ COMPONENT_28_GROUP=3 -COMPONENT_28_NAME=HID4Java (Java 1.5) -COMPONENT_28_VERSION=0.3.1 -COMPONENT_28_VERSION_NUM=1 +COMPONENT_28_NAME=Hid4Java (Java 1.5) +COMPONENT_28_VERSION=0.4.1-DEV +COMPONENT_28_VERSION_NUM=2 COMPONENT_28_ROOT_DIR=/lib/utils -COMPONENT_28_FILES=%ROOT%/hid4java-j15-0.3.1.jar +COMPONENT_28_FILES=%ROOT%/hid4java-j15-0.4.1-DEV.jar COMPONENT_29_GROUP=3 @@ -310,6 +310,13 @@ COMPONENT_30_FILES=%ROOT%/slf4j-api-1.7.12.jar;%ROOT%/slf4j-log4j12-1.7.12.jar;%ROOT%/jcl-over-slf4j-1.7.12.jar; +COMPONENT_31_GROUP=3 +COMPONENT_31_NAME=Table Layout +COMPONENT_31_VERSION=4.3.0 +COMPONENT_31_VERSION_NUM=1 +COMPONENT_31_ROOT_DIR=/lib/utils +COMPONENT_31_FILES=%ROOT%/table-layout-4.3.0.jar; + # REMOVED COMPONENTS COMPONENT_4_GROUP=1 Modified: trunk/ggc-desktop/doc/TO-DO.txt =================================================================== --- trunk/ggc-desktop/doc/TO-DO.txt 2016-06-28 21:02:40 UTC (rev 1407) +++ trunk/ggc-desktop/doc/TO-DO.txt 2016-06-28 21:15:07 UTC (rev 1408) @@ -85,6 +85,11 @@ - data retrival: - gluco values - menus + + +Graph: - Configuration CGMS for Graph (Low, High Value) + + (4) Release 0.7: - prepare release - release Modified: trunk/ggc-desktop/pom.xml =================================================================== --- trunk/ggc-desktop/pom.xml 2016-06-28 21:02:40 UTC (rev 1407) +++ trunk/ggc-desktop/pom.xml 2016-06-28 21:15:07 UTC (rev 1408) @@ -80,12 +80,13 @@ <artifactId>ggc-nutri-tool</artifactId> </dependency> + <!-- <dependency> <groupId>net.sf.ggc</groupId> <artifactId>ggc-connect-tool</artifactId> </dependency> +--> - <dependency> <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> Modified: trunk/ggc-master-pom/pom.xml =================================================================== --- trunk/ggc-master-pom/pom.xml 2016-06-28 21:02:40 UTC (rev 1407) +++ trunk/ggc-master-pom/pom.xml 2016-06-28 21:15:07 UTC (rev 1408) @@ -15,34 +15,60 @@ <id>atechrepositorypublic</id> <name>Atech Software Public Repository</name> <!-- <url>http://www.atech-software.com:8081/repository/public/</url> --> - <url>http://www.atech-software.com:8081/nexus/content/groups/public/</url> + <url>http://www.atech-software.com/nexus/content/groups/public/</url> </repository> - <!-- <repository> <id>mvnrepository</id> <name>Mvn Central Repository</name> - <url>http://www.mvnrepository.com</url> </repository> <repository> <id>jbossrepository</id> - <name>jbossrepository</name> <url>https://repository.jboss.org/nexus/</url> - </repository> <repository> <id>sonatype</id> <name>Sonatype OSS Snapshots - Repository</name> <url>http://oss.sonatype.org/content/groups/public</url> - </repository> <repository> <id>javanet</id> <name>Download Java Net Repository</name> - <url>http://download.java.net/maven/2/</url> </repository> <repository> <id>mavenrepository</id> - <name>Maven Repository Repository</name> <layout>legacy</layout> <url>http://maven-repository.com/artifacts/</url> - </repository> --> + <repository> + <id>mvnrepository</id> + <name>Mvn Central Repository</name> + <url>http://www.mvnrepository.com</url> + </repository> + <repository> + <id>jbossrepository</id> + <name>jbossrepository</name> + <url>https://repository.jboss.org/nexus/</url> + </repository> + + <repository> + <id>javanet</id> + <name>Download Java Net Repository</name> + <url>http://download.java.net/maven/2/</url> + </repository> + <repository> + <id>mavenrepository</id> + <name>Maven Repository Repository</name> + <layout>legacy</layout> + <url>http://maven-repository.com/artifacts/</url> + </repository> + + + <!-- SONAType Maven Central - DO NOT USE --> + <repository> + <id>sonatype</id> + <name>Sonatype OSS Snapshots + Repository + </name> + <url>http://oss.sonatype.org/content/groups/public</url> + </repository> + </repositories> + <!-- <distributionManagement> <repository> <id>releases</id> <name>Internal Releases</name> - <!-- <url>http://www.atech-software.com:8090/repository/internal/</url> --> + <! -X- <url>http://www.atech-software.com:8090/repository/internal/</url> -X- > <url>http://www.atech-software.com:8081/nexus/content/repositories/releases/</url> </repository> <snapshotRepository> <id>snapshots</id> - <name>Internal Snapshots</name> - <!-- <url>http://www.atech-software.com:8090/repository/snapshots/</url> --> - <url>http://www.atech-software.com:8081/nexus/content/repositories/snapshots/</url> - </snapshotRepository> - </distributionManagement> + <name>Internal Snapshots</name> + <! -X- <url>http://www.atech-software.com:8090/repository/snapshots/</url> -X- > + <url>http://www.atech-software.com:8081/nexus/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> + --> <build> <defaultGoal>compile</defaultGoal> @@ -69,30 +95,93 @@ </testResources> <pluginManagement> <plugins> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.1</version> + <version>${maven-compiler-plugin.version}</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + </plugin> - </configuration> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>${maven-clean-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>${maven-install-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${maven-resources-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compiler-api</artifactId> + <version>${plexus.version}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compiler</artifactId> + <version>${plexus.version}</version> + </plugin> + + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compiler-manager</artifactId> + <version>${plexus.version}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compiler-javac</artifactId> + <version>${plexus.version}</version> + </plugin> + + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compilers</artifactId> + <version>${plexus.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> - <version>2.9</version> + <version>${maven-eclipse-plugin.version}</version> <configuration> <useProjectReferences>false</useProjectReferences> </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin.version}</version> <executions> <execution> <id>copy-dependencies</id> @@ -119,12 +208,11 @@ <outputDirectory>target/site</outputDirectory> </reporting> - <!-- <modules> <module>ggc-core</module> <module>ggc-plugin-base</module> - </modules> --> <dependencyManagement> <dependencies> + <!-- GGC Artifacts --> <dependency> <groupId>net.sf.ggc</groupId> <artifactId>ggc-help</artifactId> @@ -137,7 +225,6 @@ <version>${ggc-core.version}</version> </dependency> - <dependency> <groupId>net.sf.ggc</groupId> <artifactId>ggc-plugin-base</artifactId> @@ -170,11 +257,41 @@ <dependency> <groupId>net.sf.ggc</groupId> + <artifactId>ggc-connect-tool</artifactId> + <version>${ggc-connect-tool.version}</version> + </dependency> + + <dependency> + <groupId>net.sf.ggc</groupId> <artifactId>ggc-desktop</artifactId> <version>${ggc-desktop.version}</version> </dependency> + + <!-- Atech Tools - Main Helper Library --> <dependency> + <groupId>com.atech-software</groupId> + <artifactId>atech-tools</artifactId> + <version>${atech-tools.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>net.sf.jasperreports</groupId> + <artifactId>jasperreports</artifactId> + </exclusion> + <!-- <exclusion> + <groupId>org.simpleframework</groupId> + <artifactId>simple-xml</artifactId> + </exclusion> --> + </exclusions> + </dependency> + + + <!-- Hibernate API --> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> <version>${hibernate.version}</version> @@ -191,6 +308,8 @@ </exclusions> </dependency> + + <!-- Internal Web Service --> <dependency> <groupId>net.sf.ggc.pygmy-httpd</groupId> <artifactId>pygmy-core</artifactId> @@ -203,88 +322,71 @@ <version>${pygmy-handlers.version}</version> </dependency> + + <!-- Java Help --> <dependency> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + <version>${javahelp.version}</version> + </dependency> + + + <!-- Skin Look & Feel --> + <dependency> + <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> + <artifactId>skinlf</artifactId> + <version>${skinlf.version}</version> + </dependency> + + + <!-- JUnit for testing --> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> - <scope>test</scope> + <!-- <scope>test</scope> --> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet-api.version}</version> - <scope>provided</scope> - </dependency> + <!-- Reporting --> <dependency> <groupId>com.itextpdf</groupId> <artifactId>itextpdf</artifactId> <version>${itextpdf.version}</version> </dependency> + <!-- Not required for now - may be used later for reporting <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> + <groupId>net.sf.jasperreports</groupId> + <artifactId>jasperreports</artifactId> + <version>${jasperreports.version}</version> </dependency> + --> - <dependency> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - <version>${javahelp.version}</version> - </dependency> + <!-- Commons --> <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>skinlf</artifactId> - <version>${skinlf.version}</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons-collections.version}</version> </dependency> - <dependency> - <groupId>net.sf.jasperreports</groupId> - <artifactId>jasperreports</artifactId> - <version>${jasperreports.version}</version> - </dependency> + <!-- Jfree - Graph Framework --> <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> <version>${jfreechart.version}</version> </dependency> - <!-- This should be replaced with nrserial, which is just extention of - rxtx that also contains binary files in jar. --> - <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId> - <version>${rxtxcomm.version}</version> </dependency> --> - <dependency> - <groupId>com.atech-software</groupId> - <artifactId>atech-tools</artifactId> - <version>${atech-tools.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.jasperreports</groupId> - <artifactId>jasperreports</artifactId> - </exclusion> - <exclusion> - <groupId>org.simpleframework</groupId> - <artifactId>simple-xml</artifactId> - </exclusion> - </exclusions> - </dependency> - - + <!-- BlueTooth Library --> <!--This is some outdated library which we use only for BlueTooth, it needs to be removed or changed, but so far it's here and it's version is fixed. This NEEDS to be removed and changed to some other library in near @@ -295,27 +397,24 @@ <version>${ibm-compapi.version}</version> </dependency> - <!-- + + <!-- Jaxen - Xml --> <dependency> - <groupId>com.neuronrobotics</groupId> - <artifactId>nrjavaserial</artifactId> - <version>${nrjavaserial.version}</version> - </dependency> ---> - <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <version>${jaxen.version}</version> </dependency> - <!-- + + <!-- Serial API Support --> <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - <version>${jna.version}</version> + <groupId>com.neuronrobotics</groupId> + <artifactId>nrjavaserial-j15</artifactId> + <version>${nrjavaserial-j15.version}</version> </dependency> - --> + + <!-- USB Hid Support --> <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna-j15</artifactId> @@ -329,63 +428,108 @@ </dependency> + <!-- Upgrade feature dependencies - WIP !!! --> <dependency> - <groupId>com.neuronrobotics</groupId> - <artifactId>nrjavaserial-j15</artifactId> - <version>${nrjavaserial-j15.version}</version> + <groupId>org.simpleframework</groupId> + <artifactId>simple-xml</artifactId> + <version>${simpleframework.version}</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>${commons-collections.version}</version> + <groupId>net.lingala.zip4j</groupId> + <artifactId>zip4j</artifactId> + <version>${zip4j.version}</version> </dependency> + <!-- WIP --> - <!-- slf4j API --> + <!-- Logging utils --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> </dependency> - <!-- <dependency> <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> + <artifactId>slf4j-api</artifactId> + <!-- slf4j API --> <version>${slf4j.version}</version> </dependency> - --> - <!-- slf4j over log4j --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> + <!-- slf4j over log4j --> <version>${slf4j.version}</version> </dependency> - <!-- Commons logging over slf4j --> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> + <!-- Commons logging over slf4j --> <version>${slf4j.version}</version> </dependency> + + <!-- Java Simple Serial Connection - This is for testing purposes only. We don't use this in production --> + <dependency> + <groupId>org.scream3r</groupId> + <artifactId>jssc</artifactId> + <version>${jssc.version}</version> + </dependency> + + + <!-- Table Layout for Desktop --> + + <!-- + <dependency> + <groupId>info.clearthought</groupId> + <artifactId>tablelayout-j15</artifactId> + <version>${tablelayout-j15.version}</version> + </dependency> + --> + + <dependency> + <groupId>info.clearthought</groupId> + <artifactId>table-layout</artifactId> + <version>${table-layout.version}</version> + </dependency> + + + <!-- + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> --> + </dependencies> </dependencyManagement> <properties> - <!-- GGC Modules versions --> <!-- Version already moved up one version 0.6.2 --> - <ggc-core.version>0.6.2-SNAPSHOT</ggc-core.version> - <ggc-plugin-base.version>1.1.0-SNAPSHOT</ggc-plugin-base.version> <!-- 0.6.2 = 1.0.2, 1.1.0 --> - <ggc-meter-tool.version>2.4.0-SNAPSHOT</ggc-meter-tool.version> <!-- 0.6.2 = 2.3.1, 2.4.0 --> + <!-- GGC Modules versions --> + <ggc-core.version>0.7.0-SNAPSHOT</ggc-core.version> + <ggc-plugin-base.version>1.2.2-SNAPSHOT</ggc-plugin-base.version> - <ggc-pump-tool.version>1.7.1-SNAPSHOT</ggc-pump-tool.version> <!-- 0.6.2 = 1.6.1, 1.7.1 --> - <ggc-cgms-tool.version>1.4.0-SNAPSHOT</ggc-cgms-tool.version> <!-- 0.6.2 = 1.3.4, 1.4.0 --> - <ggc-nutri-tool.version>1.4.0-SNAPSHOT</ggc-nutri-tool.version> <!-- 0.6.2 = 1.3.7, 1.4.0 --> - <ggc-desktop.version>0.6.2-SNAPSHOT</ggc-desktop.version> - <ggc-help.version>0.2.1-SNAPSHOT</ggc-help.version> <!-- 0.6.2 = 0.2, 0.2.1 --> + <ggc-meter-tool.version>2.4.1-SNAPSHOT</ggc-meter-tool.version> + <!-- 0.6.2 = 2.3.1, 2.4.0 --> + <ggc-pump-tool.version>2.0.1-SNAPSHOT</ggc-pump-tool.version> + <!-- 0.6.2 = 1.6.1, 1.7.1 --> + <ggc-cgms-tool.version>1.5.1-SNAPSHOT</ggc-cgms-tool.version> + <!-- 0.6.2 = 1.3.4, 1.4.0 --> + <ggc-nutri-tool.version>1.4.1-SNAPSHOT</ggc-nutri-tool.version> + <!-- 0.6.2 = 1.3.7, 1.4.0 --> + + <ggc-connect-tool.version>0.1.0-SNAPSHOT</ggc-connect-tool.version> + + <ggc-desktop.version>0.7.0-SNAPSHOT</ggc-desktop.version> + + <ggc-help.version>0.2.2-SNAPSHOT</ggc-help.version> + <!-- 0.6.2 = 0.2, 0.2.1 --> + <!-- NON MAVEN --> <ggc-little.version>0.2.4-SNAPSHOT</ggc-little.version> @@ -407,15 +551,44 @@ <icepdf-viewer.version>5.0.7</icepdf-viewer.version> <jaxen.version>1.1.6</jaxen.version> <jna-j15.version>4.1.0</jna-j15.version> - <hid4java-j15.version>0.3.1</hid4java-j15.version> - <nrjavaserial-j15.version>3.9.3.1</nrjavaserial-j15.version> + <commons-collections.version>3.2.1</commons-collections.version> <slf4j.version>1.7.12</slf4j.version> + <!-- Changed: CGMS, Core, Meter --> - <atech-tools.version>0.7.15-SNAPSHOT</atech-tools.version> + <atech-tools.version>0.8.2-SNAPSHOT</atech-tools.version> + <!-- 0.6.2 --> + <jssc.version>2.8.0</jssc.version> + <!-- 0.7 --> + <table-layout.version>4.3.0</table-layout.version> + <hid4java-j15.version>0.4.1-DEV</hid4java-j15.version> + <!-- <hid4java-j15.version>0.4.0</hid4java-j15.version> --> + <!-- <hid4java-j15.version>0.3.1</hid4java-j15.version> --> + <nrjavaserial-j15.version>3.13.0-DEV</nrjavaserial-j15.version> + + + <!-- 0.8 ?? --> + <simpleframework.version>2.7.1</simpleframework.version> + <zip4j.version>1.3.2</zip4j.version> + + + <!-- Maven Plugins --> + <plexus.version>2.5</plexus.version> + <maven-resources-plugin.version>2.6</maven-resources-plugin.version> + <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version> + <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> + <maven-clean-plugin.version>2.5</maven-clean-plugin.version> + <maven-install-plugin.version>2.5.2</maven-install-plugin.version> + <maven-jar-plugin.version>2.3.2</maven-jar-plugin.version> + <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version> + <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version> + + <!-- Maven Settings --> + + <maven.compiler.source>1.5</maven.compiler.source> <maven.compiler.target>1.5</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-06-28 21:02:43
|
Revision: 1407 http://sourceforge.net/p/ggc/code/1407 Author: andyrozman Date: 2016-06-28 21:02:40 +0000 (Tue, 28 Jun 2016) Log Message: ----------- - Meter Device Defintion changed - AscensiaContourUsbReader added logging Modified Paths: -------------- trunk/ggc-meter/docs/Changelog trunk/ggc-meter/src/ggc/meter/data/defs/MeterDeviceDefinition.java trunk/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaContourUsbReader.java Modified: trunk/ggc-meter/docs/Changelog =================================================================== --- trunk/ggc-meter/docs/Changelog 2016-06-28 21:00:23 UTC (rev 1406) +++ trunk/ggc-meter/docs/Changelog 2016-06-28 21:02:40 UTC (rev 1407) @@ -2,12 +2,14 @@ Changes file for GGC Meter Tool =============================== -2.4.1 [26.5.2016] +2.4.1 [26.6.2016] - refactorings (code, db) - graphs - comments - ascensia decoder fix - started work on Menarini +- Meter Device Defintion changed +- AscensiaContourUsbReader added logging 2.4.0 [24.10.2015] - refactoring changing Log to Logger instance Modified: trunk/ggc-meter/src/ggc/meter/data/defs/MeterDeviceDefinition.java =================================================================== --- trunk/ggc-meter/src/ggc/meter/data/defs/MeterDeviceDefinition.java 2016-06-28 21:00:23 UTC (rev 1406) +++ trunk/ggc-meter/src/ggc/meter/data/defs/MeterDeviceDefinition.java 2016-06-28 21:02:40 UTC (rev 1407) @@ -18,10 +18,12 @@ public enum MeterDeviceDefinition implements DeviceDefinition { - AscensiaContourUsb(10007, "Contour USB", "ascensia_contour_usb.jpg", "INSTRUCTIONS_ASCENSIA_CONTOUR_USB", null, - DeviceImplementationStatus.Done, DeviceCompanyDefinition.Ascensia, DeviceHandlerType.AscensiaUsbHandler, - DevicePortParameterType.SimpleParameter, DeviceConnectionProtocol.USB_Hid, DeviceProgressStatus.Special, "", - 2000, MeterDisplayInterfaceType.Simple), + AscensiaContourUsb(10007, "Contour USB", "ascensia_contour_usb.jpg", // + "INSTRUCTIONS_ASCENSIA_CONTOUR_USB", null, DeviceImplementationStatus.Done, // + DeviceCompanyDefinition.Ascensia, DeviceHandlerType.AscensiaUsbHandler, // + DevicePortParameterType.SimpleParameter, DeviceConnectionProtocol.USB_Hid, // + DeviceProgressStatus.Special, "", 2000, // + MeterDisplayInterfaceType.Simple), AscensiaContourNext(10008, "Contour Next", "ascensia_contour_next.jpg", "INSTRUCTIONS_ASCENSIA_CONTOUR_USB", null, DeviceImplementationStatus.Done, DeviceCompanyDefinition.Ascensia, DeviceHandlerType.AscensiaUsbHandler, @@ -34,8 +36,8 @@ DevicePortParameterType.SimpleParameter, DeviceConnectionProtocol.USB_Hid, DeviceProgressStatus.Special, "", 2000, MeterDisplayInterfaceType.Simple), - AscensiaContourNextLink(10010, "Contour Next Link", "ascensia_contour_nextlink.jpg", - "INSTRUCTIONS_ASCENSIA_CONTOUR_USB", null, DeviceImplementationStatus.InProgress, + AscensiaContourNextLink(10010, "Contour Next Link", "ascensia_contour_nextlink.jpg", // + "INSTRUCTIONS_ASCENSIA_CONTOUR_USB", null, DeviceImplementationStatus.InProgress, // DeviceCompanyDefinition.Ascensia, DeviceHandlerType.AscensiaUsbHandler, DevicePortParameterType.SimpleParameter, DeviceConnectionProtocol.USB_Hid, DeviceProgressStatus.Special, "", 2000, MeterDisplayInterfaceType.Simple), Modified: trunk/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaContourUsbReader.java =================================================================== --- trunk/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaContourUsbReader.java 2016-06-28 21:00:23 UTC (rev 1406) +++ trunk/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaContourUsbReader.java 2016-06-28 21:02:40 UTC (rev 1407) @@ -36,7 +36,7 @@ communicationHandler = new Hid4JavaCommunicationHandler(); communicationHandler.setTargetDevice(selectedDevice); communicationHandler.setAllowedDevices(handler.getAllowedDevicesList()); - communicationHandler.setDelayForTimedReading(1000); + communicationHandler.setDelayForTimedReading(100); this.handler = handler; } @@ -61,13 +61,22 @@ byte lastData; + if (debug) + System.out.println("Data size: " + data.size() + ", Data: " + data); + if (data.size() == 0) { lastData = 0x05; + + if (debug) + System.out.println("Last response, zero, data: " + lastData); } else { lastData = data.get(data.size() - 1); + + if (debug) + System.out.println("Last response, data: " + lastData); } if (lastData == 0x15) @@ -108,9 +117,10 @@ int ret = this.communicationHandler.writeWithReturn(packet); - if (ret == 0) + if (ret <= 0) { - LOG.error("Error on write to meter."); + String errorMessage = this.communicationHandler.getLastErrorMessage(); + LOG.error("Error on write to meter. Error message: " + errorMessage); throw new PlugInBaseException(PlugInExceptionType.DeviceCouldNotBeContacted); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-06-28 21:00:26
|
Revision: 1406 http://sourceforge.net/p/ggc/code/1406 Author: andyrozman Date: 2016-06-28 21:00:23 +0000 (Tue, 28 Jun 2016) Log Message: ----------- - Hid4Java Communication Handler switched to Hid4Java 0.4.x Modified Paths: -------------- trunk/ggc-plugin_base/docs/Changelog trunk/ggc-plugin_base/src/ggc/plugin/comm/Hid4JavaCommunicationHandler.java trunk/ggc-plugin_base/src/ggc/plugin/comm/NRSerialCommunicationHandler.java trunk/ggc-plugin_base/src/ggc/plugin/graph/data/CGMSGraphDataHandler.java Modified: trunk/ggc-plugin_base/docs/Changelog =================================================================== --- trunk/ggc-plugin_base/docs/Changelog 2016-06-28 20:57:32 UTC (rev 1405) +++ trunk/ggc-plugin_base/docs/Changelog 2016-06-28 21:00:23 UTC (rev 1406) @@ -2,10 +2,11 @@ Changes file for GGC Plug-In Base ================================== -1.2.2 [18.5.2016] [Andy] +1.2.2 [26.6.2016] [Andy] - extended CommunicationInterface - refactorings - added companies, deviceHandlers +- Hid4Java Communication Handler switched to Hid4Java 0.4.x 1.2.1 [2.2.2016] [Andy] - changes DeviceValues Modified: trunk/ggc-plugin_base/src/ggc/plugin/comm/Hid4JavaCommunicationHandler.java =================================================================== --- trunk/ggc-plugin_base/src/ggc/plugin/comm/Hid4JavaCommunicationHandler.java 2016-06-28 20:57:32 UTC (rev 1405) +++ trunk/ggc-plugin_base/src/ggc/plugin/comm/Hid4JavaCommunicationHandler.java 2016-06-28 21:00:23 UTC (rev 1406) @@ -6,7 +6,6 @@ import org.apache.commons.lang.StringUtils; import org.hid4java.HidDevice; -import org.hid4java.HidDeviceInfo; import org.hid4java.HidManager; import org.hid4java.HidServices; import org.slf4j.Logger; @@ -47,7 +46,7 @@ return false; } - hidDevice = findHidDevice_0_3_1(hidServices); + hidDevice = findHidDevice(hidServices); if (hidDevice == null) { @@ -60,14 +59,46 @@ } - private HidDevice findHidDevice_0_3_1(HidServices hidServices) throws PlugInBaseException + private HidDevice findHidDevice(HidServices hidServices) throws PlugInBaseException { - HidDeviceInfo selHidDeviceInfo = null; + // // 0.3.1 + // + // HidDeviceInfo selHidDeviceInfo = null; + // + // // Provide a list of attached devices + // for (HidDeviceInfo hidDeviceInfo : + // hidServices.getAttachedHidDevices()) + // { + // if (isCorrectDevice(hidDeviceInfo.getVendorId(), + // hidDeviceInfo.getProductId())) + // { + // selHidDeviceInfo = hidDeviceInfo; + // } + // } + // + // if (selHidDeviceInfo == null) + // { + // throw new PlugInBaseException(PlugInExceptionType.DeviceNotFound); + // } + // + // hidDevice = hidServices.getHidDevice(selectedDevice.getVendorId(), + // selectedDevice.getProductId(), null); + // + // if (hidDevice == null) + // { + // LOG.error("Device could not be opened."); + // throw new + // PlugInBaseException(PlugInExceptionType.DeviceCouldNotBeContacted); + // } + // 0.4.x + HidDevice selHidDeviceInfo = null; + // Provide a list of attached devices - for (HidDeviceInfo hidDeviceInfo : hidServices.getAttachedHidDevices()) + for (HidDevice hidDeviceInfo : hidServices.getAttachedHidDevices()) { - if (isCorrectDevice(hidDeviceInfo.getVendorId(), hidDeviceInfo.getProductId())) + System.out.println(hidDeviceInfo); + if (isInAllowedDevicesList(hidDeviceInfo.getVendorId(), hidDeviceInfo.getProductId())) { selHidDeviceInfo = hidDeviceInfo; } @@ -78,38 +109,20 @@ throw new PlugInBaseException(PlugInExceptionType.DeviceNotFound); } - hidDevice = hidServices.getHidDevice(selectedDevice.getVendorId(), selectedDevice.getProductId(), null); + hidDevice = selHidDeviceInfo; + if (!hidDevice.isOpen()) + { + LOG.debug("Device was not opened, so we opened it."); + hidDevice.open(); + } + else + { + LOG.debug("Device was open."); + } + return hidDevice; - } - - private HidDevice findHidDevice_0_4_x(HidServices hidServices) throws PlugInBaseException - { - - // HidDevice selHidDeviceInfo = null; - // - // // Provide a list of attached devices - // for (HidDevice hidDeviceInfo : hidServices.getAttachedHidDevices()) - // { - // System.out.println(hidDeviceInfo); - // if (isInAllowedDevicesList(hidDeviceInfo.getVendorId(), - // hidDeviceInfo.getProductId())) - // { - // selHidDeviceInfo = hidDeviceInfo; - // } - // } - // - // if (selHidDeviceInfo == null) - // { - // throw new PlugInBaseException(PlugInExceptionType.DeviceNotFound); - // } - // - // hidDevice = selHidDeviceInfo; - // - // return hidDevice; - return null; - } @@ -207,6 +220,12 @@ } + public String getLastErrorMessage() + { + return this.hidDevice.getLastErrorMessage(); + } + + public void write(byte[] b, int off, int len) throws PlugInBaseException { @@ -270,10 +289,24 @@ Set<USBDevice> list = new HashSet<USBDevice>(); + // FIXME // Provide a list of attached devices - for (HidDeviceInfo hidDeviceInfo : hidServices.getAttachedHidDevices()) + // 0.3.1 remove + // for (HidDeviceInfo hidDeviceInfo : + // hidServices.getAttachedHidDevices()) + // { + // USBDevice device = new + // USBDevice(hidDeviceInfo.getProductString().toString(), + // hidDeviceInfo.getVendorId(), + // hidDeviceInfo.getProductId()); + // + // list.add(device); + // } + + // 0.4.x + for (HidDevice hidDeviceInfo : hidServices.getAttachedHidDevices()) { - USBDevice device = new USBDevice(hidDeviceInfo.getProductString().toString(), hidDeviceInfo.getVendorId(), + USBDevice device = new USBDevice(hidDeviceInfo.getProduct(), hidDeviceInfo.getVendorId(), hidDeviceInfo.getProductId()); list.add(device); Modified: trunk/ggc-plugin_base/src/ggc/plugin/comm/NRSerialCommunicationHandler.java =================================================================== --- trunk/ggc-plugin_base/src/ggc/plugin/comm/NRSerialCommunicationHandler.java 2016-06-28 20:57:32 UTC (rev 1405) +++ trunk/ggc-plugin_base/src/ggc/plugin/comm/NRSerialCommunicationHandler.java 2016-06-28 21:00:23 UTC (rev 1406) @@ -51,7 +51,7 @@ public void setSerialSettings(SerialSettings settings) { - this.serialSettings = serialSettings; + this.serialSettings = settings; } Modified: trunk/ggc-plugin_base/src/ggc/plugin/graph/data/CGMSGraphDataHandler.java =================================================================== --- trunk/ggc-plugin_base/src/ggc/plugin/graph/data/CGMSGraphDataHandler.java 2016-06-28 20:57:32 UTC (rev 1405) +++ trunk/ggc-plugin_base/src/ggc/plugin/graph/data/CGMSGraphDataHandler.java 2016-06-28 21:00:23 UTC (rev 1406) @@ -184,7 +184,7 @@ plot.setDomainAxis(dateAxis); // FIXME fix hardcoded values - ValueMarker markerHigh = new ValueMarker(dataAccess.getDisplayedBG(240)); + ValueMarker markerHigh = new ValueMarker(dataAccess.getDisplayedBG(180)); markerHigh.setPaint(Color.red); ValueMarker markerLow = new ValueMarker(dataAccess.getDisplayedBG(80)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-06-28 20:57:36
|
Revision: 1405 http://sourceforge.net/p/ggc/code/1405 Author: andyrozman Date: 2016-06-28 20:57:32 +0000 (Tue, 28 Jun 2016) Log Message: ----------- - ggc doctor changes to panels (just as dependencies) Modified Paths: -------------- trunk/ggc-cgm/src/GGC_CGMSTool_en.properties Modified: trunk/ggc-cgm/src/GGC_CGMSTool_en.properties =================================================================== --- trunk/ggc-cgm/src/GGC_CGMSTool_en.properties 2016-06-28 20:55:05 UTC (rev 1404) +++ trunk/ggc-cgm/src/GGC_CGMSTool_en.properties 2016-06-28 20:57:32 UTC (rev 1405) @@ -59,6 +59,7 @@ MN_CGMS_READ_FILE=Read file MN_CGMS_READ_FILE_DESC=Read data from CGMS/sw export file +MN_CGMS_GRAPH_DESC=Graphs for CGMS Plugin #MN_DAILY_GRAPH=Daily CGMS Graph #MN_DAILY_GRAPH_DESC=Daily CGMS Graph This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2016-06-28 20:55:08
|
Revision: 1404 http://sourceforge.net/p/ggc/code/1404 Author: andyrozman Date: 2016-06-28 20:55:05 +0000 (Tue, 28 Jun 2016) Log Message: ----------- - ggc doctor changes to panels (just as dependencies) Modified Paths: -------------- trunk/ggc-doctor/src/ggc/doc/DocMainFrame.java trunk/ggc-doctor/src/ggc/gui/dialogs/DailyRowMealsDialog.java trunk/ggc-doctor/src/ggc/gui/dialogs/DailyStatsDialog.java trunk/ggc-doctor/src/ggc/gui/panels/info/GeneralInfoPanel.java trunk/ggc-doctor/src/ggc/gui/panels/info/StatisticsInfoPanel.java Modified: trunk/ggc-doctor/src/ggc/doc/DocMainFrame.java =================================================================== --- trunk/ggc-doctor/src/ggc/doc/DocMainFrame.java 2016-05-26 17:51:27 UTC (rev 1403) +++ trunk/ggc-doctor/src/ggc/doc/DocMainFrame.java 2016-06-28 20:55:05 UTC (rev 1404) @@ -1,29 +1,5 @@ package ggc.doc; -import ggc.GGCDocEdition; -import ggc.core.data.graph.GraphViewCourse; -import ggc.core.data.graph.GraphViewSpread; -import ggc.core.db.GGCDbLoader; -import ggc.core.db.tool.transfer.BackupDialog; -import ggc.core.db.tool.transfer.RestoreGGCSelectorDialog; -import ggc.core.util.DataAccess; -import ggc.core.util.RefreshInfo; -import ggc.gui.dialogs.AboutGGCDialog; -import ggc.gui.dialogs.AppointmentsDialog; -import ggc.gui.dialogs.DailyStatsDialog; -import ggc.gui.dialogs.DoctorsDialog; -import ggc.gui.dialogs.HbA1cDialog; -import ggc.gui.dialogs.PrintingDialog; -import ggc.gui.dialogs.PropertiesDialog; -import ggc.gui.dialogs.defs.StockListDef; -import ggc.gui.panels.info.InfoPanel; -import ggc.shared.ratio.RatioBaseDialog; -import ggc.shared.ratio.RatioExtendedDialog; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Event; -import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -38,24 +14,7 @@ import javax.help.HelpBroker; import javax.help.HelpSet; import javax.help.HelpSetException; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.BorderFactory; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JToolBar; -import javax.swing.KeyStroke; -import javax.swing.UIManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.atech.graphics.dialogs.guilist.GUIListDialog; import com.atech.graphics.graphs.GraphViewer; import com.atech.help.HelpContext; @@ -65,6 +24,19 @@ import com.atech.update.client.UpdateDialog; import com.l2fprod.gui.plaf.skin.SkinLookAndFeel; +import ggc.GGCDocEdition; +import ggc.core.data.graph.GraphViewCourse; +import ggc.core.data.graph.GraphViewSpread; +import ggc.core.db.GGCDbLoader; +import ggc.core.db.tool.transfer.BackupDialog; +import ggc.core.db.tool.transfer.RestoreGGCSelectorDialog; +import ggc.core.util.DataAccess; +import ggc.core.util.RefreshInfo; +import ggc.gui.dialogs.defs.StockListDef; +import ggc.gui.panels.info.InfoPanel; +import ggc.shared.ratio.RatioBaseDialog; +import ggc.shared.ratio.RatioExtendedDialog; + /** * Application: GGC - GNU Gluco Control * @@ -91,49 +63,44 @@ * Andy {an...@at...} */ - public class DocMainFrame extends JFrame implements EventObserverInterface { private static final long serialVersionUID = -8971779470148201332L; - private static Log log = LogFactory.getLog(DocMainFrame.class); - + private static Logger LOG = LoggerFactory.getLogger(DocMainFrame.class); + /** * Skin Look and Feel */ public static SkinLookAndFeel s_skinlf; - /** * Developer version */ public static boolean developer_version = false; - /** * Menu Bar */ private JMenuBar menuBar = new JMenuBar(); - /** * Tool Bars */ - private Hashtable<String,JToolBar> toolbars = null; - - - //private JToolBar toolBar = new JToolBar(); - //private JToolBar toolbar_pen = new JToolBar(); - //private JToolBar toolbar_pump = new JToolBar(); + private Hashtable<String, JToolBar> toolbars = null; + // private JToolBar toolBar = new JToolBar(); + // private JToolBar toolbar_pen = new JToolBar(); + // private JToolBar toolbar_pump = new JToolBar(); + private DataAccess m_da = null; private static final String skinLFdir = "../data/skinlf_themes/"; private I18nControlAbstract m_ic = null; - - -// private JMenu menu_file, menu_bgs, /*menu_food,*/ menu_doctor, menu_printing, menu_tools, menu_help, /*menu_meters, menu_pumps,*/ menu_data_graphs /*, menu_cgms , menu_misc */; + // private JMenu menu_file, menu_bgs, /*menu_food,*/ menu_doctor, + // menu_printing, menu_tools, menu_help, /*menu_meters, menu_pumps,*/ + // menu_data_graphs /*, menu_cgms , menu_misc */; private Hashtable<String, JMenu> menus = null; private Hashtable<String, GGCAction> actions = null; @@ -141,18 +108,16 @@ private Hashtable<String, GGCAction> toolbar_pump_items = null; private int current_toolbar = -1; - /** * Status panels */ public StatusBar statusPanel; - + /** * Information panels */ public InfoPanel informationPanel; - /** * Static definitions (Look and Feel) @@ -162,7 +127,7 @@ DocMainFrame.setLookAndFeel(); } - + /** * Set Look & Feel */ @@ -201,6 +166,7 @@ } + /** * Constructor * @@ -216,12 +182,13 @@ // System.out.println("MainFrame before creation"); m_da = DataAccess.createInstance(this); - //System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! m_da: " + m_da); + // System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! m_da: + // " + m_da); m_ic = m_da.getI18nControlInstance(); m_da.addComponent(this); - + m_da.setDeveloperMode(developer_version); statusPanel = new StatusBar(this); @@ -229,63 +196,57 @@ this.actions = new Hashtable<String, GGCAction>(); DocMainFrame.developer_version = developer_version; - String title_full = " GGC - GNU Gluco Control (" + GGCDocEdition.full_version + ")"; if (developer_version) title_full += " - Developer edition"; - + setTitle(title_full); this.setIconImage(m_da.getImageIcon_22x22("diabetesbluecircle.png", this).getImage()); - - + setJMenuBar(menuBar); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); addWindowListener(new CloseListener()); helpInit(); -// initPlugIns(); + // initPlugIns(); // menu_file, menu_bgs, menu_food, menu_doctor, menu_reports, // menu_tools, menu_help; - //setTitle(""); - + // setTitle(""); + this.setSoftwareMode(); - + createMenus(); createToolBars(); - - + m_da.addObserver(DataAccess.OBSERVABLE_STATUS, this); - + /* * addToolBarButtonWithName("view_daily"); * addToolBarButtonWithName("view_course"); * addToolBarButtonWithName("view_spread"); * addToolBarButtonWithName("view_freq"); addToolBarSpacer(); * addToolBarSpacer(); - * * addToolBarButtonWithName("view_hba1c"); addToolBarSpacer(); * addToolBarSpacer(); //addToolBarButtonWithName("view_freq"); - * - * - * * addToolBarButtonWithName("tools_pref"); addToolBarSpacer(); * addToolBarSpacer(); addToolBarButtonWithName("hlp_help"); */ // this.menu_help.add(GGCHelp.helpItem); - - //getContentPane().remove(this.toolbars.get("TOOLBAR_PEN")); - //getContentPane().remove(this.toolbars.get("TOOLBAR_PUMP")); -// getContentPane().add(this.toolbars.get("TOOLBAR_PEN"), BorderLayout.NORTH); + // getContentPane().remove(this.toolbars.get("TOOLBAR_PEN")); + // getContentPane().remove(this.toolbars.get("TOOLBAR_PUMP")); + + // getContentPane().add(this.toolbars.get("TOOLBAR_PEN"), + // BorderLayout.NORTH); getContentPane().add(statusPanel, BorderLayout.SOUTH); - m_da.startDb(); //statusPanel); + m_da.startDb(); // statusPanel); statusPanel.setStatusMessage(m_ic.getMessage("INIT")); @@ -295,30 +256,28 @@ // setDbActions(false); setMenusByDbLoad(StatusBar.DB_STOPPED); - - -// initPlugIns(); - + + // initPlugIns(); + m_da.startToObserve(); this.setVisible(true); } - + private void setSoftwareMode() { - //System.out.println("SW: " + m_da.getSoftwareMode()); - - if (m_da.getSoftwareMode()==-1) + // System.out.println("SW: " + m_da.getSoftwareMode()); + + if (m_da.getSoftwareMode() == -1) return; - - + String title_full = " GNU Gluco Control - Doctor's Edition (" + GGCDocEdition.full_version + ")"; if (developer_version) title_full += " - Developer edition"; - - //title_full += getSoftwareMode(); + + // title_full += getSoftwareMode(); setTitle(title_full); /** @@ -342,12 +301,10 @@ getContentPane().add(this.toolbars.get("TOOLBAR_PEN"), BorderLayout.NORTH); } }*/ - - + } - - - + + /** * Get Software Mode * @@ -355,31 +312,29 @@ */ public String getSoftwareMode() { - return ""; //" [" + m_ic.getMessage(m_da.getSoftwareModeDescription()) + "]"; + return ""; // " [" + m_ic.getMessage(m_da.getSoftwareModeDescription()) + // + "]"; } - - -/* - private void initPlugIns() - { - // TODO: deprecated - m_da.addPlugIn(DataAccess.PLUGIN_METERS, new MetersPlugIn(this, m_ic)); - // m_da.getPlugIn(DataAccess.PLUGIN_METERS).checkIfInstalled(); - m_da.addPlugIn(DataAccess.PLUGIN_PUMPS, new PumpsPlugIn(this, m_ic)); - // m_da.getPlugIn(DataAccess.PLUGIN_PUMPS).checkIfInstalled(); - m_da.addPlugIn(DataAccess.PLUGIN_CGMS, new CGMSPlugIn(this, m_ic)); - // m_da.getPlugIn(DataAccess.PLUGIN_CGMS).checkIfInstalled(); - } -*/ - - + /* + * private void initPlugIns() + * { + * // TODO: deprecated + * m_da.addPlugIn(DataAccess.PLUGIN_METERS, new MetersPlugIn(this, m_ic)); + * // m_da.getPlugIn(DataAccess.PLUGIN_METERS).checkIfInstalled(); + * m_da.addPlugIn(DataAccess.PLUGIN_PUMPS, new PumpsPlugIn(this, m_ic)); + * // m_da.getPlugIn(DataAccess.PLUGIN_PUMPS).checkIfInstalled(); + * m_da.addPlugIn(DataAccess.PLUGIN_CGMS, new CGMSPlugIn(this, m_ic)); + * // m_da.getPlugIn(DataAccess.PLUGIN_CGMS).checkIfInstalled(); + * } + */ + private void createMenus() { JMenu menux, menuxsub; - this.menus = new Hashtable<String,JMenu>(); - + this.menus = new Hashtable<String, JMenu>(); + // file menu menux = this.createMenu("MN_FILE", null); this.createAction(menux, "MN_LOGIN", "MN_LOGIN_DESC", "file_login", "logon.png"); @@ -388,8 +343,7 @@ this.createAction(menux, "MN_QUIT", "MN_QUIT_DESC", "file_quit", null); this.menus.put("MENU_FILE", menux); - - + // bgs menu menux = this.createMenu("MN_DATA", null); this.createAction(menux, "MN_DAILY", "MN_DAILY_DESC", "view_daily", "calendar.png"); // "daily.gif"); @@ -403,34 +357,35 @@ menux.addSeparator(); this.createAction(menux, "MN_HBA1C", "MN_HBA1C_DESC", "view_hba1c", "pie-chart.png"); // null); menux.addSeparator(); - + menuxsub = this.createMenu(menux, "MN_DATA_RATIO", null); this.createAction(menuxsub, "MN_RATIO_BASE", "MN_RATIO_BASE_DESC", "ratio_base", null); // null); this.createAction(menuxsub, "MN_RATIO_EXTENDED", "MN_RATIO_EXTENDED_DESC", "ratio_extended", null); // null); this.menus.put("MENU_PEN", menux); - - + // doctors menu - /*menux = this.createMenu("MN_DOCTOR", null); - this.createAction(menux, "MN_DOCS", "MN_DOCS_DESC", "doc_docs", null); - menux.addSeparator(); - this.createAction(menux, "MN_APPOINT", "MN_APPOINT_DESC", "doc_appoint", null); - menux.addSeparator(); - this.createAction(menux, "MN_STOCKS", "MN_STOCKS_DESC", "doc_stocks", null); + /* + * menux = this.createMenu("MN_DOCTOR", null); + * this.createAction(menux, "MN_DOCS", "MN_DOCS_DESC", "doc_docs", + * null); + * menux.addSeparator(); + * this.createAction(menux, "MN_APPOINT", "MN_APPOINT_DESC", + * "doc_appoint", null); + * menux.addSeparator(); + * this.createAction(menux, "MN_STOCKS", "MN_STOCKS_DESC", "doc_stocks", + * null); + * this.menus.put("MENU_DOCTOR", menux); + */ - this.menus.put("MENU_DOCTOR", menux); - */ - // reports menu menux = this.createMenu("MN_PRINTING", null); menuxsub = this.createMenu(menux, "MN_REPORTS", "MN_REPORTS_DESC"); this.createAction(menuxsub, "MN_PDF_SIMPLE", "MN_PDF_SIMPLE_DESC", "report_pdf_simple", "print.png"); this.createAction(menuxsub, "MN_PDF_EXT", "MN_PDF_EXT_DESC", "report_pdf_extended", "print.png"); - + this.menus.put("MENU_PRINT", menux); - // tools menu menux = this.createMenu("MN_TOOLS", null); @@ -440,16 +395,15 @@ menuxsub = this.createMenu(menux, "MN_DB_MAINT", "MN_DB_MAINT_DESC"); this.createAction(menuxsub, "MN_DB_BACKUP", "MN_DB_BACKUP_DESC", "tools_db_backup", "export1.png"); this.createAction(menuxsub, "MN_DB_RESTORE", "MN_DB_RESTORE_DESC", "tools_db_restore", "import1.png"); - + menux.addSeparator(); this.createAction(menux, "MN_MISC_SYNCHRONIZE", "MN_MISC_SYNCHRONIZE_DESC", "misc_synchronize", null); this.menus.put("MENU_TOOLS", menux); - - + // help menu menux = this.createMenu("MN_HELP", null); -// menux.add(m_da.getHelpContext().getHelpItem()); + // menux.add(m_da.getHelpContext().getHelpItem()); menux.addSeparator(); this.createAction(menux, "MN_CHECK_FOR_UPDATE", "MN_CHECK_FOR_UPDATE_DESC", "hlp_check_update", null); menux.addSeparator(); @@ -461,54 +415,61 @@ this.createAction(menux, "MN_TEST", "MN_TEST_DESC", "test", null); } - this.menus.put("MENU_HELP", menux); - + } - - + + private void createToolBars() { /* - this.toolbars = new Hashtable<String,JToolBar>(); - createToolBar_PenInjection(); - createToolBar_Pump(); - */ + * this.toolbars = new Hashtable<String,JToolBar>(); + * createToolBar_PenInjection(); + * createToolBar_Pump(); + */ } - - + private void createToolBar_PenInjection() { JToolBar toolbar = new JToolBar(); - //toolbar = new JToolBar(); + // toolbar = new JToolBar(); toolbar.setFloatable(false); toolbar.setLayout(new FlowLayout(FlowLayout.LEFT, 1, 1)); this.toolbars.put("TOOLBAR_PEN", toolbar); - + this.toolbar_pen_items = new Hashtable<String, GGCAction>(); Dimension d = new Dimension(25, 25); toolbar.addSeparator(d); - this.createToolbarAction("MN_LOGIN", "MN_LOGIN_DESC", "file_login", "logon.png", DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_LOGIN", "MN_LOGIN_DESC", "file_login", "logon.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); toolbar.addSeparator(d); - this.createToolbarAction("MN_DAILY", "MN_DAILY_DESC", "view_daily", "calendar.png", DocMainFrame.TOOLBAR_PEN_INJECTION); - this.createToolbarAction("MN_COURSE", "MN_COURSE_DESC", "view_course", "line-chart.png", DocMainFrame.TOOLBAR_PEN_INJECTION); - this.createToolbarAction("MN_SPREAD", "MN_SPREAD_DESC", "view_spread", "dot-chart.png", DocMainFrame.TOOLBAR_PEN_INJECTION); - this.createToolbarAction("MN_FREQUENCY", "MN_FREQUENCY_DESC", "view_freq", "column-chart.png", DocMainFrame.TOOLBAR_PEN_INJECTION); - this.createToolbarAction("MN_HBA1C", "MN_HBA1C_DESC", "view_hba1c", "pie-chart.png", DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_DAILY", "MN_DAILY_DESC", "view_daily", "calendar.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_COURSE", "MN_COURSE_DESC", "view_course", "line-chart.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_SPREAD", "MN_SPREAD_DESC", "view_spread", "dot-chart.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_FREQUENCY", "MN_FREQUENCY_DESC", "view_freq", "column-chart.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_HBA1C", "MN_HBA1C_DESC", "view_hba1c", "pie-chart.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); toolbar.addSeparator(d); - this.createToolbarAction("MN_MEALS", "MN_MEALS_DESC", "food_meals", "food.png", DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_MEALS", "MN_MEALS_DESC", "food_meals", "food.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); toolbar.addSeparator(d); - this.createToolbarAction("MN_PDF_SIMPLE", "MN_PDF_SIMPLE_DESC", "report_pdf_simple", "print.png", DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_PDF_SIMPLE", "MN_PDF_SIMPLE_DESC", "report_pdf_simple", "print.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); toolbar.addSeparator(d); - this.createToolbarAction("MN_PREFERENCES", "MN_PREFERENCES_DESC", "tools_pref", "preferences.png", DocMainFrame.TOOLBAR_PEN_INJECTION); + this.createToolbarAction("MN_PREFERENCES", "MN_PREFERENCES_DESC", "tools_pref", "preferences.png", + DocMainFrame.TOOLBAR_PEN_INJECTION); toolbar.addSeparator(d); toolbar.addSeparator(d); toolbar.addSeparator(d); @@ -516,21 +477,20 @@ this.createToolbarAction("MN_HELP", "MN_HELP_DESC", "hlp_help", "help.png", DocMainFrame.TOOLBAR_PEN_INJECTION); this.toolbars.put("TOOLBAR_PEN", toolbar); - + } - + private void createToolBar_Pump() { JToolBar toolbar = new JToolBar(); - - //toolbar_pump = new JToolBar(); + + // toolbar_pump = new JToolBar(); toolbar.setFloatable(false); toolbar.setLayout(new FlowLayout(FlowLayout.LEFT, 1, 1)); this.toolbars.put("TOOLBAR_PUMP", toolbar); - - + this.toolbar_pump_items = new Hashtable<String, GGCAction>(); Dimension d = new Dimension(25, 25); @@ -539,27 +499,33 @@ this.createToolbarAction("MN_LOGIN", "MN_LOGIN_DESC", "file_login", "logon.png", DocMainFrame.TOOLBAR_PUMP); toolbar.addSeparator(d); - - this.createToolbarAction("MN_PUMPS_MANUAL_ENTRY", "MN_PUMPS_MANUAL_ENTRY_DESC", "pumps_manual_entry", "calendar.png", DocMainFrame.TOOLBAR_PUMP); + this.createToolbarAction("MN_PUMPS_MANUAL_ENTRY", "MN_PUMPS_MANUAL_ENTRY_DESC", "pumps_manual_entry", + "calendar.png", DocMainFrame.TOOLBAR_PUMP); this.createToolbarAction("MN_HBA1C", "MN_HBA1C_DESC", "view_hba1c", "pie-chart.png", DocMainFrame.TOOLBAR_PUMP); toolbar.addSeparator(d); - - + /* - this.createToolbarAction("MN_DAILY", "MN_DAILY_DESC", "view_daily", "calendar.png"); - this.createToolbarAction("MN_COURSE", "MN_COURSE_DESC", "view_course", "line-chart.png"); - this.createToolbarAction("MN_SPREAD", "MN_SPREAD_DESC", "view_spread", "dot-chart.png"); - this.createToolbarAction("MN_FREQUENCY", "MN_FREQUENCY_DESC", "view_freq", "column-chart.png"); - this.createToolbarAction("MN_HBA1C", "MN_HBA1C_DESC", "view_hba1c", "pie-chart.png"); - toolBar.addSeparator(d); -*/ + * this.createToolbarAction("MN_DAILY", "MN_DAILY_DESC", "view_daily", + * "calendar.png"); + * this.createToolbarAction("MN_COURSE", "MN_COURSE_DESC", + * "view_course", "line-chart.png"); + * this.createToolbarAction("MN_SPREAD", "MN_SPREAD_DESC", + * "view_spread", "dot-chart.png"); + * this.createToolbarAction("MN_FREQUENCY", "MN_FREQUENCY_DESC", + * "view_freq", "column-chart.png"); + * this.createToolbarAction("MN_HBA1C", "MN_HBA1C_DESC", "view_hba1c", + * "pie-chart.png"); + * toolBar.addSeparator(d); + */ this.createToolbarAction("MN_MEALS", "MN_MEALS_DESC", "food_meals", "food.png", DocMainFrame.TOOLBAR_PUMP); toolbar.addSeparator(d); - this.createToolbarAction("MN_PUMP_PRINT_EXT", "MN_PUMP_PRINT_EXT_DESC", "report_print_pump_ext", "print.png", DocMainFrame.TOOLBAR_PUMP); + this.createToolbarAction("MN_PUMP_PRINT_EXT", "MN_PUMP_PRINT_EXT_DESC", "report_print_pump_ext", "print.png", + DocMainFrame.TOOLBAR_PUMP); toolbar.addSeparator(d); - this.createToolbarAction("MN_PREFERENCES", "MN_PREFERENCES_DESC", "tools_pref", "preferences.png", DocMainFrame.TOOLBAR_PUMP); + this.createToolbarAction("MN_PREFERENCES", "MN_PREFERENCES_DESC", "tools_pref", "preferences.png", + DocMainFrame.TOOLBAR_PUMP); toolbar.addSeparator(d); toolbar.addSeparator(d); toolbar.addSeparator(d); @@ -567,42 +533,40 @@ this.createToolbarAction("MN_HELP", "MN_HELP_DESC", "hlp_help", "help.png", DocMainFrame.TOOLBAR_PUMP); this.toolbars.put("TOOLBAR_PUMP", toolbar); - + } - - - + + private void helpInit() { // FIXME - + if (true) return; - - -// HelpContext hc = new HelpContext("../data/help/GGC.hs"); -// m_da.setHelpContext(hc); + + // HelpContext hc = new HelpContext("../data/help/GGC.hs"); + // m_da.setHelpContext(hc); boolean help_debug = true; - + if (help_debug) System.out.println("Help Init"); - + System.out.println("Help. Selected language: " + m_da.getLanguageManager().getSelectedLanguage()); - - //String selected_language = m_da.getLanguageManager().getSelectedLanguage(); - //String default_help = m_da.getLanguageManager().getDefaultHelp(); - + + // String selected_language = + // m_da.getLanguageManager().getSelectedLanguage(); + // String default_help = m_da.getLanguageManager().getDefaultHelp(); + HelpContext hc = m_da.getHelpContext(); - - + JMenuItem helpItem = new JMenuItem(m_ic.getMessage("HELP") + "..."); helpItem.setIcon(new ImageIcon(getClass().getResource("/icons/help.gif"))); hc.setHelpItem(helpItem); - //String mainHelpSetName = "../data/help/en/GGC.hs"; // added en - - String mainHelpSetName = "../data/" + m_da.getLanguageManager().getHelpSet(); - + // String mainHelpSetName = "../data/help/en/GGC.hs"; // added en + + String mainHelpSetName = "../data/" + m_da.getLanguageManager().getHelpSet(); + mainHelpSetName = mainHelpSetName.replace("/", File.separator); hc.setMainHelpSetName(mainHelpSetName); @@ -620,20 +584,20 @@ // X ClassLoader cl = MainFrame.class.getClassLoader(); // String help_url = "jar:file:pis_lang-0.1.jar!/help/PIS.hs"; - //String help_url = "jar:file:ggc_help-0.1.jar!/help/en/GGC.hs"; - + // String help_url = "jar:file:ggc_help-0.1.jar!/help/en/GGC.hs"; + String help_url = "jar:file:ggc_help-0.1.jar!/" + m_da.getLanguageManager().getHelpSet(); System.out.println("URL: " + help_url); - + try { URL hsURL = new URL(help_url); - //if (hsURL == null) - // System.out.println("HelpSet " + help_url + " not found."); - //else - main_help_set = new HelpSet(null, hsURL); + // if (hsURL == null) + // System.out.println("HelpSet " + help_url + " not found."); + // else + main_help_set = new HelpSet(null, hsURL); } catch (HelpSetException ee) { @@ -649,7 +613,7 @@ if (main_help_set != null) { - log.debug("Help: Main Help Set present, creating broker"); + LOG.debug("Help: Main Help Set present, creating broker"); main_help_broker = main_help_set.createHelpBroker(); } @@ -678,6 +642,7 @@ } + /** * Get this as parent * @@ -688,6 +653,7 @@ return this; } + /** * Invalidate panels */ @@ -696,6 +662,7 @@ this.informationPanel.invalidatePanelsConstants(); } + /** * Refresh panels */ @@ -704,6 +671,7 @@ this.informationPanel.refreshPanels(); } + private JMenu createMenu(String name, String tool_tip) { JMenu item = new JMenu(m_ic.getMessageWithoutMnemonic(name)); @@ -721,6 +689,7 @@ return item; } + private JMenu createMenu(JMenu parent, String name, String tool_tip) { JMenu item = new JMenu(m_ic.getMessageWithoutMnemonic(name)); @@ -736,7 +705,6 @@ return item; } - /** * ToolBar: Pen/Injection */ @@ -746,7 +714,8 @@ * ToolBar: Pump */ public static final int TOOLBAR_PUMP = 2; - + + private void createToolbarAction(String name, String tip, String action_command, String icon_small, int toolbar_id) { GGCAction action = new GGCAction(name, tip, action_command); @@ -756,7 +725,6 @@ action.putValue(Action.SMALL_ICON, m_da.getImageIcon(icon_small, 24, 24, this)); } - if (toolbar_id == DocMainFrame.TOOLBAR_PEN_INJECTION) this.toolbar_pen_items.put(action_command, action); else @@ -766,6 +734,7 @@ } + private void createAction(JMenu menu, String name, String tip, String action_command, String icon_small) { GGCAction action = new GGCAction(name, tip, action_command); @@ -786,6 +755,7 @@ // return action; } + /** * Set menus by Db Loading status * @@ -846,40 +816,35 @@ } else if (status == StatusBar.DB_LOADED) { -/* // food menu - this.menu_food.setEnabled(true); - this.actions.get("food_nutrition_1").setEnabled(true); - this.actions.get("food_nutrition_2").setEnabled(true); - this.actions.get("food_meals").setEnabled(true); - */ + /* + * // food menu + * this.menu_food.setEnabled(true); + * this.actions.get("food_nutrition_1").setEnabled(true); + * this.actions.get("food_nutrition_2").setEnabled(true); + * this.actions.get("food_meals").setEnabled(true); + */ } /* - * * // file menu this.createAction(this.menu_file, "MN_LOGIN", * "MN_LOGIN_DESC", "file_login", null); * this.createAction(this.menu_file, "MN_LOGOUT", "MN_LOGOUT_DESC", * "file_logout", null); - * - * * // tools menu this.createAction(this.menu_tools, "MN_DB_MAINT", * "MN_DB_MAINT_DESC", "tools_db_maint", null); * this.createAction(this.menu_tools, "MN_MISC_SYNCHRONIZE", * "MN_MISC_SYNCHRONIZE_DESC", "misc_synchronize", null); - * * // meters this.createAction(menu_meters, "MN_METERS_READ", * "MN_METERS_READ_DESC", "meters_read", null); * this.createAction(menu_meters, "MN_METERS_LIST", * "MN_METERS_LIST_DESC", "meters_list", null); * this.createAction(menu_meters, "MN_METERS_CONFIG", * "MN_METERS_CONFIG_DESC", "meters_config", null); - * * // pumps this.createAction(menu_pumps, "MN_PUMPS_READ", * "MN_PUMPS_READ_DESC", "pumps_read", null); * this.createAction(menu_pumps, "MN_PUMPS_LIST", "MN_PUMPS_LIST_DESC", * "pumps_list", null); this.createAction(menu_pumps, "MN_PUMPS_CONFIG", * "MN_PUMPS_CONFIG_DESC", "pumps_config", null); - * * // doctors menu this.createAction(this.menu_doctor, "MN_DOCS", * "MN_DOCS_DESC", "doc_docs", null); * this.createAction(this.menu_doctor, "MN_APPOINT", "MN_APPOINT_DESC", @@ -890,7 +855,7 @@ setToolbarByDbLoad(status); } - + /** * Set Toolbar by Db Load * @@ -898,7 +863,7 @@ */ public void setToolbarByDbLoad(int status) { - + // this.toolbar_items.get("hlp_help").setEnabled(true) setToolBarItemEnabled("file_login", false); @@ -912,7 +877,7 @@ setToolBarItemEnabled("view_freq", false); setToolBarItemEnabled("view_hba1c", false); - //setToolBarItemEnabled("food_meals", false); + // setToolBarItemEnabled("food_meals", false); setToolBarItemEnabled("report_pdf_simple", false); @@ -934,38 +899,33 @@ } else if (status == StatusBar.DB_LOADED) { - // this.toolbar_items.get("food_meals").setEnabled(true); + // this.toolbar_items.get("food_meals").setEnabled(true); } } - + private void setToolBarItemEnabled(String item_name, boolean enabled) { /* - if (this.toolbar_pump_items.containsKey(item_name)) - { - this.toolbar_pump_items.get(item_name).setEnabled(enabled); - } + * if (this.toolbar_pump_items.containsKey(item_name)) + * { + * this.toolbar_pump_items.get(item_name).setEnabled(enabled); + * } + * if (this.toolbar_pen_items.containsKey(item_name)) + * { + * this.toolbar_pen_items.get(item_name).setEnabled(enabled); + * } + */ - if (this.toolbar_pen_items.containsKey(item_name)) - { - this.toolbar_pen_items.get(item_name).setEnabled(enabled); - }*/ - } - - - + /* * public void setDbActions(boolean opened) { - * * this.menu_bgs.setEnabled(opened); this.menu_food.setEnabled(opened); * this.menu_doctor.setEnabled(opened); * this.menu_printing.setEnabled(opened); - * * this.menu_meters.setEnabled(true); this.menu_pumps.setEnabled(true); - * * this.actions.get("view_daily").setEnabled(opened); * this.actions.get("view_course").setEnabled(opened); * this.actions.get("view_spread").setEnabled(opened); @@ -973,8 +933,6 @@ * this.actions.get("view_hba1c").setEnabled(opened); //x * this.actions.get("read_meter").setEnabled(opened); * this.actions.get("tools_pref").setEnabled(opened); - * - * * / FIXXXXXXXXXXXX viewDailyAction.setEnabled(opened); * viewSpreadGraphAction.setEnabled(opened); * viewCourseGraphAction.setEnabled(opened); @@ -983,6 +941,7 @@ * prefAction.setEnabled(opened); //s_dbH.setStatus(); */ + // System.out.println("FIIIIIIIIIIIIIIIIIIIIIIXXXX this"); // } private void close() @@ -1006,23 +965,21 @@ /* * private JMenuItem addMenuItem(JMenu menu, Action action) { JMenuItem item * = menu.add(action); - * * //System.out.println(action.getValue(Action.ACCELERATOR_KEY)); - * * KeyStroke keystroke = (KeyStroke) * action.getValue(Action.ACCELERATOR_KEY); if (keystroke != null) * item.setAccelerator(keystroke); - * * return item; } */ + /* * private void addToolBarSpacer() { toolBar.addSeparator(); } */ private JButton addToolBarButton(Action action, int toolbar_id) { - final JButton button; + final JButton button; if (toolbar_id == DocMainFrame.TOOLBAR_PEN_INJECTION) button = this.toolbars.get("TOOLBAR_PEN").add(action); @@ -1049,6 +1006,7 @@ */ private static final long serialVersionUID = -1022459758999093522L; + GGCAction(String name, String command) { super(); @@ -1072,6 +1030,7 @@ command = name; } + GGCAction(String name, String tooltip, String command) { super(); @@ -1104,11 +1063,13 @@ putValue(ACTION_COMMAND_KEY, command); } + public String getName() { return (String) getValue(Action.NAME); } + public void actionPerformed(ActionEvent e) { @@ -1148,7 +1109,7 @@ } else if (command.equals("view_freq")) { - //new FrequencyGraphDialog(m_da); + // new FrequencyGraphDialog(m_da); featureNotImplementedDescription(m_ic.getMessage("FREQGRAPHFRAME"), "0.5"); } else if (command.equals("view_hba1c")) @@ -1191,25 +1152,30 @@ } else featureNotImplemented(command, "0.5"); - + } - + /* * else if (command.equals("hlp_check")) { new * VersionChecker().checkForUpdate(); } */ -/* else if (command.equals("food_nutrition_1")) - { - new NutritionTreeDialog(MainFrame.this, m_da, GGCTreeRoot.TREE_USDA_NUTRITION); - } - else if (command.equals("food_nutrition_2")) - { - new NutritionTreeDialog(MainFrame.this, m_da, GGCTreeRoot.TREE_USER_NUTRITION); - } - else if (command.equals("food_meals")) - { - new NutritionTreeDialog(MainFrame.this, m_da, GGCTreeRoot.TREE_MEALS); - } */ + /* + * else if (command.equals("food_nutrition_1")) + * { + * new NutritionTreeDialog(MainFrame.this, m_da, + * GGCTreeRoot.TREE_USDA_NUTRITION); + * } + * else if (command.equals("food_nutrition_2")) + * { + * new NutritionTreeDialog(MainFrame.this, m_da, + * GGCTreeRoot.TREE_USER_NUTRITION); + * } + * else if (command.equals("food_meals")) + * { + * new NutritionTreeDialog(MainFrame.this, m_da, + * GGCTreeRoot.TREE_MEALS); + * } + */ else if (command.equals("tools_db_backup")) { new BackupDialog(DocMainFrame.this, m_da); @@ -1227,27 +1193,37 @@ { new PrintingDialog(DocMainFrame.this, 2, PrintingDialog.PRINT_DIALOG_YEAR_MONTH_OPTION); } -/* else if (command.equals("report_foodmenu_simple")) - { - new PrintingDialog(MainFrame.this, 1, PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION); - } - else if (command.equals("report_foodmenu_ext1")) - { - new PrintingDialog(MainFrame.this, 2, PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION); - } - else if (command.equals("report_foodmenu_ext2")) - { - new PrintingDialog(MainFrame.this, 3, PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION); - } */ - /*else if (command.equals("report_foodmenu_ext3")) - { - // disabled for now, until it's implement to fully function - new PrintingDialog(MainFrame.this, 4, PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION); - } */ - /*else if (command.equals("view_ratio")) - { - new RatioDialog(getMyParent()); - }*/ + /* + * else if (command.equals("report_foodmenu_simple")) + * { + * new PrintingDialog(MainFrame.this, 1, + * PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION); + * } + * else if (command.equals("report_foodmenu_ext1")) + * { + * new PrintingDialog(MainFrame.this, 2, + * PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION); + * } + * else if (command.equals("report_foodmenu_ext2")) + * { + * new PrintingDialog(MainFrame.this, 3, + * PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION); + * } + */ + /* + * else if (command.equals("report_foodmenu_ext3")) + * { + * // disabled for now, until it's implement to fully function + * new PrintingDialog(MainFrame.this, 4, + * PrintingDialog.PRINT_DIALOG_RANGE_DAY_OPTION); + * } + */ + /* + * else if (command.equals("view_ratio")) + * { + * new RatioDialog(getMyParent()); + * } + */ else if (command.equals("doc_docs")) { if (DocMainFrame.developer_version) @@ -1269,14 +1245,13 @@ } else // if ((command.equals("report_pdf_extended")) || - if ((command.equals("file_login")) || - (command.equals("report_foodmenu_ext3")) || - (command.equals("file_logout"))) + if ((command.equals("file_login")) || (command.equals("report_foodmenu_ext3")) + || (command.equals("file_logout"))) { featureNotImplemented(command, "0.5"); } - else if (command.equals("misc_synchronize")) //|| - //(command.equals("doc_stocks"))) + else if (command.equals("misc_synchronize")) // || + // (command.equals("doc_stocks"))) { featureNotImplemented(command, "0.6"); } @@ -1288,57 +1263,49 @@ } else featureNotImplemented(command, "0.5"); - - - + } - - - + else if ((command.equals("test"))) { - - //new DailyRowMealsDialog(null, new JDialog()); - - + + // new DailyRowMealsDialog(null, new JDialog()); + // spread graph - //new GraphViewer(new GraphViewSpread(), m_da); - - + // new GraphViewer(new GraphViewSpread(), m_da); + /* - // graph course - new GraphViewer(new GraphViewCourse(), m_da); - */ - + * // graph course + * new GraphViewer(new GraphViewCourse(), m_da); + */ + // ratio calculator - // @SuppressWarnings("unused") - // RatioCalculatorDialog rcd = new RatioCalculatorDialog(MainFrame.this); + // @SuppressWarnings("unused") + // RatioCalculatorDialog rcd = new + // RatioCalculatorDialog(MainFrame.this); - //BasalRateEstimator bre = new BasalRateEstimator(); - - - /* - // daily view - GregorianCalendar gc = new GregorianCalendar(); - gc.set(GregorianCalendar.DAY_OF_MONTH, 18); - gc.set(GregorianCalendar.MONTH, 10); - gc.set(GregorianCalendar.YEAR, 2008); - - new GraphViewer(new GraphViewDaily(gc), m_da); - */ - - - //new HbA1cDialog(m_da); + // BasalRateEstimator bre = new BasalRateEstimator(); + + /* + * // daily view + * GregorianCalendar gc = new GregorianCalendar(); + * gc.set(GregorianCalendar.DAY_OF_MONTH, 18); + * gc.set(GregorianCalendar.MONTH, 10); + * gc.set(GregorianCalendar.YEAR, 2008); + * new GraphViewer(new GraphViewDaily(gc), m_da); + */ + + // new HbA1cDialog(m_da); // ImportDacioDb idb = new // ImportDacioDb("../data/temp/zivila.csv", true); //args[ // idb.convertFoods(); -/* - DayValuesData dvd = m_da.getDb().getDayValuesData(20081001, 20091007); // .getMonthlyValues(yr, - // mnth); - PrintFoodMenuExt2 psm = new PrintFoodMenuExt2(dvd); - - PrintingDialog.displayPDFExternal(psm.getName()); -*/ + /* + * DayValuesData dvd = m_da.getDb().getDayValuesData(20081001, + * 20091007); // .getMonthlyValues(yr, + * // mnth); + * PrintFoodMenuExt2 psm = new PrintFoodMenuExt2(dvd); + * PrintingDialog.displayPDFExternal(psm.getName()); + */ // BolusHelper bh = new BolusHelper(MainFrame.this); // featureNotImplemented(command, "0.6"); } @@ -1347,19 +1314,19 @@ // ggc.gui.ReadMeterDialog rm = new // ggc.gui.ReadMeterDialog(MainFrame.this); - //System.out.println("In login"); + // System.out.println("In login"); /* - try - { - throw new Exception("Test Exception"); - } - catch (Exception ex) - { - System.out.println("we falled into exception"); - m_da.createErrorDialog("MainFrame", "", ex, - "Exception in mainframe."); - } - */ + * try + * { + * throw new Exception("Test Exception"); + * } + * catch (Exception ex) + * { + * System.out.println("we falled into exception"); + * m_da.createErrorDialog("MainFrame", "", ex, + * "Exception in mainframe."); + * } + */ } else System.out.println("Unknown Command: " + command); @@ -1367,6 +1334,7 @@ } } + private void featureNotImplemented(String cmd, String version) { String text = m_ic.getMessage("FEATURE"); @@ -1375,11 +1343,12 @@ text += String.format(m_ic.getMessage("IMPLEMENTED_VERSION"), version); text += "!"; - JOptionPane.showMessageDialog(DocMainFrame.this, text, m_ic.getMessage("INFORMATION"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(DocMainFrame.this, text, m_ic.getMessage("INFORMATION"), + JOptionPane.INFORMATION_MESSAGE); } - + private void featureNotImplementedDescription(String desc, String version) { String text = m_ic.getMessage("FEATURE"); @@ -1388,13 +1357,14 @@ text += String.format(m_ic.getMessage("IMPLEMENTED_VERSION"), version); text += "!"; - JOptionPane.showMessageDialog(DocMainFrame.this, text, m_ic.getMessage("INFORMATION"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(DocMainFrame.this, text, m_ic.getMessage("INFORMATION"), + JOptionPane.INFORMATION_MESSAGE); } - - + private class CloseListener extends WindowAdapter { + @Override public void windowClosing(WindowEvent e) { @@ -1402,7 +1372,7 @@ } } - + /** * To String * @@ -1414,35 +1384,36 @@ return "MainFrame"; } - boolean title_set = false; - + + /** * Update */ public void update(Observable obj, Object arg) { - //System.out.println("update"); + // System.out.println("update"); if (arg instanceof Integer) { - Integer i = (Integer)arg; + Integer i = (Integer) arg; if (!title_set) { - if (i>=RefreshInfo.PANEL_GROUP_GENERAL_INFO) + if (i >= RefreshInfo.PANEL_GROUP_GENERAL_INFO) { title_set = true; this.setSoftwareMode(); } } - - //Integer i = (Integer)arg; + + // Integer i = (Integer)arg; setMenusByDbLoad(i.intValue()); - - if (m_da.getDbLoadingStatus() >= GGCDbLoader.DB_DATA_BASE); - this.setSoftwareMode(); - //this.setTitle(); - + + if (m_da.getDbLoadingStatus() >= GGCDbLoader.DB_DATA_BASE) + ; + this.setSoftwareMode(); + // this.setTitle(); + if (i == RefreshInfo.DB_LOADED) refreshMenus(); } @@ -1453,83 +1424,74 @@ { refreshMenus(true); } - - - + + private void refreshMenus(boolean refresh_init) { - //System.out.println("Refresh Menus: "); + // System.out.println("Refresh Menus: "); this.menuBar.removeAll(); - - + this.menuBar.add(this.menus.get("MENU_FILE")); this.menuBar.add(this.menus.get("MENU_PEN")); JMenu menu = getPlugInMenu(DataAccess.PLUGIN_NUTRITION); - - if (menu!=null) + + if (menu != null) this.menuBar.add(menu); - - + // doctors menu - //this.menuBar.add(this.menus.get("MENU_DOCTOR")); + // this.menuBar.add(this.menus.get("MENU_DOCTOR")); - if (refresh_init) { - + // reports menu - - for(Enumeration<String> en= m_da.getPlugins().keys(); en.hasMoreElements(); ) + + for (Enumeration<String> en = m_da.getPlugins().keys(); en.hasMoreElements();) { String key = en.nextElement(); - + PlugInClient pic = m_da.getPlugIn(key); - - if (pic.getPlugInPrintMenus()!=null) + + if (pic.getPlugInPrintMenus() != null) { JMenu[] menus = pic.getPlugInPrintMenus(); - - for(int i=0; i<menus.length; i++) + + for (int i = 0; i < menus.length; i++) { this.menus.get("MENU_PRINT").add(menus[i]); } } } } - - this.menuBar.add(this.menus.get("MENU_PRINT")); - - String[] keys = { DataAccess.PLUGIN_METERS, - DataAccess.PLUGIN_PUMPS, - DataAccess.PLUGIN_CGMS, - }; - - - for(int j=0; j<keys.length; j++) + this.menuBar.add(this.menus.get("MENU_PRINT")); + + String[] keys = { DataAccess.PLUGIN_METERS, DataAccess.PLUGIN_PUMPS, DataAccess.PLUGIN_CGMS, }; + + for (int j = 0; j < keys.length; j++) { String key = keys[j]; - + if (m_da.isPluginAvailable(key)) { PlugInClient pic = m_da.getPlugIn(key); - - if (pic.getPlugInMainMenu()!=null) + + if (pic.getPlugInMainMenu() != null) { this.menuBar.add(pic.getPlugInMainMenu()); } } } - - + this.menuBar.add(this.menus.get("MENU_TOOLS")); this.menuBar.add(this.menus.get("MENU_HELP")); - + this.setJMenuBar(this.menuBar); - + } + /** * This refresh is used when configuration of plugin changes */ @@ -1538,7 +1500,6 @@ this.refreshMenus(false); } - private JMenu getPlugInMenu(String name) { @@ -1550,7 +1511,5 @@ else return null; } - - - -} \ No newline at end of file + +} Modified: trunk/ggc-doctor/src/ggc/gui/dialogs/DailyRowMealsDialog.java =================================================================== --- trunk/ggc-doctor/src/ggc/gui/dialogs/DailyRowMealsDialog.java 2016-05-26 17:51:27 UTC (rev 1403) +++ trunk/ggc-doctor/src/ggc/gui/dialogs/DailyRowMealsDialog.java 2016-06-28 20:55:05 UTC (rev 1404) @@ -1,26 +1,9 @@ package ggc.gui.dialogs; -import ggc.core.data.DailyValuesRow; -import ggc.core.util.DataAccess; - -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.StringTokenizer; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.atech.graphics.components.JDecimalTextField; import com.atech.graphics.dialogs.TransferDialog; import com.atech.help.HelpCapable; @@ -28,6 +11,9 @@ import com.atech.utils.ATDataAccessAbstract; import com.atech.utils.ATSwingUtils; +import ggc.core.data.DailyValuesRow; +import ggc.core.util.DataAccess; + /** * Application: GGC - GNU Gluco Control * @@ -55,32 +41,33 @@ // DEPRECATED -public class DailyRowMealsDialog extends TransferDialog /*JDialog*/ implements ActionListener, HelpCapable +public class DailyRowMealsDialog extends TransferDialog /* JDialog */ implements ActionListener, HelpCapable { private static final long serialVersionUID = 6763016271693781911L; - private static Log log = LogFactory.getLog(DailyRowMealsDialog.class); + private static Logger LOG = LoggerFactory.getLogger(DailyRowMealsDialog.class); + private I18nControlAbstract m_ic = null; - //private DataAccess m_da = DataAccess.getInstance(); -// private GGCProperties props = m_da.getSettings(); + // private DataAccess m_da = DataAccess.getInstance(); + // private GGCProperties props = m_da.getSettings(); JLabel label_title; JDecimalTextField ftf_ch; JTextArea text_area; - - //DateTimeComponent dtc; - //JButton AddButton; - //String sDate = null; - //DailyValues dV = null; + + // DateTimeComponent dtc; + // JButton AddButton; + // String sDate = null; + // DailyValues dV = null; DailyValuesRow m_dailyValuesRow = null; - //NumberFormat bg_displayFormat, bg_editFormat; + // NumberFormat bg_displayFormat, bg_editFormat; JComponent components[] = new JComponent[9]; - //Font f_normal = m_da.getFont(DataAccess.FONT_NORMAL); - //Font f_bold = m_da.getFont(DataAccess.FONT_NORMAL); + // Font f_normal = m_da.getFont(DataAccess.FONT_NORMAL); + // Font f_bold = m_da.getFont(DataAccess.FONT_NORMAL); boolean in_process; boolean debug = true; JButton help_button = null; @@ -89,13 +76,13 @@ String food_desc; String food_ch; - + boolean transfer_mode = false; Component parent; - - - //private Container m_parent = null; + + // private Container m_parent = null; + /** * Constructor * @@ -104,14 +91,14 @@ */ public DailyRowMealsDialog(DailyValuesRow row, JDialog dialog) { - super(dialog); //, "", true); + super(dialog); // , "", true); parent = dialog; this.m_da = DataAccess.getInstance(); this.m_ic = m_da.getI18nControlInstance(); - //m_parent = dialog; + // m_parent = dialog; this.m_dailyValuesRow = row; - + init(); load(); m_da.centerJDialog(this); @@ -127,19 +114,19 @@ */ public DailyRowMealsDialog(JFrame parent) { - super(parent); //, "", true); + super(parent); // , "", true); this.parent = parent; - //m_parent = dialog; - //this.m_dailyValuesRow = row; + // m_parent = dialog; + // this.m_dailyValuesRow = row; transfer_mode = true; init(); - //load(); - //m_da.centerJDialog(this); + // load(); + // m_da.centerJDialog(this); - } - + + /** * Constructor * @@ -147,23 +134,22 @@ */ public DailyRowMealsDialog(JDialog parent) { - super(parent); //, "", true); + super(parent); // , "", true); this.parent = parent; - //m_parent = dialog; - //this.m_dailyValuesRow = row; + // m_parent = dialog; + // this.m_dailyValuesRow = row; transfer_mode = true; - //init(); - //load(); - //m_da.centerJDialog(this); + // init(); + // load(); + // m_da.centerJDialog(this); - } - + private void load() { - + if (this.transfer_mode) { this.text_area.setText(this.food_desc); @@ -174,52 +160,44 @@ this.text_area.setText(this.m_dailyValuesRow.getFoodDescription()); this.ftf_ch.setValue(m_da.getFloatValueFromString(this.m_dailyValuesRow.getFoodDescriptionCH(), 0.0f)); } - - /* - String ch = this.m_dailyValuesRow.getFoodDescriptionCH(); - - - - if (ch!=null) - { - - - System.out.println("CH:" + ch); - - ch = ch.replace(DataAccess.false_decimal, DataAccess.real_decimal); - - ch = ch.replace(",", "."); - - try - { - float f = Float.parseFloat(ch); - System.out.println("CH:" + f); - - this.ftf_ch.setValue(f); - } - catch(Exception ex) - { - System.out.println("load ex: " + ex); - } - } - } */ + /* + * String ch = this.m_dailyValuesRow.getFoodDescriptionCH(); + * if (ch!=null) + * { + * System.out.println("CH:" + ch); + * ch = ch.replace(DataAccess.false_decimal, DataAccess.real_decimal); + * ch = ch.replace(",", "."); + * try + * { + * float f = Float.parseFloat(ch); + * System.out.println("CH:" + f); + * this.ftf_ch.setValue(f); + * } + * catch(Exception ex) + * { + * System.out.println("load ex: " + ex); + * } + * } + * } + */ + } - + private void save() { - -// System.out.println(this.ftf_ch.getValue()); -// System.out.println(this.ftf_ch.getCurrentValue()); - - float ch = m_da.getFloatValue(this.ftf_ch.getCurrentValue()); - //ch = ch.replace(DataAccess.false_decimal, DataAccess.real_decimal); -// System.out.println("Save.Float= " + ch); - - String val = null; - if (ch>0) + // System.out.println(this.ftf_ch.getValue()); + // System.out.println(this.ftf_ch.getCurrentValue()); + + float ch = m_da.getFloatValue(this.ftf_ch.getCurrentValue()); + // ch = ch.replace(DataAccess.false_decimal, DataAccess.real_decimal); + + // System.out.println("Save.Float= " + ch); + + String val = null; + if (ch > 0) val = "" + ch; else val = ""; @@ -232,37 +210,31 @@ else { this.m_dailyValuesRow.setFoodDescription(this.text_area.getText()); - this.m_dailyValuesRow.setFoodDescriptionCH(val); //DataAccess.Decimal2Format.format(ch)); + this.m_dailyValuesRow.setFoodDescriptionCH(val); // DataAccess.Decimal2Format.format(ch)); } - } - - - private void init() { m_da.addComponent(this); - + ATSwingUtils.initLibrary(); - - + int x = 0; int y = 0; int width = 400; int height = 340; /* - Rectangle bnd = m_parent.getBounds(); + * Rectangle bnd = m_parent.getBounds(); + * x = (bnd.width / 2) + bnd.x - (width / 2); + * y = (bnd.height / 2) + bnd.y - (height / 2); + */ - x = (bnd.width / 2) + bnd.x - (width / 2); - y = (bnd.height / 2) + bnd.y - (height / 2); - */ - this.setBounds(x, y, width, height); - + m_da.centerJDialog(this); JPanel panel = new JPanel(); @@ -274,38 +246,32 @@ this.getContentPane().add(panel); setTitle(m_ic.getMessage("FOOD_BY_DESCRIPTION_TITLE")); - label_title = ATSwingUtils.getTitleLabel(m_ic.getMessage("FOOD_BY_DESCRIPTION_TITLE"), - 0, 15, 400, 35, panel, + label_title = ATSwingUtils.getTitleLabel(m_ic.getMessage("FOOD_BY_DESCRIPTION_TITLE"), 0, 15, 400, 35, panel, ATSwingUtils.FONT_BIG_BOLD); - - ATSwingUtils.getLabel(m_ic.getMessage("DESCRIBE_FOODS"), - 40, 65, 310, 50, panel); - + + ATSwingUtils.getLabel(m_ic.getMessage("DESCRIBE_FOODS"), 40, 65, 310, 50, panel); + this.text_area = new JTextArea(); this.text_area.setLineWrap(true); JScrollPane scr = new JScrollPane(text_area); - scr.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER|JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + scr.setHorizontalScrollBarPolicy( + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER | JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); scr.setBounds(40, 115, 310, 75); panel.add(scr); - - ATSwingUtils.getLabel(m_ic.getMessage("CH_LONG") +":", - 40, 210, 100, 25, panel); - - this.ftf_ch = ATSwingUtils.getNumericTextField(2, 2, - new Float(0.0f), 160, 210, 55, 25, panel); - - ATSwingUtils.getButton(m_ic.getMessage("CALCULATE"), - 230, 210, 120, 25, - panel, ATSwingUtils.FONT_NORMAL, null, "calculate", this, m_da); - - ATSwingUtils.getButton(m_ic.getMessage("OK"), - 30, 260, 110, 25, - panel, ATSwingUtils.FONT_NORMAL, "ok.png", "ok", this, m_da); - - ATSwingUtils.getButton(m_ic.getMessage("CANCEL"), - 145, 260, 110, 25, - panel, ATSwingUtils.FONT_NORMAL, "cancel.png", "cancel", this, m_da); - + + ATSwingUtils.getLabel(m_ic.getMessage("CH_LONG") + ":", 40, 210, 100, 25, panel); + + this.ftf_ch = ATSwingUtils.getNumericTextField(2, 2, new Float(0.0f), 160, 210, 55, 25, panel); + + ATSwingUtils.getButton(m_ic.getMessage("CALCULATE"), 230, 210, 120, 25, panel, ATSwingUtils.FONT_NORMAL, null, + "calculate", this, m_da); + + ATSwingUtils.getButton(m_ic.getMessage("OK"), 30, 260, 110, 25, panel, ATSwingUtils.FONT_NORMAL, "ok.png", "ok", + this, ... [truncated message content] |