Projet

Général

Profil

0001-display-age-next-to-birthdate-in-dossier-main-page-3.patch

Frédéric Péters, 09 juillet 2014 14:08

Télécharger (2,48 ko)

Voir les différences: 

Subject: [PATCH] display age next to birthdate in dossier main page (#3429)


 calebasse/dossiers/models.py                           | 18 ++++++++++++++++++
 .../templates/dossiers/patientrecord_tab1_general.html |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
calebasse/dossiers/models.py
371 371 
                return None
372 372 
        return None
373 373 

  		




  
  374
  
    
    def age(self):

  		




  
  375
  
    
        if not self.birthdate:

  		




  
  376
  
    
            return 'inconnu'

  		




  
  377
  
    
        now = datetime.today().date()

  		




  
  378
  
    
        age = now - self.birthdate

  		




  
  379
  
    
        years = now.year - self.birthdate.year - (

  		




  
  380
  
    
                (now.month, now.day) < (self.birthdate.month, self.birthdate.day))

  		




  
  381
  
    
        if years < 2:

  		




  
  382
  
    
            # for children < 2 years, return the number of months

  		




  
  383
  
    
            months = (now.month - self.birthdate.month) - (now.day < self.birthdate.day)

  		




  
  384
  
    
            if months < 0:

  		




  
  385
  
    
                months += 12

  		




  
  386
  
    
            months += 12*years

  		




  
  387
  
    
            if months:

  		




  
  388
  
    
                return '%s mois' % months

  		




  
  389
  
    
            return '%s jours' % age.days

  		




  
  390
  
    
        return '%s ans' % years

  		




  
  391
  
    

  		




  374
  392
  
    

  		




  375
  393
  
    
class PatientRecordManager(models.Manager):

  		




  376
  394
  
    
    def for_service(self, service):

  		












  

    
      calebasse/dossiers/templates/dossiers/patientrecord_tab1_general.html
    
  





  8
  8
  
    
    <li><label>Nom :</label> <span class="lastname">{{ object.last_name }}</span></li>

  		




  9
  9
  
    
    <li><label>Prénom :</label> {{ object.first_name }}</li>

  		




  10
  10
  
    
    <li><label>Genre :</label> {{ object.get_gender_display|default_if_none:"Non renseigné" }}</li>

  		




  11
  
  
    
    <li><label>Date de naissance :</label> {% if object.birthdate %}{{ object.birthdate|date:"d/m/Y" }}{% else %}Non renseignée{% endif %}</li>

  		




  
  11
  
    
    <li><label>Date de naissance :</label> {% if object.birthdate %}{{ object.birthdate|date:"d/m/Y" }} ({{ object.age }}){% else %}Non renseignée{% endif %}</li>

  		




  12
  12
  
    
    <li>

  		




  13
  13
  
    
      {% if nb_place_of_lifes == 1 %}

  		




  14
  14
  
    
      <label>Lieux de vie :</label>

  		




  15
  
  
    
-