invoicing: remove tag styles and use gadjo styles (#74585)
gitea/lingo/pipeline/head This commit looks good Details

This commit is contained in:
Lauréline Guérin 2023-02-23 08:59:49 +01:00
parent b5cab26269
commit 32e4887944
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
7 changed files with 86 additions and 106 deletions

View File

@ -39,9 +39,9 @@
{% for pool in pools %}
<li>
<a href="{% url 'lingo-manager-invoicing-pool-detail' regie_pk=regie.pk pk=object.pk pool_pk=pool.pk %}">
{% if pool.draft_success_count or pool.success_count %}<span class="tag tag-success">{{ pool.draft_success_count|default:pool.success_count }}</span>{% endif %}
{% if pool.draft_warning_count or pool.warning_count %}<span class="tag tag-warning">{{ pool.draft_warning_count|default:pool.warning_count }}</span>{% endif %}
{% if pool.draft_error_count or pool.error_count %}<span class="tag tag-error">{{ pool.draft_error_count|default:pool.error_count }}</span>{% endif %}
{% if pool.draft_success_count or pool.success_count %}<span class="meta meta-success">{{ pool.draft_success_count|default:pool.success_count }}</span>{% endif %}
{% if pool.draft_warning_count or pool.warning_count %}<span class="meta meta-warning">{{ pool.draft_warning_count|default:pool.warning_count }}</span>{% endif %}
{% if pool.draft_error_count or pool.error_count %}<span class="meta meta-error">{{ pool.draft_error_count|default:pool.error_count }}</span>{% endif %}
{{ pool.created_at|date:'DATETIME_FORMAT' }}
<span class="extra-info">
- {{ pool.get_status_display }}

View File

@ -18,7 +18,7 @@
<td>{{ line.user_name }} ({{ line.user_external_id }})</td>
<td>{{ line.payer_external_id }}</td>
<td class="status">
<span class="tag tag-{{ line.status }}">{% spaceless %}
<span class="meta meta-{{ line.status }}">{% spaceless %}
{% if line.status == 'error' and line.error_status %}
{{ line.get_error_status_display }}
{% else %}

View File

@ -43,7 +43,7 @@
<td>{{ line.user_name }} ({{ line.user_external_id }})</td>
<td>{{ line.payer_external_id }}</td>
<td class="status">
<span class="tag tag-{{ line.status }}">{% spaceless %}
<span class="meta meta-{{ line.status }}">{% spaceless %}
{% if line.status == 'error'%}
{% trans "Error" %}
{% else %}

View File

@ -8,9 +8,9 @@
{% block appbar %}
<h2 id="pool-title">
{% if pool.success_count %}<span class="tag tag-success">{{ pool.success_count }}</span>{% endif %}
{% if pool.warning_count %}<span class="tag tag-warning">{{ pool.warning_count }}</span>{% endif %}
{% if pool.error_count %}<span class="tag tag-error">{{ pool.error_count }}</span>{% endif %}
{% if pool.success_count %}<span class="meta meta-success">{{ pool.success_count }}</span>{% endif %}
{% if pool.warning_count %}<span class="meta meta-warning">{{ pool.warning_count }}</span>{% endif %}
{% if pool.error_count %}<span class="meta meta-error">{{ pool.error_count }}</span>{% endif %}
{{ pool.created_at|date:"DATETIME_FORMAT" }}
</h2>
<span class="actions">

View File

@ -8,9 +8,9 @@
{% block appbar %}
<h2 id="pool-title">
{% if pool.success_count %}<span class="tag tag-success">{{ pool.success_count }}</span>{% endif %}
{% if pool.warning_count %}<span class="tag tag-warning">{{ pool.warning_count }}</span>{% endif %}
{% if pool.error_count %}<span class="tag tag-error">{{ pool.error_count }}</span>{% endif %}
{% if pool.success_count %}<span class="meta meta-success">{{ pool.success_count }}</span>{% endif %}
{% if pool.warning_count %}<span class="meta meta-warning">{{ pool.warning_count }}</span>{% endif %}
{% if pool.error_count %}<span class="meta meta-error">{{ pool.error_count }}</span>{% endif %}
{{ pool.created_at|date:"DATETIME_FORMAT" }}
</h2>
{% if pool.draft and pool.status != 'registered' and pool.status != 'running' %}

View File

@ -104,26 +104,6 @@ div.test-tool-result .infonotice h3 {
}
}
#panel-pools span.tag,
h2#pool-title span.tag,
table.lines span.tag {
box-sizing: border-box;
border: none;
border-radius: 1ex;
padding: 0 1ex;
background: #386ede;
color: white;
&.tag-success {
background: #27eb00;
}
&.tag-warning {
background: #f47f13;
}
&.tag-error {
background: #f64474;
}
}
form.journal-filters li {
display: inline;
margin-right: 10px;

View File

@ -145,26 +145,26 @@ def test_detail_campaign(app, admin_user):
pool=pool1,
)
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert '<span class="tag tag-success">1</span>' in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert '<span class="meta meta-success">1</span>' in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
line.status = 'error'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' in resp
line.status = 'warning'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert 'tag-success' not in resp
assert '<span class="tag tag-warning">1</span>' in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert '<span class="meta meta-warning">1</span>' in resp
assert 'meta-error' not in resp
line.delete()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
line = InvoiceLine.objects.create(
event_date=datetime.date(2022, 9, 1),
@ -175,34 +175,34 @@ def test_detail_campaign(app, admin_user):
pool=pool1,
)
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert '<span class="tag tag-success">1</span>' in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert '<span class="meta meta-success">1</span>' in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
line.status = 'error'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' in resp
line.status = 'warning'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert 'tag-success' not in resp
assert '<span class="tag tag-warning">1</span>' in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert '<span class="meta meta-warning">1</span>' in resp
assert 'meta-error' not in resp
line.status = 'error'
line.error_status = 'ignored'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' not in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' not in resp
line.error_status = 'fixed'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/' % (regie.pk, campaign.pk))
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' not in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' not in resp
app.get('/manage/invoicing/regie/%s/campaign/%s/' % (0, campaign.pk), status=404)
@ -560,26 +560,26 @@ def test_detail_pool(app, admin_user):
pool=pool,
)
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/pool/%s/' % (regie.pk, campaign.pk, pool.pk))
assert '<span class="tag tag-success">1</span>' in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert '<span class="meta meta-success">1</span>' in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
line.status = 'error'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/pool/%s/' % (regie.pk, campaign.pk, pool.pk))
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' in resp
line.status = 'warning'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/pool/%s/' % (regie.pk, campaign.pk, pool.pk))
assert 'tag-success' not in resp
assert '<span class="tag tag-warning">1</span>' in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert '<span class="meta meta-warning">1</span>' in resp
assert 'meta-error' not in resp
line.delete()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/pool/%s/' % (regie.pk, campaign.pk, pool.pk))
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
pool.draft = False
pool.save()
@ -592,21 +592,21 @@ def test_detail_pool(app, admin_user):
pool=pool,
)
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/pool/%s/' % (regie.pk, campaign.pk, pool.pk))
assert '<span class="tag tag-success">1</span>' in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert '<span class="meta meta-success">1</span>' in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
line.status = 'error'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/pool/%s/' % (regie.pk, campaign.pk, pool.pk))
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' in resp
line.status = 'warning'
line.save()
resp = app.get('/manage/invoicing/regie/%s/campaign/%s/pool/%s/' % (regie.pk, campaign.pk, pool.pk))
assert 'tag-success' not in resp
assert '<span class="tag tag-warning">1</span>' in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert '<span class="meta meta-warning">1</span>' in resp
assert 'meta-error' not in resp
@pytest.mark.parametrize('draft', [True, False])
@ -887,32 +887,32 @@ def test_journal_pool(app, admin_user):
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert '<span class="tag tag-success">1</span>' in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert '<span class="meta meta-success">1</span>' in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
line.status = 'error'
line.save()
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' in resp
line.status = 'warning'
line.save()
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert 'tag-success' not in resp
assert '<span class="tag tag-warning">1</span>' in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert '<span class="meta meta-warning">1</span>' in resp
assert 'meta-error' not in resp
line.delete()
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
pool.draft = False
pool.save()
@ -927,42 +927,42 @@ def test_journal_pool(app, admin_user):
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert '<span class="tag tag-success">1</span>' in resp
assert 'tag-warning' not in resp
assert 'tag-error' not in resp
assert '<span class="meta meta-success">1</span>' in resp
assert 'meta-warning' not in resp
assert 'meta-error' not in resp
line.status = 'error'
line.save()
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' in resp
line.status = 'warning'
line.save()
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert 'tag-success' not in resp
assert '<span class="tag tag-warning">1</span>' in resp
assert 'tag-error' not in resp
assert 'meta-success' not in resp
assert '<span class="meta meta-warning">1</span>' in resp
assert 'meta-error' not in resp
line.status = 'error'
line.error_status = 'ignored'
line.save()
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' not in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' not in resp
line.error_status = 'fixed'
line.save()
resp = app.get(
'/manage/invoicing/regie/%s/campaign/%s/pool/%s/journal/' % (regie.pk, campaign.pk, pool.pk)
)
assert 'tag-success' not in resp
assert 'tag-warning' not in resp
assert '<span class="tag tag-error">1</span>' not in resp
assert 'meta-success' not in resp
assert 'meta-warning' not in resp
assert '<span class="meta meta-error">1</span>' not in resp
@pytest.mark.parametrize('draft', [True, False])