Revision d09349e5
Added by Mikaël Ates over 12 years ago
| calebasse/dossiers/templates/dossiers/patientrecord_update.html | ||
|---|---|---|
| 452 | 452 |
Salle : {{ act.parent_event.room }}
|
| 453 | 453 |
</li> |
| 454 | 454 |
{% endif %}
|
| 455 |
<li> |
|
| 456 |
{% if act.parent_event %}
|
|
| 457 |
{% if act.parent_event.convocation_sent %}
|
|
| 458 |
Convocation envoyé |
|
| 459 |
{% else %}
|
|
| 460 |
Convocation non envoyé |
|
| 461 |
{% endif %}
|
|
| 462 |
{% endif %}
|
|
| 463 |
</li> |
|
| 464 |
<li>{% if state %}<strong>{{ state }}</strong>, le {{ state.created }} par {{ state.author }}
|
|
| 455 |
<li>{% if state %}<strong>{{ state }}</strong>, le {{ state.created }}.
|
|
| 465 | 456 |
{% else %}
|
| 466 | 457 |
Non pointé. |
| 467 | 458 |
{% endif %}
|
| ... | ... | |
| 488 | 479 |
Salle : {{ act.parent_event.room }}
|
| 489 | 480 |
</li> |
| 490 | 481 |
{% endif %}
|
| 491 |
<li> |
|
| 492 |
{% if act.convocation_sent %}
|
|
| 493 |
Convocation envoyé |
|
| 494 |
{% else %}
|
|
| 495 |
Convocation non envoyé |
|
| 496 |
{% endif %}
|
|
| 497 |
</li> |
|
| 498 |
<li>{% if state %}<strong>{{ state }}</strong>, le {{ state.created }} par {{ state.author }}
|
|
| 482 |
<li>{% if state %}<strong>{{ state }}</strong>, le {{ state.created }}.
|
|
| 499 | 483 |
{% else %}
|
| 500 | 484 |
Non pointé. |
| 501 | 485 |
{% endif %}
|
| calebasse/dossiers/views.py | ||
|---|---|---|
| 253 | 253 |
ctx['next_rdvs'] = [] |
| 254 | 254 |
for act in Act.objects.next_acts(ctx['object']).select_related(): |
| 255 | 255 |
state = act.get_state() |
| 256 |
if not state.previous_state: |
|
| 256 |
if not state.previous_state and state.state_name == 'NON_VALIDE':
|
|
| 257 | 257 |
state = None |
| 258 | 258 |
ctx['next_rdvs'].append((act, state)) |
| 259 | 259 |
ctx['last_rdvs'] = [] |
| 260 | 260 |
for act in Act.objects.last_acts(ctx['object']): |
| 261 | 261 |
state = act.get_state() |
| 262 |
if not state.previous_state: |
|
| 262 |
if not state.previous_state and state.state_name == 'NON_VALIDE':
|
|
| 263 | 263 |
state = None |
| 264 | 264 |
ctx['last_rdvs'].append((act, state)) |
| 265 | 265 |
ctx['status'] = [] |
Also available in: Unified diff
dossiers: do not ignore first actvalidatestate when state_name is not NON_VALIDE.