Skip to content

Commit c46c625

Browse files
SebSeptSebSept
committed
flag display in ticket view : color+icon depends on ola status
added 2 states for sla by the way. (late status not implemented)
1 parent bc6d85e commit c46c625

1 file changed

Lines changed: 34 additions & 24 deletions

File tree

‎templates/components/itilobject/service_levels.html.twig‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,13 @@ Handle only linked ola, not ola ttr and tto defined using datetime fields
8484
{% set display_associatedsla_field = field_options.fields_template is not defined or not field_options.fields_template.isHiddenField('slas_id_tto') %}
8585
{% set can_assign_sla_ola = canupdate and has_profile_right('slm', constant('SLM::RIGHT_ASSIGN')) and not field_options.fields_template.isReadonlyField('slas_id_tto') %}
8686

87-
<td class="right pe-2 align-middle border-0">{{ __('TTO') }}</td>
88-
<td class="d-flex ms-n2 border-0 py-0">
89-
87+
<td class="right pe-2 align-middle border-0 p-1">{{ __('TTO') }}</td>
88+
<td class="d-flex border-0 p-1">
9089
{% set _rand = random() %}
9190

9291
{# state flag #}
9392
<div class="align-middle my-2 me-2">
94-
<i class="ti ti-flag"></i>
93+
<i class="ti ti-flag text-secondary mx-1"></i>
9594
</div>
9695

9796
{# datetime field #}
@@ -141,8 +140,8 @@ Handle only linked ola, not ola ttr and tto defined using datetime fields
141140
{% endif %}
142141
{% set _rand = random() %}
143142

144-
<td class="right pe-2 align-middle border-0">{{ _label }}</td>
145-
<td class="d-flex ms-n2 border-0 py-0">
143+
<td class="right pe-2 align-middle border-0 p-1">{{ _label }}</td>
144+
<td class="d-flex border-0 p-1">
146145
{# state flag + datetime field + badge/dropdown field #}
147146
{{ _self.linkedSlaField(
148147
sla,
@@ -164,13 +163,13 @@ Handle only linked ola, not ola ttr and tto defined using datetime fields
164163
{% set display_associatedsla_field = field_options.fields_template is not defined or not field_options.fields_template.isHiddenField('slas_id_ttr') %}
165164
{% set can_assign_sla_ola = canupdate and has_profile_right('slm', constant('SLM::RIGHT_ASSIGN')) and not field_options.fields_template.isReadonlyField('slas_id_ttr') %}
166165

167-
<td class="right pe-2 align-middle border-0">{{ __('TTR') }}</td>
168-
<td class="d-flex ms-n2 border-0 py-0">
166+
<td class="right pe-2 align-middle border-0 p-1">{{ __('TTR') }}</td>
167+
<td class="d-flex border-0 p-1">
169168

170169
{% set _rand = random() %}
171170
{# state flag #}
172171
<div class="align-middle my-2 me-2">
173-
<i class="ti ti-flag"></i>
172+
<i class="ti ti-flag text-secondary mx-1"></i>
174173
</div>
175174

176175
{# datetime field #}
@@ -236,8 +235,8 @@ Handle only linked ola, not ola ttr and tto defined using datetime fields
236235
{% set _label = __('TTR') %}
237236
{% endif %}
238237

239-
<td class="right pe-2 align-middle border-0">{{ _label }}</td>
240-
<td class="d-flex ms-n2 border-0 py-0">
238+
<td class="right pe-2 align-middle border-0 p-1">{{ _label }}</td>
239+
<td class="d-flex border-0 p-1">
241240
{{ _self.linkedOlaField(
242241
ola,
243242
field_options|merge({
@@ -274,22 +273,28 @@ Handle only linked ola, not ola ttr and tto defined using datetime fields
274273

275274
{% set assign_la_id = 'assign_la_' ~ options.rand %}
276275

277-
<div class="{{ options.new_item ? '' : 'collapsed' }} w-100 mt-1" id="dropdown_{{ assign_la_id }}">
276+
<div class="{{ options.new_item ? '' : 'collapsed' }} w-100 mt-1 d-inline-flex" id="dropdown_{{ assign_la_id }}">
278277
{% if la.due_time is defined %}
279278
{# flag + due time #}
280279
<span class="text-muted">
281280
{% if la.end_time %}
282-
<i class="ti ti-flag-filled text-primary"
281+
<i class="ti ti-flag-check text-success mx-1"
283282
title="{{ __('%s completed')|format(__('OLA')) }}"
284283
data-bs-toggle="tooltip"
285-
data-bs-placement="left" ></i> {{ la.due_time|formatted_datetime }}
286-
{% else %}
287-
<i class="ti ti-flag"
284+
data-bs-placement="left" ></i>
285+
{% elseif la.is_late %}
286+
<i class="ti ti-flag-exclamation text-danger mx-1"
287+
title="{{ __('%s is late')|format(__('OLA')) }}"
288+
data-bs-toggle="tooltip"
289+
data-bs-placement="left" ></i>
290+
{% else %} {# ola running #}
291+
<i class="ti ti-flag text-secondary mx-1"
288292
title="{{ __('%s not completed')|format(__('OLA')) }}"
289293
data-bs-toggle="tooltip"
290-
data-bs-placement="left" ></i> {{ la.due_time|formatted_datetime }}
294+
data-bs-placement="left" ></i>
291295
{% endif %}
292296
</span>
297+
<span>{{ la.due_time|formatted_datetime }}</span>
293298
{% endif %}
294299

295300
<span class="level_name badge itil-badge bg-body border-info ms-1 flex-column flex-sm-row">
@@ -363,19 +368,24 @@ Handle only linked ola, not ola ttr and tto defined using datetime fields
363368

364369
{% set assign_la_id = 'assign_la_' ~ options.rand %}
365370

366-
<div class="{{ options.new_item ? '' : 'collapsed' }} w-100 mt-1" id="dropdown_{{ assign_la_id }}">
371+
<div class="{{ options.new_item ? '' : 'collapsed' }} w-100 mt-1 d-inline-flex" id="dropdown_{{ assign_la_id }}">
367372
{% if options.display_datetime_field %}
368373
{% if la.item.fields['takeintoaccount_delay_stat'] > 0 %}
369-
<i class="ti ti-flag-filled text-primary"
370-
title="{{ __('%s completed')|format(__('SLA')) }}"
374+
<i class="ti ti-flag-check text-primary mx-1"
375+
title="{{ __('%s completed')|format(__('OLA')) }}"
371376
data-bs-toggle="tooltip"
372377
data-bs-placement="left" ></i> {{ la.due_time|formatted_datetime }}
378+
{# sla is late - see is_late in SQLProvider to implement it - it desserve a method #}
379+
{# {% elseif la.is_late %}#}
380+
{# <i class="ti ti-flag-exclamation secondary"#}
381+
{# title="{{ __('%s is late')|format(__('OLA')) }}"#}
382+
{# data-bs-toggle="tooltip"#}
383+
{# data-bs-placement="left" ></i> {{ la.due_time|formatted_datetime }}#}
373384
{% else %}
374-
<i class="ti ti-flag"
375-
title="{{ __('%s not completed')|format(__('SLA')) }}"
385+
<i class="ti ti-flag text-secondary mx-1"
386+
title="{{ __('%s not completed')|format(__('OLA')) }}"
376387
data-bs-toggle="tooltip"
377-
data-bs-placement="left"
378-
></i> {{ la.due_time|formatted_datetime }}
388+
data-bs-placement="left" ></i> {{ la.due_time|formatted_datetime }}
379389
{% endif %}
380390
{% endif %}
381391

0 commit comments

Comments
 (0)