Index: openacs-4/packages/assessment/assessment.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v
diff -u -r1.55 -r1.56
--- openacs-4/packages/assessment/assessment.info	29 Mar 2018 23:07:34 -0000	1.55
+++ openacs-4/packages/assessment/assessment.info	5 Jul 2018 10:42:47 -0000	1.56
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.10.0d0" url="http://openacs.org/repository/download/apm/assessment-2.10.0d0.apm">
+    <version name="2.10.0d1" url="http://openacs.org/repository/download/apm/assessment-2.10.0d1.apm">
         <owner url="mailto:eperez@it.uc3m.es">Eduardo Perez Ureta</owner>
         <summary>Assessment package that will replace the surveys
     quizz, complex survey, poll and other data collection packages
@@ -18,7 +18,7 @@
         <maturity>2</maturity>
         <package_instance_name>#assessment.Assessment#</package_instance_name>
 
-        <provides url="assessment" version="2.10.0d0"/>
+        <provides url="assessment" version="2.10.0d1"/>
         <requires url="acs-content-repository" version="5.9.1"/>
 	<requires url="acs-tcl" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
Index: openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-2.10.0d0-2.10.0d1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-2.10.0d0-2.10.0d1.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/sql/postgresql/upgrade/upgrade-2.10.0d0-2.10.0d1.sql	5 Jul 2018 10:42:47 -0000	1.1
@@ -0,0 +1,34 @@
+
+DO $$
+BEGIN
+   update acs_attributes set
+      datatype = 'timestamp'
+    where object_type = 'as_assessments'
+      and attribute_name in ('start_time', 'end_time');
+
+   update acs_attributes set
+      datatype = 'timestamp'
+    where object_type = 'as_item_data'
+      and attribute_name in ('timestamp_answer');
+
+   update acs_attributes set
+      datatype = 'boolean'
+    where object_type = 'as_item_display_sb'
+      and attribute_name in ('multiple_p', 'prepend_empty_p');
+      
+   update acs_attributes set
+      datatype = 'timestamp'
+    where object_type = 'as_section_data'
+      and attribute_name in ('creation_datetime', 'completed_datetime');      
+
+   update acs_attributes set
+      datatype = 'timestamp'
+    where object_type = 'as_sessions'
+      and attribute_name in (
+          'target_datetime',
+          'creation_datetime',
+          'first_mod_datetime',
+          'last_mod_datetime',
+          'completed_datetime'
+          );
+END$$;
Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v
diff -u -r1.47 -r1.48
--- openacs-4/packages/assessment/tcl/as-install-procs.tcl	5 Jul 2018 10:16:02 -0000	1.47
+++ openacs-4/packages/assessment/tcl/as-install-procs.tcl	5 Jul 2018 10:42:47 -0000	1.48
@@ -263,7 +263,7 @@
 content::type::attribute::new \
     -content_type {as_item_display_sb} \
     -attribute_name {multiple_p} \
-    -datatype {string}    \
+    -datatype {boolean} \
     -pretty_name {Allow Multiple} \
     -column_spec {char(1)}
 content::type::attribute::new \
@@ -281,7 +281,7 @@
 content::type::attribute::new \
     -content_type {as_item_display_sb} \
     -attribute_name {prepend_empty_p} \
-    -datatype {string}    \
+    -datatype {boolean} \
     -pretty_name {Prepend Empty Item} \
     -column_spec {char(1)}
 content::type::attribute::new \
@@ -759,14 +759,14 @@
     -column_spec {varchar(50)}
 content::type::attribute::new \
     -content_type {as_assessments} \
-    -attribute_name {start_time}            \
-    -datatype {number}  \
+    -attribute_name {start_time} \
+    -datatype {timestamp}  \
     -pretty_name {Assessment Start Time}  \
     -column_spec {timestamptz}
 content::type::attribute::new \
     -content_type {as_assessments} \
-    -attribute_name {end_time}            \
-    -datatype {number}  \
+    -attribute_name {end_time} \
+    -datatype {timestamp} \
     -pretty_name {Assessment End Time}  \
     -column_spec {timestamptz}
 content::type::attribute::new \
@@ -840,33 +840,33 @@
     -column_spec {integer}
 content::type::attribute::new \
     -content_type {as_sessions} \
-    -attribute_name {target_datetime}     \
-    -datatype {number}  \
-    -pretty_name {Target Date Time}     \
+    -attribute_name {target_datetime} \
+    -datatype {timestamp} \
+    -pretty_name {Target Date Time} \
     -column_spec {timestamptz}
 content::type::attribute::new \
     -content_type {as_sessions} \
-    -attribute_name {creation_datetime}     \
-    -datatype {number}  \
-    -pretty_name {Creation Date Time}     \
+    -attribute_name {creation_datetime} \
+    -datatype {timestamp} \
+    -pretty_name {Creation Date Time} \
     -column_spec {timestamptz}
 content::type::attribute::new \
     -content_type {as_sessions} \
-    -attribute_name {first_mod_datetime}     \
-    -datatype {number}  \
+    -attribute_name {first_mod_datetime} \
+    -datatype {timestamp} \
     -pretty_name {First Submission}     \
     -column_spec {timestamptz}
 content::type::attribute::new \
     -content_type {as_sessions} \
-    -attribute_name {last_mod_datetime}     \
-    -datatype {number}  \
-    -pretty_name {Most Recent Submission}     \
+    -attribute_name {last_mod_datetime} \
+    -datatype {timestamp} \
+    -pretty_name {Most Recent Submission} \
     -column_spec {timestamptz}
 content::type::attribute::new \
     -content_type {as_sessions} \
-    -attribute_name {completed_datetime}     \
-    -datatype {number}  \
-    -pretty_name {Final Submission}     \
+    -attribute_name {completed_datetime} \
+    -datatype {timestamp} \
+    -pretty_name {Final Submission} \
     -column_spec {timestamptz}
 content::type::attribute::new \
     -content_type {as_sessions} \
@@ -926,14 +926,14 @@
     -column_spec {float}
 content::type::attribute::new \
     -content_type {as_section_data} \
-    -attribute_name {creation_datetime}     \
-    -datatype {number}  \
-    -pretty_name {Creation Date Time}     \
+    -attribute_name {creation_datetime} \
+    -datatype {timestamp} \
+    -pretty_name {Creation Date Time} \
     -column_spec {timestamptz}
 content::type::attribute::new \
     -content_type {as_section_data} \
-    -attribute_name {completed_datetime}     \
-    -datatype {number}  \
+    -attribute_name {completed_datetime} \
+    -datatype {timestamp} \
     -pretty_name {Final Submission}     \
     -column_spec {timestamptz}
 
@@ -1006,9 +1006,9 @@
     -column_spec {varchar(500)}
 content::type::attribute::new \
     -content_type {as_item_data} \
-    -attribute_name {timestamp_answer}    \
-    -datatype {number}  \
-    -pretty_name {TimeStamp Answer}    \
+    -attribute_name {timestamp_answer} \
+    -datatype {timestamp} \
+    -pretty_name {TimeStamp Answer} \
     -column_spec {timestamptz}
 content::type::attribute::new \
     -content_type {as_item_data} \
@@ -1258,13 +1258,13 @@
                     content::type::attribute::new \
                         -content_type {as_section_data} \
                         -attribute_name {creation_datetime} \
-                        -datatype {number} \
+                        -datatype {timestamp} \
                         -pretty_name {Creation Date Time} \
                         -column_spec {timestamptz}
                     content::type::attribute::new \
                         -content_type {as_section_data} \
                         -attribute_name {completed_datetime} \
-                        -datatype {number} \
+                        -datatype {timestamp} \
                         -pretty_name {Final Submission} \
                         -column_spec {timestamptz}
                     content::type::attribute::new \