Add SQL alter, update d3 and review PR - refs BT#9068

main/admin/skills_wheel.php

@@ -20,7 +20,7 @@ if (api_get_setting('allow_skills_tool') != 'true') {
 }
 
 //Adds the JS needed to use the jqgrid
-$htmlHeadXtra[] = api_get_js('d3/d3.v2.min.js');
+$htmlHeadXtra[] = api_get_js('d3/d3.v3.5.4.min.js');
 $htmlHeadXtra[] = api_get_js('d3/colorbrewer.js');
 $htmlHeadXtra[] = api_get_js('d3/jquery.xcolor.js');
 

main/inc/lib/add_course.lib.inc.php

@@ -1759,6 +1759,7 @@ function create_course_tables($course_db_name = null) {
               show_form_profile int NOT NULL default 0,
               form_fields TEXT NOT NULL,
               session_id int unsigned NOT NULL default 0,
+              visible_results int unsigned DEFAULT 0,
               PRIMARY KEY  (c_id, survey_id)
             )" . $charset_clause;
     $result = Database::query($sql);

main/inc/lib/javascript/d3/d3.LICENSE

@@ -0,0 +1,26 @@
+Copyright (c) 2010-2015, Michael Bostock
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* The name Michael Bostock may not be used to endorse or promote products
+  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

main/install/db_main.sql

@@ -877,7 +877,7 @@ VALUES
 ('tool_visible_by_default_at_creation','forums','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Forums', 1),
 ('tool_visible_by_default_at_creation','quiz','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Quiz', 1),
 ('tool_visible_by_default_at_creation','gradebook','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Gradebook', 1),
-('chamilo_database_version', NULL, 'textfield',NULL, '1.9.0.18715','DatabaseVersion','', NULL, NULL, 0);
+('chamilo_database_version', NULL, 'textfield',NULL, '1.10.0.5','DatabaseVersion','', NULL, NULL, 0);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE settings_current ENABLE KEYS */;
 
@@ -3026,4 +3026,4 @@ CREATE TABLE usergroup_rel_question (
     coefficient float(6,2)
 );
 
--- 1.10.x-specific, non-course-related, database changes
+-- 1.10.x-specific, non-course-related, database changes

main/install/migrate-db-1.9.0-1.10.0-pre.sql

@@ -17,7 +17,9 @@
 
 
 -- Do not move this query
-UPDATE settings_current SET selected_value = '1.9.0.18716' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.5' WHERE variable = 'chamilo_database_version';
 
 -- xxCOURSExx
 
+ALTER TABLE c_survey ADD visible_results INT UNSIGNED DEFAULT 0;
+

main/social/skills_wheel.php

@@ -20,7 +20,7 @@ if (api_get_setting('allow_skills_tool') != 'true') {
 api_block_anonymous_users();
 
 //Adds the JS needed to use the jqgrid
-$htmlHeadXtra[] = api_get_js('d3/d3.v2.min.js');
+$htmlHeadXtra[] = api_get_js('d3/d3.v3.5.4.min.js');
 $htmlHeadXtra[] = api_get_js('d3/colorbrewer.js');
 $htmlHeadXtra[] = api_get_js('d3/jquery.xcolor.js');
 

main/survey/survey.lib.php

@@ -5341,7 +5341,7 @@ class SurveyUtil
     {
         $htmlChart = '';
         if (api_browser_support("svg")) {
-            $htmlChart .= api_get_js("d3/d3.v3.4.8.js");
+            $htmlChart .= api_get_js("d3/d3.v3.5.4.min.js");
             $htmlChart .= api_get_js("dimple.v2.1.2.min.js") . '
             <script type="text/javascript">
             var svg = dimple.newSvg("#chartContainer", "100%", 400);