Projet

Général

Profil

0001-dossiers-render-pause-facturation-comment-expandable.patch

Jérôme Schneider, 30 juillet 2014 13:50

Télécharger (5,04 ko)

Voir les différences:

Subject: [PATCH] dossiers: render pause facturation comment expandable

Closes #5010
 .../dossiers/patientrecord_tab1_general.html       |  7 ++++--
 .../dossiers/patientrecord_tab3_contact.html       |  4 ++--
 calebasse/static/css/dossiers.css                  | 15 +++++++++++-
 calebasse/static/css/style.css                     | 11 ---------
 calebasse/static/js/calebasse.dossiers.js          | 27 ++++++++++++----------
 5 files changed, 36 insertions(+), 28 deletions(-)
calebasse/dossiers/templates/dossiers/patientrecord_tab1_general.html
90 90
      {{ form.confidential.label_tag }} : <span class="autosubmit">{{ form.confidential }}</span>
91 91
      <p id="pause-msg" style="display: none; font-size: 10px;">Pause facturation mise à jour</p>
92 92
      {{ form.pause.label_tag }} : <span class="autosubmit">{{ form.pause }}</span>
93
      <br/><label>Commentaire de la pause facturation</label> <button class="save enable-on-change btn-maj">✔</button><br/>
94
      {{ form.pause_comment }}
93
      <br/><label class="expand-label">Commentaire de la pause facturation {% if object.pause_comment %}<span title="Un commentaire existe" class="icon-comment" style="display: inline"></span>{% endif %} [+]</label>
94
      <span class="expand">
95
        <button class="save enable-on-change btn-maj">✔</button><br/>
96
        {{ form.pause_comment }}
97
      </span>
95 98

  
96 99
    </div>
97 100
  </form>
calebasse/dossiers/templates/dossiers/patientrecord_tab3_contact.html
38 38
  </li>
39 39
  {% endif %}
40 40
  <span class="social-security-contact">
41
    <label class="social-security-label">Infos d'assuré [+]</label>
42
    <ul>
41
    <label class="expand-label">Infos d'assuré [+]</label>
42
    <ul class="expand">
43 43
      {% if contact.id == object.id %}
44 44
      {{ object.first_name }} <span class="lastname">{{ object.last_name }}</span>
45 45
      {% endif %}
calebasse/static/css/dossiers.css
126 126

  
127 127
input[type=checkbox] + button {
128 128
    display: none;
129
}
129
}
130

  
131
.expand-label {
132
    cursor: pointer;
133
}
134

  
135
label.expand-label:hover {
136
    font-weight: bold;
137
}
138

  
139
.expand {
140
    display: none;
141
}
142

  
calebasse/static/css/style.css
1379 1379
    list-style-type: none;
1380 1380
}
1381 1381

  
1382
.social-security-label {
1383
    cursor: pointer;
1384
}
1385

  
1386
label.social-security-label:hover {
1387
    font-weight: bold;
1388
}
1389

  
1390
.social-security-contact ul {
1391
    display: none;
1392
}
1393 1382

  
calebasse/static/js/calebasse.dossiers.js
242 242
              }
243 243
          });
244 244
      });
245
    $('.social-security-label').click(function() {
246
      var label = $(this).html();
247
      var data = $(this).next();
248
      if (($(data).is(':hidden'))) {
249
        $(this).html(label.replace('+', '-'));
250
        $(this).css("font-weight", "bold");
251
      } else {
252
        $(this).html(label.replace('-', '+'));
253
        $(this).css("font-weight", "");
254
      }
255
      $(data).toggle();
256
    });
257 245
    var hashes = location.hash.split('&');
258 246
    for (i in hashes) {
259 247
      if (hashes[i] == "newcontact") {
......
362 350
    var $tabs = $('#tabs').tabs({
363 351
      load: function(event, ui) {
364 352
        var tabid = $(ui.tab).attr('id');
353
        $('.expand-label').click(function() {
354
          var label = $(this).html();
355
          var data = $(this).next();
356
          console.log(data[0]);
357
          if (($(data).is(':hidden'))) {
358
            $(this).html(label.replace("[+]", "[-]"));
359
            console.log("hidden");
360
            $(this).css("font-weight", "bold");
361
          } else {
362
            console.log("not hidden");
363
            $(this).html(label.replace("[-]", "[+]"));
364
            $(this).css("font-weight", "");
365
          }
366
          $(data).toggle();
367
        });
365 368
        if (tabid == "ui-id-1")
366 369
      load_tab1_general();
367 370
        else if (tabid == "ui-id-2")
368
-