Changeset 1828


Ignore:
Timestamp:
29 May 2007, 15:40:38 (18 years ago)
Author:
joachim
Message:

fix for #232

Location:
WAeUP_SRP/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/PatchExtendedWidgetsCPSDateTimeWidget.py

    r1804 r1828  
    33from DateTime.DateTime import DateTime
    44from Products.CPSSchemas.ExtendedWidgets import CPSDateTimeWidget
     5CPSDateTimeWidget.time_hour_default = '00'
    56
    67def validate(self, datastructure, **kw):
    … …  
    3031            datamodel[field_id] = None
    3132            return 1
    32 
     33    # import pdb;pdb.set_trace()
    3334    if self.view_format.startswith('iso8601'):
    3435        if re.match(r'^[0-9]+-[0-9]{2}-[0-9]{2}', date) is not None:
    … …  
    3940    else:
    4041        if re.match(r'^[0-9]?[0-9]/[0-9]?[0-9]/[0-9]{2,4}$', date) is not None:
    41             locale = self.translation_service.getSelectedLanguage()
    42             if locale in ('en', 'hu'):
    43                 m, d, y = date.split('/')
    44             else:
    45                 d, m, y = date.split('/')
     42            d, m, y = date.split('/') # always use d/m/y
     43            # locale = self.translation_service.getSelectedLanguage()
     44            # if False and locale in ('en', 'hu'):
     45            #     m, d, y = date.split('/')
     46            # else:
    4647        else:
    4748            datastructure.setError(widget_id, 'cpsschemas_err_date')
    … …  
    5859        datamodel[field_id] = v
    5960        return 1
     61   
    6062
    6163CPSDateTimeWidget.validate = validate

  • WAeUP_SRP/trunk/profiles/default/layouts/import_student.xml

    r1804 r1828  
    124124 <property name="hidden_layout_modes"/>
    125125 <property name="hidden_readonly_layout_modes"/>
    126  <property name="view_format">iso8601</property>
     126 <property name="view_format">%d/%m/%Y</property>
    127127 <property name="time_setting">False</property>
    128128 <property name="time_hour_default">00</property>

  • WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml

    r1790 r1828  
    2020  <property name="hidden_layout_modes"/>
    2121  <property name="hidden_readonly_layout_modes"/>
     22  <property name="view_format">%d/%m/%Y</property>
     23  <property name="time_setting">False</property>
    2224 </widget>
    2325 <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">

  • WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml

    r1790 r1828  
    2222  </property>
    2323  <property name="hidden_readonly_layout_modes"/>
    24   <property name="view_format">medium</property>
     24  <property name="view_format">%d/%m/%Y</property>
     25  <property name="time_setting">False</property>
    2526 </widget>
    2627 <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
    … …  
    5455 </property>
    5556 <property name="hidden_readonly_layout_modes"/>
    56  <property name="view_format">medium</property>
     57  <property name="view_format">%d/%m/%Y</property>
     58  <property name="time_setting">False</property>
    5759</widget>
    5860 <widget name="entry_mode" meta_type="Select Widget">

  • WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml

    r1821 r1828  
    7171  </property>
    7272  <property name="hidden_readonly_layout_modes"/>
    73   <property name="view_format">iso8601_medium_easy</property>
     73  <property name="view_format">%d/%m/%Y</property>
    7474  <property name="time_setting">False</property>
    7575 </widget>
    … …  
    162162  </property>
    163163  <property name="hidden_readonly_layout_modes"/>
    164   <property name="view_format">iso8601_medium_easy</property>
     164  <property name="view_format">%d/%m/%Y</property>
    165165  <property name="time_setting">False</property>
    166166 </widget>
    … …  
    243243  </property>
    244244  <property name="hidden_readonly_layout_modes"/>
    245   <property name="view_format">iso8601_medium_easy</property>
     245  <property name="view_format">%d/%m/%Y</property>
    246246  <property name="time_setting">False</property>
    247247  </widget>
    … …  
    260260  </property>
    261261  <property name="hidden_readonly_layout_modes"/>
    262   <property name="view_format">iso8601_medium_easy</property>
     262  <property name="view_format">%d/%m/%Y</property>
    263263  <property name="time_setting">False</property>
    264264 </widget>
    … …  
    277277  </property>
    278278  <property name="hidden_readonly_layout_modes"/>
    279   <property name="view_format">iso8601_medium_easy</property>
     279  <property name="view_format">%d/%m/%Y</property>
    280280  <property name="time_setting">False</property>
    281281 </widget>
    … …  
    335335  </property>
    336336  <property name="hidden_readonly_layout_modes"/>
    337   <property name="view_format">iso8601_medium_easy</property>
     337  <property name="view_format">%d/%m/%Y</property>
    338338  <property name="time_setting">False</property>
    339339 </widget>
    … …  
    650650  </property>
    651651  <property name="hidden_readonly_layout_modes"/>
    652   <property name="view_format">iso8601_medium_easy</property>
     652  <property name="view_format">%d/%m/%Y</property>
    653653  <property name="time_setting">False</property>
    654654 </widget>

  • WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml

    r1821 r1828  
    7272  </property>
    7373  <property name="hidden_readonly_layout_modes"/>
    74   <property name="view_format">iso8601_medium_easy</property>
     74  <property name="view_format">%d/%m/%Y</property>
    7575  <property name="time_setting">False</property>
    7676 </widget>
    … …  
    163163  </property>
    164164  <property name="hidden_readonly_layout_modes"/>
    165   <property name="view_format">iso8601_medium_easy</property>
     165  <property name="view_format">%d/%m/%Y</property>
    166166  <property name="time_setting">False</property>
    167167 </widget>
    … …  
    244244  </property>
    245245  <property name="hidden_readonly_layout_modes"/>
    246   <property name="view_format">iso8601_medium_easy</property>
     246  <property name="view_format">%d/%m/%Y</property>
    247247  <property name="time_setting">False</property>
    248248 </widget>
    … …  
    261261  </property>
    262262  <property name="hidden_readonly_layout_modes"/>
    263   <property name="view_format">iso8601_medium_easy</property>
     263  <property name="view_format">%d/%m/%Y</property>
    264264  <property name="time_setting">False</property>
    265265 </widget>
    … …  
    278278  </property>
    279279  <property name="hidden_readonly_layout_modes"/>
    280   <property name="view_format">iso8601_medium_easy</property>
     280  <property name="view_format">%d/%m/%Y</property>
    281281  <property name="time_setting">False</property>
    282282 </widget>
    … …  
    325325  </property>
    326326  <property name="hidden_readonly_layout_modes"/>
    327   <property name="view_format">iso8601_medium_easy</property>
     327  <property name="view_format">%d/%m/%Y</property>
    328328  <property name="time_setting">False</property>
    329329 </widget>
    … …  
    643643  </property>
    644644  <property name="hidden_readonly_layout_modes"/>
    645   <property name="view_format">iso8601_medium_easy</property>
     645  <property name="view_format">%d/%m/%Y</property>
    646646  <property name="time_setting">False</property>
    647647 </widget>

  • WAeUP_SRP/trunk/skins/waeup_custom/widget_datetime_render.pt

    r848 r1828  
    1515<tal:block define="name here/getHtmlWidgetId;
    1616                   date_day_fmt python:fmt.startswith('iso8601')
    17                        and 'iso8601_short' or 'short'"
     17                       and 'iso8601_short' or fmt"
    1818  condition="python: mode == 'edit'">
    1919  <input type="text" size="11" maxlength="22"
Note: See TracChangeset for help on using the changeset viewer.