Projet

Général

Profil

0001-formdata-add-access-to-a-form_last_update_daetime-va.patch

Frédéric Péters, 06 décembre 2020 15:48

Télécharger (2,66 ko)

Voir les différences: 

Subject: [PATCH] formdata: add access to a form_last_update_daetime variable
 (#47293)


 tests/test_formdata.py | 2 ++
 wcs/formdata.py        | 2 ++
 wcs/variables.py       | 5 +++++
 3 files changed, 9 insertions(+)
tests/test_formdata.py
148 148 
    assert substvars.get('form_receipt_date')
149 149 
    assert substvars.get('form_receipt_time')
150 150 
    assert substvars.get('form_receipt_datetime')
151 
    assert substvars.get('form_last_update_datetime')
151 152 
    assert substvars.get('form_evolution')
152 153 

  		




  153
  154
  
    

  		




  ......




  651
  652
  
    
    lazy_formdata = LazyFormData(formdata)

  		




  652
  653
  
    
    assert lazy_formdata.receipt_date == time.strftime('%Y-%m-%d', formdata.receipt_time)

  		




  653
  654
  
    
    assert lazy_formdata.receipt_time == time.strftime('%H:%M', formdata.receipt_time)

  		




  
  655
  
    
    assert lazy_formdata.last_update_datetime.timetuple()[:6] == formdata.last_update_time[:6]

  		




  654
  656
  
    
    assert lazy_formdata.internal_id == formdata.id

  		




  655
  657
  
    
    assert lazy_formdata.name == 'foobarlazy'

  		




  656
  658
  
    
    assert lazy_formdata.display_name == 'foobarlazy #%s' % formdata.get_display_id()

  		












  

    
      wcs/formdata.py
    
  





  720
  720
  
    
                # both normal formdata (where receipt_time is a time.struct_time)

  		




  721
  721
  
    
                # and sql.AnyFormData where it's already a datetime object.

  		




  722
  722
  
    
                d['form_receipt_datetime'] = make_datetime(self.receipt_time)

  		




  
  723
  
    
            if self.last_update_time:

  		




  
  724
  
    
                d['form_last_update_datetime'] = make_datetime(self.last_update_time)

  		




  723
  725
  
    
            if self.formdef.workflow.criticality_levels:

  		




  724
  726
  
    
                try:

  		




  725
  727
  
    
                    level = self.get_criticality_level_object()

  		












  

    
      wcs/variables.py
    
  





  323
  323
  
    
    def receipt_datetime(self):

  		




  324
  324
  
    
        return make_datetime(self._formdata.receipt_time) if self._formdata.receipt_time else None

  		




  325
  325
  
    

  		




  
  326
  
    
    @property

  		




  
  327
  
    
    def last_update_datetime(self):

  		




  
  328
  
    
        last_update_time = self._formdata.last_update_time

  		




  
  329
  
    
        return make_datetime(last_update_time) if last_update_time else None

  		




  
  330
  
    

  		




  326
  331
  
    
    @property

  		




  327
  332
  
    
    def status(self):

  		




  328
  333
  
    
        return self._formdata.get_status_label()

  		




  329
  
  
    
-