Bugfixes (#226)

* case-insensitive ignoring of desktop.ini * base dashboard framework * Pull updates into dashboard working branch (#213) * dependency update * Include sources * Fix project render when no or bad carto_id obj * Sizes ... * Cleanup + debugging * later post update * Logging * Very bad goof * Update DB settings * Update dependencies * Tentative #212 * Tentative #212 * Temporary workaround for #212 * Temporary workaround for #212 * Debug #212 * Debug #212 * Debug #212 * Fix center calculation #212 * Fix #212 * Fix #211 * Start public #209 * Start public #209 * Render public #209 * Secure multibound data for private projects * Wrap cleaned corners in an array for compat * Tentative logged-in render for #209 * Fix broken tag * Tentative logged-in render for #209 * Tentative logged-in render for #209 * Fix #209 * Stage charts for dashboard * dashboard placeholders * Minor edits * Recompile after updates * Update bower * Chart creator * Recompile * Chart creator * Fix dist * Chart creator * Chart creator * Chart creator * some sketching for data charting api * Draft chart API response for infection binning * Fix error * Fix iteration * Sample API ping * Ignore server files * Fix passed parsed data * Fix passed parsed data * Multiply percent by 100 * colorize bars * colorize bars * Actually have some options * Wrap in a section * debug options * debug options * debug options * debug options * Fix tense * fix binning * Show a label * Use the right adjective * Debugging draft of location binning * API debugging * API debugging * Debugging draft of location binning * Debugging draft of location binning * Debugging draft of location binning * Debugging draft of location binning * Reconstruct data * Don't crap out on one bad blob of data * async timing * start at 0 * Bad Builders * Un-disable location * More api info * More api info * More api info * More raw info on country feedback * Delay for query limit * Delay for query limit * response change * response change * initialize empty points * initialize empty points * initialize empty points * wrong lookup type * arrayify * fix goofed wait * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * Tentative #216 * Update dependencies * More updates * bump * Change the behaviour of search results * BiSciCol link moved: Fix #222 * Record migrator * Try country sample binning * Start synonymization for countries * Samples by country * More synonymies * Fix synonymies * Fix synonymies * Handle zero results * Update chart.js * Add dev public key * Minor coffee update * Allow stacking context * Synonymies * Dedups * more dedups * Enable debug context by default * Enable debug context by default * Enable debug context by default * Enable debug context by default * Store parsed data for later handling? ... * Fix issue with fakely not-empty last statement giving unauthorized query type error * Better FIMS bad response * Remove cancel upload once upload finished * Tag saves with modified time * bump version * Change ms to s * play with column adder * data types
AmphibiaWeb · Mar 30, 2017 · 7d6aa8e · 7d6aa8e
1 parent f49a715
commit 7d6aa8e
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "BD Web Tracker",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "homepage": "https://amphibiandisease.org/",
   "authors": [
     "Philip Kahn <[email protected]>"

diff --git a/coffee/admin-editor.coffee b/coffee/admin-editor.coffee
@@ -2294,7 +2294,7 @@ saveEditorData = (force = false, callback) ->
   catch e
     console.error "Couldn't check path count -- #{e.message}. Faking it."
     pointCount = maxPathCount + 1
-  postData.modified = Date.now()
+  postData.modified = Date.now() / 1000
   console.log "Sending to server", postData
   args = "perform=save&data=#{jsonTo64 postData}"
   debugInfoDelay = delay 10000, ->

diff --git a/coffee/admin.coffee b/coffee/admin.coffee
@@ -747,7 +747,7 @@ finalizeData = (skipFields = false, callback) ->
             bounding_polygon_geojson: geo?.geoJsonBoundingBox
           postData.carto_id = JSON.stringify cartoData
           postData.project_id = _adp.projectId
-          postData.modified = Date.now()
+          postData.modified = Date.now() / 1000
           try
             postData.project_obj_id = _adp.fims.expedition.ark
           catch

diff --git a/core/db/DBHelper.php b/core/db/DBHelper.php
@@ -758,7 +758,7 @@ public function columnExists($columnName) {
         return (mysqli_num_rows($result)) ? TRUE : FALSE;
     }
 
-    public function addColumn($columnName, $columnType = null) {
+    public function addColumn($columnName, $columnType = "TEXT") {
         /***
          * Add a new column. DATA MUST BE SANITIZED BEFORE CALLING!
          *
@@ -790,6 +790,8 @@ public function addColumn($columnName, $columnType = null) {
             return array(
                 "status" => $r,
                 "error" => mysqli_error($this->getLink(), $r),
+                "column" => $columnName,
+                "type" => $columnType,
             );
         }
         return array(

diff --git a/js/admin.js b/js/admin.js
diff --git a/js/admin.min.js b/js/admin.min.js
diff --git a/js/admin.min.js.map b/js/admin.min.js.map
diff --git a/js/maps/admin.js.map b/js/maps/admin.js.map
diff --git a/js/maps/admin.src.coffee b/js/maps/admin.src.coffee
@@ -747,7 +747,7 @@ finalizeData = (skipFields = false, callback) ->
             bounding_polygon_geojson: geo?.geoJsonBoundingBox
           postData.carto_id = JSON.stringify cartoData
           postData.project_id = _adp.projectId
-          postData.modified = Date.now()
+          postData.modified = Date.now() / 1000
           try
             postData.project_obj_id = _adp.fims.expedition.ark
           catch
@@ -4749,7 +4749,7 @@ saveEditorData = (force = false, callback) ->
   catch e
     console.error "Couldn't check path count -- #{e.message}. Faking it."
     pointCount = maxPathCount + 1
-  postData.modified = Date.now()
+  postData.modified = Date.now() / 1000
   console.log "Sending to server", postData
   args = "perform=save&data=#{jsonTo64 postData}"
   debugInfoDelay = delay 10000, ->

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amphibian-disease-tracker",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Amphibian Disease Tracker Portal",
   "main": "",
   "scripts": {

diff --git a/recordMigrator.php b/recordMigrator.php
@@ -614,6 +614,7 @@ function elapsed($start_time = null)
                 # Add columns not in $cols to $newCols, and append to $cols
                 foreach($row as $refCol => $colData) {
                     # Lookup col type
+                    $colDataType = null;
                     foreach($db->getCols() as $colName => $colType) {
                         if(strtolower($colName) == strtolower($refCol)) {
                             $colDataType = $colType;
@@ -622,7 +623,7 @@ function elapsed($start_time = null)
                         } else if ($refCol == "modified") {
                             $colDataType = "decimal(32))";
                             break;
-                        }
+                        } else $colDataType = "text";
                     }
                     if(empty($colDataType)) $colDataType = "text";
                     # Put col in cols