Project

General

Profile

« Previous | Next » 

Revision aab82b98

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

agenda: continue generic event management

  • templates/agenda/event.html: improve form presentation * templates/agenda/index.html: support new event management * ../static/js/calebasse.agenda.js: fix add new appoinment

View differences:

calebasse/agenda/templates/agenda/event.html
5 5
      {{ form.title }}
6 6
      </p>
7 7

  
8
      <td>
8 9
        <p>
9 10
        {{ form.date.label_tag }}
10 11
        {{ form.date|add_class:"datepicker-date" }}
calebasse/agenda/templates/agenda/index.html
19 19
{% block appbar %}
20 20
    <h2>Agenda</h2>
21 21
    <a href="../..">Retourner à l'accueil</a>
22
    <button>Nouvel événement (autre)</button>
23
    <button id="newrdv">Nouveau rendez-vous patient</button>
22
    <button id="newevent" data-url="{% url 'new-event' service=service date=date %}">Nouvel événement (autre)</button>
23
    <button id="newrdv" data-url="{% url 'nouveau-rdv' service=service date=date %}">Nouveau rendez-vous patient</button>
24 24
{% endblock %}
25 25

  
26 26
{% block beforecontent %}
calebasse/static/js/calebasse.agenda.js
120 120
    $('#newrdv').click(function() {
121 121
        var participants = $('.person-item.active').map(function (i, v) { return $(v).data('worker-id'); });
122 122
        var qs = $.param({participants: $.makeArray(participants) }, true);
123
        var new_appointment_url = "{% url 'nouveau-rdv' service=service date=date %}?" + qs;
123
        var new_appointment_url = $(this).data('url') + "?" + qs;
124
        $('#rdv').load(new_appointment_url,
125
            function () {
126
                function onsuccess(response, status, xhr, form) {
127
                    var parse = $(response);
128
                    if ($('.errorlist', parse).length != 0) {
129
                        $('#rdv').html(response);
130
                        $('#rdv form').ajaxForm({
131
                            success: onsuccess,
132
                        });
133
                        $('#rdv .datepicker-date').datepicker({dateFormat: 'yy-m-d', showOn: 'button'});
134
                        console.log('error');
135
                    } else {
136
                        console.log('success');
137
                        window.location.reload(true);
138
                    }
139
                }
140
                $('#rdv .datepicker-date').datepicker({dateFormat: 'yy-m-d', showOn: 'button'});
141
                $('form', this).ajaxForm({
142
                    success: onsuccess
143
                });
144
                $(this).dialog({title: 'Nouveau rendez-vous',
145
                    width: '800px',
146
                    buttons: [ { text: "Fermer",
147
                        click: function() { $(this).dialog("close"); } },
148
                    { text: "Ajouter",
149
                        click: function() { $("#rdv form").submit(); } }]});
150
            });
151
    });
152
    $('#newevent').click(function() {
153
        var participants = $('.person-item.active').map(function (i, v) { return $(v).data('worker-id'); });
154
        var qs = $.param({participants: $.makeArray(participants) }, true);
155
        var new_appointment_url = $(this).data('url') + "?" + qs;
124 156
        $('#rdv').load(new_appointment_url,
125 157
            function () {
126 158
                function onsuccess(response, status, xhr, form) {

Also available in: Unified diff