Merge branch 'develop'

IARC-CSU · Jun 17, 2020 · 06ff40a · 06ff40a
2 parents eea32af + 22a70e6
commit 06ff40a
Show file tree

Hide file tree

Showing 9 changed files with 424 additions and 388 deletions.
diff --git a/appinfo.properties b/appinfo.properties
@@ -1,10 +1,10 @@
-#Everything can be manually updated except buildnum and builddate.
-#Fri, 05 Jun 2020 19:37:35 +0200
-program.BUILDNUM=1700
-program.AUTHOR=Morten Johannes Ervik, CSU/IARC
-program.BUILDDATE=20200605193735
-program.DESCRIPTION=CanReg5 is a multi user, multi platform, open source tool to input, store, check and analyse cancer registry data.
-program.COPYRIGHT=2008-2019
-program.VERSION=5.00.44b
-program.COMPANY=International Agency for Research on Cancer
-program.PROGNAME=CanReg
+#Everything can be manually updated except buildnum and builddate.
+#Wed, 17 Jun 2020 12:17:55 +0200
+program.BUILDNUM=1702
+program.AUTHOR=Morten Johannes Ervik, CSU/IARC
+program.BUILDDATE=20200617121755
+program.DESCRIPTION=CanReg5 is a multi user, multi platform, open source tool to input, store, check and analyse cancer registry data.
+program.COPYRIGHT=2008-2020
+program.VERSION=5.00.44c
+program.COMPANY=International Agency for Research on Cancer
+program.PROGNAME=CanReg
diff --git a/buildnumber.properties b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Jun 05 19:37:35 CEST 2020
-build.number=1701
+#Wed Jun 17 12:17:55 CEST 2020
+build.number=1703
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,8 @@
 Changelog
 
+5.00.44c
+- Fixed a bug in recording of unknown dates.
+
 5.00.44b
 - Table builder is now compatible with latest version of R. (4.0.0)
 - Population data sets with different reference populations are not compatible.

diff --git a/inno-settings.txt b/inno-settings.txt
@@ -1 +1 @@
-#define MyAppVersion "5.00.44b"
+#define MyAppVersion "5.00.44c"
diff --git a/src/canreg/client/gui/resources/about.html b/src/canreg/client/gui/resources/about.html
@@ -1,110 +1,110 @@
-<!--
-    Document   : about
-    Created on : 05-Aug-2008, 15:25:28
-    Author     : ervikm
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>CanReg5: About</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>Copyright</B></FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>&copy; 2008-2019
-                    International Agency for Research on Cancer<BR>World Health
-                    Organization<BR>All rights reserved. (<a href="gpl-3.0-standalone.html">Licensing information</a>)</FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>Credits</B></FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Lead developement and design: <BR></B>
-                    Morten Johannes Ervik, IARC/CSU<BR>
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Additional developement: <BR></B>
-                    Andy Cooke (Original quality control module)<BR>
-                    Jacques Ferlay (Original PostScript code and conversion tables)<BR>
-                    Mathieu Laversanne (R code for analysis)<BR>
-                    Sebastien Antoni (R code for analysis)<BR>
-                    Anahita Rahimi (R code for analysis)<BR>
-                    Hemant Dhivar (Migration Tool)<BR>
-                    Betty Carballo and Patricio Carranza (New Dataentry form, bug fixes)
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Additional design: <BR></B>
-                    Andy Cooke<BR>
-                    Maria Paula Curado<BR>
-                    Lydia Voti, IARC/SCR<BR>
-                    Freddie Bray<BR>
-                    David Forman<BR>
-                    Max Parkin
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Consultants: <BR></B>
-                    Philippe Autier, IARC/BIO<BR>
-                    Hoda Anton-Culver, University of California Irvine, USA<BR>
-                    Joe Harford, NCI, USA<BR>
-                    Hai-Rim Shin, IARC/DEA<BR>
-                    John Young, Emory University, USA<BR>
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Technical consultants: <BR></B>
-                    Michel Smans, IARC/ITS<BR>
-                    Lucile Alteyrac, IARC/BIO
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Thanks:</B><BR>
-                    Kai Toedter (JCalendar)<BR>
-                    Jeremy Dickson (CachingTableAPI)<BR>
-                    Alexandre Moore (Icons)<BR>
-                    Brian Cole (PagingTableModel)<BR>
-                    Stephen Kelvin (XTableColumnModel)<BR>
-                    Ashok Banerjee and Jignesh Mehta (ExcelAdapter)<BR>
-                    Glen Smith et al (opencsv)<BR>
-                    Dem Pilafian (Bare Bones Browser Launch)<BR>
-                    Jesse Wilson (Glazed Lists)<BR>
-                    Frank Tang (juniversalchardet)<BR>
-                    Object REfinery Limited (JFreeChart)<BR>
-                    Chris Evans (jcommons)<BR>
-                    The Buzz Media (imgscalr – Java Image Scaling Library)<BR>
-                    The Apache Software Foundation (Batik)<BR>
-                    iText Software Corp (iText)
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Testers: </B><BR>
-                    Mathieu Mazuir, IARC/DEP<BR>
-                    Antoine Buemi, Registre des Cancers du Haut-Rhin
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Beta-testers: </B><BR>
-                    Xenios Anastassiades, Ministry of Health, Cyprus<BR>
-                    Deborah Bringman, University of California Irvine, USA<BR>
-                    Amr Ebeid, Gharbiah Cancer Registry, Egypt<BR>
-                    Ibrahim Abd-Elbar Seif Eldin, Gharbiah Cancer Registry, Egypt<BR>
-                    Sarah Marshall, University of California Irvine, USA<BR>
-                    Omar Nimri, Jordan Cancer Registry, Jordan<BR>
-                    M. Ramadan, Gharbiah Cancer Registry, Egypt<BR>
-                    Kevin Ward, Emory University, USA<BR>
-                    Cankut Yakut, Izmir Cancer Registry, Turkey<BR>
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Translators: </B><BR>
-                    French: Joannie Lortet-Tieulent, IARC, France<BR>
-                    Portugese: Edesio Martins, Goiania Cancer Registry, Brazil<BR>
-                    Russian: Evgeniya Ostroumova, IARC, France and Anton Ryzhov, Ukraine<BR>
-                    Spanish: Graciela Cristina Nicolas, Cordoba, Argentina<BR>
-                    Chinese: Yayun Dai, IARC, France and Shixuan Liu, China<BR>
-                    Portugese, Portugal: Gonçalo Lacerda, Azores, Portugal<br>
-                    Turkish: Cankut Yakut, Izmir Cancer Registry, Turkey
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>References: </B><BR></FONT></FONT>
-            <FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>
-                    J Ferlay et al, Check and Conversion Programs for Cancer Registries (IARC/IACR Tools for Cancer Registries), IARC Technical Report No. 42, Lyon, 2005 (Available at: <a href="http://www.iacr.com.fr/TR42.htm">http://www.iacr.com.fr/TR42.htm</a>)<BR>
-                    O.M. Jensen et al, Cancer Registration: Principles and Methods, IARC Scientific Publication No. 95, Lyon, 1991 (Available online at <a href ="http://www.iarc.fr./en/publications/pdfs-online/epi/sp95/index.php">http://www.iarc.fr./en/publications/pdfs-online/epi/sp95/index.php</a>)<BR>
-                    E Steliarova-Foucher et al, Childhood Classification, Third Edition, CANCER Volume 103, 1457-1467<BR>
-                    K Fogel, Producing Open Source Software, First Edition, O'Reilly, 2005<BR>
-                    J Bloch, Effective Java, Second Edition, Sun Microsystems, 2008
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Other acknowledgements: </B><BR></FONT></FONT>
-            <FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>
-                    CanReg1: Allen Bieber<BR>
-                    CanReg2: Stéphane Olivier<BR>
-                    CanReg3 and 4: Andy Cooke<BR>
-                </FONT></FONT></P>
-        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>Licenses</B></FONT></FONT><BR>
-            <FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>The RSSutils library
-                    is copyright 2003 Sun Microsystems, Inc. ALL RIGHTS RESERVED<BR></FONT></FONT>
-            <FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>The Soundex library
-                    is copyright 1996-2002 Ian F. Darwin, http://www.darwinsys.com/, ALL RIGHTS RESERVED<BR></FONT></FONT></P>
-    </body>
+<!--
+    Document   : about
+    Created on : 05-Aug-2008, 15:25:28
+    Author     : ervikm
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>CanReg5: About</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>Copyright</B></FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>&copy; 2008-2020
+                    International Agency for Research on Cancer<BR>World Health
+                    Organization<BR>All rights reserved. (<a href="gpl-3.0-standalone.html">Licensing information</a>)</FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>Credits</B></FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Lead developement and design: <BR></B>
+                    Morten Johannes Ervik, IARC/CSU<BR>
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Additional developement: <BR></B>
+                    Andy Cooke (Original quality control module)<BR>
+                    Jacques Ferlay (Original PostScript code and conversion tables)<BR>
+                    Mathieu Laversanne (R code for analysis)<BR>
+                    Sebastien Antoni (R code for analysis)<BR>
+                    Anahita Rahimi (R code for analysis)<BR>
+                    Hemant Dhivar (Migration Tool)<BR>
+                    Betty Carballo and Patricio Carranza (New Dataentry form, bug fixes)
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Additional design: <BR></B>
+                    Andy Cooke<BR>
+                    Maria Paula Curado<BR>
+                    Lydia Voti, IARC/SCR<BR>
+                    Freddie Bray<BR>
+                    David Forman<BR>
+                    Max Parkin
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Consultants: <BR></B>
+                    Philippe Autier, IARC/BIO<BR>
+                    Hoda Anton-Culver, University of California Irvine, USA<BR>
+                    Joe Harford, NCI, USA<BR>
+                    Hai-Rim Shin, IARC/DEA<BR>
+                    John Young, Emory University, USA<BR>
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Technical consultants: <BR></B>
+                    Michel Smans, IARC/ITS<BR>
+                    Lucile Alteyrac, IARC/BIO
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Thanks:</B><BR>
+                    Kai Toedter (JCalendar)<BR>
+                    Jeremy Dickson (CachingTableAPI)<BR>
+                    Alexandre Moore (Icons)<BR>
+                    Brian Cole (PagingTableModel)<BR>
+                    Stephen Kelvin (XTableColumnModel)<BR>
+                    Ashok Banerjee and Jignesh Mehta (ExcelAdapter)<BR>
+                    Glen Smith et al (opencsv)<BR>
+                    Dem Pilafian (Bare Bones Browser Launch)<BR>
+                    Jesse Wilson (Glazed Lists)<BR>
+                    Frank Tang (juniversalchardet)<BR>
+                    Object REfinery Limited (JFreeChart)<BR>
+                    Chris Evans (jcommons)<BR>
+                    The Buzz Media (imgscalr – Java Image Scaling Library)<BR>
+                    The Apache Software Foundation (Batik)<BR>
+                    iText Software Corp (iText)
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Testers: </B><BR>
+                    Mathieu Mazuir, IARC/DEP<BR>
+                    Antoine Buemi, Registre des Cancers du Haut-Rhin
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Beta-testers: </B><BR>
+                    Xenios Anastassiades, Ministry of Health, Cyprus<BR>
+                    Deborah Bringman, University of California Irvine, USA<BR>
+                    Amr Ebeid, Gharbiah Cancer Registry, Egypt<BR>
+                    Ibrahim Abd-Elbar Seif Eldin, Gharbiah Cancer Registry, Egypt<BR>
+                    Sarah Marshall, University of California Irvine, USA<BR>
+                    Omar Nimri, Jordan Cancer Registry, Jordan<BR>
+                    M. Ramadan, Gharbiah Cancer Registry, Egypt<BR>
+                    Kevin Ward, Emory University, USA<BR>
+                    Cankut Yakut, Izmir Cancer Registry, Turkey<BR>
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Translators: </B><BR>
+                    French: Joannie Lortet-Tieulent, IARC, France<BR>
+                    Portugese: Edesio Martins, Goiania Cancer Registry, Brazil<BR>
+                    Russian: Evgeniya Ostroumova, IARC, France and Anton Ryzhov, Ukraine<BR>
+                    Spanish: Graciela Cristina Nicolas, Cordoba, Argentina<BR>
+                    Chinese: Yayun Dai, IARC, France and Shixuan Liu, China<BR>
+                    Portugese, Portugal: Gonçalo Lacerda, Azores, Portugal<br>
+                    Turkish: Cankut Yakut, Izmir Cancer Registry, Turkey
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>References: </B><BR></FONT></FONT>
+            <FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>
+                    J Ferlay et al, Check and Conversion Programs for Cancer Registries (IARC/IACR Tools for Cancer Registries), IARC Technical Report No. 42, Lyon, 2005 (Available at: <a href="http://www.iacr.com.fr/TR42.htm">http://www.iacr.com.fr/TR42.htm</a>)<BR>
+                    O.M. Jensen et al, Cancer Registration: Principles and Methods, IARC Scientific Publication No. 95, Lyon, 1991 (Available online at <a href ="http://www.iarc.fr./en/publications/pdfs-online/epi/sp95/index.php">http://www.iarc.fr./en/publications/pdfs-online/epi/sp95/index.php</a>)<BR>
+                    E Steliarova-Foucher et al, Childhood Classification, Third Edition, CANCER Volume 103, 1457-1467<BR>
+                    K Fogel, Producing Open Source Software, First Edition, O'Reilly, 2005<BR>
+                    J Bloch, Effective Java, Second Edition, Sun Microsystems, 2008
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=2><B>Other acknowledgements: </B><BR></FONT></FONT>
+            <FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>
+                    CanReg1: Allen Bieber<BR>
+                    CanReg2: Stéphane Olivier<BR>
+                    CanReg3 and 4: Andy Cooke<BR>
+                </FONT></FONT></P>
+        <P><FONT FACE="Tahoma, sans-serif"><FONT SIZE=3><B>Licenses</B></FONT></FONT><BR>
+            <FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>The RSSutils library
+                    is copyright 2003 Sun Microsystems, Inc. ALL RIGHTS RESERVED<BR></FONT></FONT>
+            <FONT FACE="Tahoma, sans-serif"><FONT SIZE=2>The Soundex library
+                    is copyright 1996-2002 Ian F. Darwin, http://www.darwinsys.com/, ALL RIGHTS RESERVED<BR></FONT></FONT></P>
+    </body>
 </html>