Project

General

Profile

« Previous | Next » 

Revision 72f229a9

Added by Jérôme Schneider about 12 years ago

agenda: synchronize enventwithact description with act comment

Ref #4006

View differences:

calebasse/agenda/appointments.py
self.workers = None
self.workers_initial = None
self.workers_codes = None
self.act_id = None
self.act_state = None
self.act_absence = None
self.weight = 0
......
self.len_workers = event.participants.count()
self.workers_absent = event.get_missing_participants()
if event.event_type.id == 1:
self.act_id = event.act.id
self.convocation_sent = event.convocation_sent
self.patient = event.patient
self.patient_record_id = event.patient.id
self.patient_record_paper_id = event.patient.paper_id
self.act_type = event.act_type.name
self.description = event.act.comment
self.is_billed = event.act.is_billed
state = event.get_state()
state_name = state.state_name if state else 'NON_VALIDE'
calebasse/agenda/templates/agenda/ajax-worker-tab.html
</div>
{% endif %}
{% if appointment.event_id %}
<div class="tabs-worker-{{ worker_agenda.worker.id }} textedit">
<div class="tabs-worker-{{ worker_agenda.worker.id }} textedit">
<span></span>
{% if service in appointment.services_names or not appointment.services_names %}
<textarea>{{ appointment.description }}</textarea>
<button disabled="disabled" data-event-id="{{ appointment.event_id }}" data-date="{{ date|date:"Y-m-d" }}">✔</button>
<button disabled="disabled" data-event-id="{{ appointment.event_id }}" data-date="{{ date|date:"Y-m-d" }}" data-act-id="{{ appointment.act_id }}">✔</button>
{% else %}
<p>{{ appointment.description }}</p>
{% endif %}
calebasse/static/js/calebasse.agenda.js
var textarea = $(this).prev();
var span = textarea.prev()
var btn = $(this)
var data = {description: textarea.val() };
var data = JSON.stringify(data);
$.ajax({
if ($(this).data('act-id'))
{
var data = {comment: textarea.val() };
var data = JSON.stringify(data);
$.ajax({
url: '/api/v1/act/' + $(this).data("act-id") + '/?format=json&date=' + $(this).data('date'),
type: 'PATCH',
contentType: 'application/json',
data: data,
success: function(data) {
btn.attr('disabled', 'disabled');
span.html('Commentaire modifié avec succès');
}
});
}
else
{
var data = {description: textarea.val() };
var data = JSON.stringify(data);
$.ajax({
url: '/api/v1/event/' + $(this).data("event-id") + '/?format=json&date=' + $(this).data('date'),
type: 'PATCH',
contentType: 'application/json',
data: data,
success: function(data) {
btn.attr('disabled', 'disabled');
span.html('Commentaire modifié avec succès');
btn.attr('disabled', 'disabled');
span.html('Commentaire modifié avec succès');
}
});
});
}
});
/* TODO: put this in a generic function */
$('.input_is_billable').click(function() {

Also available in: Unified diff