Skip to content
Snippets Groups Projects
Commit 77395467 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#663 - added basic status page

parent 4fa5c46b
No related branches found
No related tags found
No related merge requests found
......@@ -30,11 +30,14 @@ public class MigrationController extends BaseController
{
public static final String ERROR = "error";
public static final String MIGRATION_SETTINGS = "migrationSettings";
public static final String STATUS_TEXT_KEY = "statusTextKey";
}
private static class ReturnValues
{
public static final String MIGRATION_SETTINGS = "migration/migration";
public static final String STATUS = "migration/status";
public static final String STATUS_FRAGMENT = "migration/statusFragment";
}
private final MigrationService migrationService;
......@@ -106,4 +109,17 @@ public class MigrationController extends BaseController
// TODO: redirect to success page
return ReturnValues.MIGRATION_SETTINGS;
}
@GetMapping("/status")
public String status()
{
return ReturnValues.STATUS;
}
@GetMapping("/getStatus")
public String getMigrationStatus(Model model)
{
model.addAttribute(ModelAttributes.STATUS_TEXT_KEY, "migration.status.running");
return ReturnValues.STATUS_FRAGMENT;
}
}
\ No newline at end of file
......@@ -649,3 +649,6 @@ migration.settings.password=Passwort
migration.settings.verification.password.description=Bitte gib dein aktuelles BudgetMaster Passwort ein, um den Migrationsprozess zu bestätigen.<br><span class="red-text bold">Die Migration kann nicht abgebrochen werden.</span><br>Deine bestehende BudgetMaster Datenbank wird weder geändert noch gelöscht.
migration.settings.verification.password=Aktuelles BudgetMaster Passwort
migration.settings.verification.password.wrong=Ungültiges Bestätigungspasswort
migration.status.running=Migration läuft...
migration.status.finished=Migration fertiggestellt!
migration.status.error=Migration fehlgeschlagen!
......@@ -648,3 +648,7 @@ migration.settings.password=Password
migration.settings.verification.password.description=Please enter your current BudgetMaster password to confirm the migration process.<br><span class="red-text bold">The migration can not be canceled.</span><br>Your existing BudgetMaster database will neither be modified nor deleted.
migration.settings.verification.password=Current BudgetMaster password
migration.settings.verification.password.wrong=Invalid verification password
migration.status.running=Migration is running...
migration.status.finished=Migration finished!
migration.status.error=Migration failed!
$(document).ready(function()
{
getMigrationStatus();
});
function getMigrationStatus()
{
console.log("ja")
$.ajax({
type: 'GET',
url: $('#migration-status').attr('data-url'),
data: {},
success: function(data)
{
$('#migration-status').html(data);
},
complete: function()
{
// schedule the next request when the current one is complete
setTimeout(getMigrationStatus, 3000);
}
});
}
\ No newline at end of file
<html>
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster - ${locale.getString('title.migration')}"/>
<#import "/spring.ftl" as s>
</head>
<@header.body>
<#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "migration" settings/>
<#import "../helpers/validation.ftl" as validation>
<main>
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
<div class="headline">${locale.getString("title.migration")}</div>
</div>
</div>
<div class="container center-align">
<div class="row">
<div class="col s12 m12 l8 offset-l2">
<div class="preloader-wrapper small active">
<div class="spinner-layer spinner-blue-only">
<div class="circle-clipper left">
<div class="circle"></div>
</div>
<div class="gap-patch">
<div class="circle"></div>
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
</div>
</div>
</div>
<div id="migration-status" data-url="<@s.url '/migration/getStatus'/>"></div>
</div>
</div>
</main>
<!-- Scripts-->
<#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/migration.js'/>"></script>
</@header.body>
</html>
\ No newline at end of file
<#global locale = static["de.thecodelabs.utils.util.Localization"]>
<#import "/spring.ftl" as s>
<#import "../helpers/header.ftl" as header>
<div class="row">
<div class="col s12 m12 l8 offset-l2">
<div class="headline-small">${locale.getString(statusTextKey)}</div>
</div>
</div>
<div class="row">
<div class="col s12 m12 l8 offset-l2">
Status:
</div>
</div>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment