From 219bc18cc6d89ac5b1d86acfc4677efcaa646b7b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 4 Oct 2017 22:03:39 -0400
Subject: [PATCH] Still need to test this....

---
 install/index.php            |  6 ++----
 install/js/install-script.js | 39 ++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/install/index.php b/install/index.php
index 47589f69..48dfb338 100644
--- a/install/index.php
+++ b/install/index.php
@@ -123,11 +123,9 @@ if (hesk_dbNumRows($tableSql) > 0) {
             </div>
             <div data-step="install-or-update" class="text-center" style="display: none">
                 <i class="fa fa-spin fa-spinner fa-4x"></i>
-                <div class="progress" style="display: none">
+                <div id="progress-bar" class="progress" style="display: none">
                     <div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"
-                         style="min-width: 2em; width: 100%">
-                        <span class="sr-only">100% Complete</span>
-                        100%
+                         style="width: 0">
                     </div>
                 </div>
                 <input type="hidden" name="starting-migration-number" value="<?php echo $startingMigrationNumber; ?>">
diff --git a/install/js/install-script.js b/install/js/install-script.js
index 5fb2ac0d..45076037 100644
--- a/install/js/install-script.js
+++ b/install/js/install-script.js
@@ -76,27 +76,50 @@ function installOrUpdate() {
             console.log(data.lastMigrationNumber);
 
             // Recursive call that will increment by 1 each time
-            //executeMigration(startingMigrationNumber, startingMigrationNumber, data.latestMigrationNumber);
+            executeMigration(startingMigrationNumber, startingMigrationNumber, data.latestMigrationNumber, 'up');
         }
     })
 }
 
-function executeMigration(startingMigrationNumber, migrationNumber, latestMigrationNumber) {
+function executeMigration(startingMigrationNumber, migrationNumber, latestMigrationNumber, direction) {
+    var heskPath = $('p#hesk-path').text();
+
     $.ajax({
-        url: '',
+        url: heskPath + 'install/ajax/process-migration.php',
         method: 'POST',
         data: {
             migrationNumber: migrationNumber,
-            direction: 'up'
+            direction: direction
         },
         success: function(data) {
-            updateProgressBar(migrationNumber, latestMigrationNumber);
-
             if (migrationNumber === latestMigrationNumber) {
-                // done
+                updateProgressBar(migrationNumber, latestMigrationNumber, false, true);
+                console.log('DONE');
             } else {
-                executeMigration(startingMigrationNumber, migrationNumber + 1, latestMigrationNumber);
+                updateProgressBar(migrationNumber, latestMigrationNumber, false, false);
+                var newMigrationNumber = direction === 'up' ? migrationNumber + 1 : migrationNumber - 1;
+                executeMigration(startingMigrationNumber, newMigrationNumber, latestMigrationNumber);
             }
+        },
+        error: function(data) {
+            updateProgressBar(migrationNumber, latestMigrationNumber, true, true);
+            console.error(data);
         }
     })
+}
+
+function updateProgressBar(migrationNumber, latestMigrationNumber, isError, isFinished) {
+    var $progressBar = $('#progress-bar');
+
+    if (isError === true) {
+        $progressBar.find('.progress-bar').removeClass('progress-bar-success')
+            .addClass('progress-bar-danger');
+    } else {
+        var percentage = Math.round(migrationNumber / latestMigrationNumber * 100);
+        $progressBar.find('.progress-bar').css('width', percentage + '%');
+    }
+
+    if (isFinished) {
+        $progressBar.find('.progress-bar').removeClass('active');
+    }
 }
\ No newline at end of file