Skip to content
This repository has been archived by the owner on Mar 23, 2021. It is now read-only.

Commit

Permalink
Merge 19b4c11 into 3831018
Browse files Browse the repository at this point in the history
  • Loading branch information
@rudigiesler
rudigiesler committed Sep 18, 2017
2 parents 3831018 + 19b4c11 commit d71c65c
Show file tree
Hide file tree
Showing 9 changed files with 215 additions and 131 deletions.
1 change: 1 addition & 0 deletions gates_subscription_mapper/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
'raven.contrib.django.raven_compat',
'rest_framework',
'rest_framework.authtoken',
'widget_tweaks',
# us
'mapper',
]
Expand Down
55 changes: 22 additions & 33 deletions mapper/templates/mapper/logevent_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,29 @@

{% load humanize %}

{% block title %}Gates Subscription Mapper{% endblock %}

{% block content %}
<a href="{% url 'migration-list' %}">Back</a>
{% if logevent_list %}
<div class="model-list">
<table>
<tr>
<th>When</th>
<th>Level</th>
<th>Message</th>
</tr>
{% for log in logevent_list %}
<tr>
<td>{{ log.created_at | naturaltime }}</td>
<td>{{ log.get_log_level_display }}</td>
<td>{{ log.message | linebreaks }}</td>
</tr>
{% endfor %}
</table>
</div>
{% if is_paginated %}
<div class="pagination">
<span class="page-next">
{% if page_obj.has_next %}
<a href="?page={{ page_obj.next_page_number }}">newer</a>
{% endif %}
</span>
<span class="page-previous">
{% if page_obj.has_previous %}
<a href="?page={{ page_obj.previous_page_number }}">older</a>
{% endif %}
</span>
</div>
<table class="mdl-data-table mdl-js-data-table">
<tr>
<th class="mdl-data-table__cell--non-numeric">When</th>
<th class="mdl-data-table__cell--non-numeric">Level</th>
<th class="mdl-data-table__cell--non-numeric">Message</th>
</tr>
{% for log in logevent_list %}
<tr>
<td class="mdl-data-table__cell--non-numeric">{{ log.created_at | naturaltime }}</td>
<td class="mdl-data-table__cell--non-numeric">{{ log.get_log_level_display }}</td>
<td class="mdl-data-table__cell--non-numeric">{{ log.message | linebreaks }}</td>
</tr>
{% endfor %}
</table>
{% if is_paginated %}
<div class="pagination">
{% if page_obj.has_previous %}
<a class="mdl-button mdl-js-button mdl-js-ripple-effect" href="?page={{ page_obj.previous_page_number }}">older<i class="material-icons">keyboard_arrow_left</i></a>
{% endif %}
{% if page_obj.has_next %}
<a class="mdl-button mdl-js-button mdl-js-ripple-effect" href="?page={{ page_obj.next_page_number }}"><i class="material-icons">keyboard_arrow_right</i>newer</a>
{% endif %}
</div>
{% endif %}
{% endblock %}
92 changes: 56 additions & 36 deletions mapper/templates/mapper/migratesubscription_list.html
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,86 @@
{% extends 'base.html' %}
{% load widget_tweaks %}

{% load humanize %}
{% load mapper_tags %}

{% block title %}Gates Subscription Mapper{% endblock %}

{% block content %}
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<button type="submit">Create task</button>
</form>
{% if migratesubscription_list %}
<div class="model-list">
<table>
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--4-col">
<div class="mdl-card mdl-shadow--6dp">
<div class="mdl-card__title">
<h1 class="mdl-card__title-text">Create Migration</h1>
</div>
<form method="post">
{% csrf_token %}
<div class="mdl-card__supporting-text">

{% for error in form.non_field_errors %}
<p class="mdl-color-text--accent">{{ error|escape }}</p>
{% endfor %}

{% for field in form %}
<div class="mdl-textfield mdl-js-textfield">
{{ field|add_class:"mdl-textfield__input" }}
<label class="mdl-textfield__label" for="{{ field.id_for_label }}">{{ field.label }}</label>
{% for error in field.errors %}
<span class="mdl-textfield__error">{{ error|escape }}</span>
{% endfor %}
</div>
{% endfor %}
</div>
<div class="mdl-card__actions">
<button class="mdl-button mdl-js-button mdl-button--colored mdl-js-ripple-effect" type="submit">Submit</button>
</div>
</form>
</div>
</div>
{% if migratesubscription_list %}
<div class="mdl-cell mdl-cell--8-col">
<table class="mdl-data-table mdl-js-data-table">
<tr>
<th>Started</th>
<th>Ended</th>
<th>Source</th>
<th>Transform</th>
<th>Status</th>
<th class="mdl-data-table__cell--non-numeric">Started</th>
<th class="mdl-data-table__cell--non-numeric">Ended</th>
<th class="mdl-data-table__cell--non-numeric">Source</th>
<th class="mdl-data-table__cell--non-numeric">Transform</th>
<th class="mdl-data-table__cell--non-numeric">Status</th>
<th></th>
</tr>
{% for migration in migratesubscription_list %}
<tr>
<td>{{ migration.created_at | naturaltime }}</td>
<td>{% if migration.completed_at %}{{ migration.completed_at | naturaltime }}{% else %}-{% endif %}</td>
<td>{{ migration.column_name }} of {{ migration.table_name }}</td>
<td>{{ messagesets|lookup:migration.from_messageset }}</td>
<td>{{ migration.get_status_display }} {{ migration.current }}/{% if migration.total %}{{ migration.total }}{% else %}-{% endif %}</td>
<td class="mdl-data-table__cell--non-numeric">{{ migration.created_at | naturaltime }}</td>
<td class="mdl-data-table__cell--non-numeric">{% if migration.completed_at %}{{ migration.completed_at | naturaltime }}{% else %}-{% endif %}</td>
<td class="mdl-data-table__cell--non-numeric">{{ migration.column_name }} of {{ migration.table_name }}</td>
<td class="mdl-data-table__cell--non-numeric">{{ messagesets|lookup:migration.from_messageset }}</td>
<td class="mdl-data-table__cell--non-numeric">{{ migration.get_status_display }} {{ migration.current }}/{% if migration.total %}{{ migration.total }}{% else %}-{% endif %}</td>
<td>
{% if migration.can_be_resumed %}
<form action="{% url 'migration-retry' migration_id=migration.pk %}" method="post">
{% csrf_token %}
<button type="submit">Retry</button>
<button class="mdl-button mdl-js-button mdl-button--colored mdl-button--raised mdl-js-ripple-effect" type="submit">Retry</button>
</form>
{% endif %}
{% if migration.can_be_cancelled %}
<form action="{% url 'migration-cancel' migration_id=migration.pk %}" method="post">
{% csrf_token %}
<button type="submit">Cancel</button>
<button class="mdl-button mdl-js-button mdl-button--colored mdl-button--raised mdl-js-ripple-effect" type="submit">Cancel</button>
</form>
{% endif %}
<a href="{% url 'log-list' migration_id=migration.pk %}">Logs</a>
<a class="mdl-button mdl-js-button mdl-button--colored mdl-js-ripple-effect" href="{% url 'log-list' migration_id=migration.pk %}">Logs</a>
</td>
</tr>
{% endfor %}
</table>
</div>
{% if is_paginated %}
{% if is_paginated %}
<div class="pagination">
<span class="page-next">
{% if page_obj.has_next %}
<a href="?page={{ page_obj.next_page_number }}">older</a>
{% endif %}
</span>
<span class="page-previous">
{% if page_obj.has_previous %}
<a href="?page={{ page_obj.previous_page_number }}">newer</a>
{% endif %}
</span>
{% if page_obj.has_next %}
<a class="mdl-button mdl-js-button mdl-js-ripple-effect" href="?page={{ page_obj.next_page_number }}"><i class="material-icons">keyboard_arrow_left</i>older</a>
{% endif %}
{% if page_obj.has_previous %}
<a class="mdl-button mdl-js-button mdl-js-ripple-effect" href="?page={{ page_obj.previous_page_number }}">newer<i class="material-icons">keyboard_arrow_right</i></a>
{% endif %}
</div>
{% endif %}
{% endif %}
</div>
{% endif %}
{% endblock %}
Loading

0 comments on commit d71c65c

Please sign in to comment.