Changeset 3870


Ignore:
Timestamp:
23 Jan 2009, 07:39:33 (16 years ago)
Author:
Henrik Bettermann
Message:

reenable selection of beds for returning students

Location:
WAeUP_SRP/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Accommodation.py

    r3786 r3870  
    3838        generate the free Bedslist.
    3939        """
     40        logger = logging.getLogger('Accommodation.AccoFolder.generateFreeBedsList')
     41        member = self.portal_membership.getAuthenticatedMember()
     42        logger.info('%s generated bed list' % member)
    4043        bed_list = self.portal_accommodation
    4144        l = self.portal_catalog({'meta_type': "AccoHall"})
    … …  
    5760            reserved = [(r.split('/')[0],int(r.split('/')[1])) for r in re.split(',|\.| ',hall_doc.reserved_rooms)
    5861                                     if r]
     62            #import pdb;pdb.set_trace()                         
    5963            #for block in range(1,int(hall_doc.nr_of_blocks)+1):
    6064            # for block in 'ABCDEFGHIJ'[:int(hall_doc.nr_of_blocks)]:
    … …  
    6367            beds_for_fresh = getattr(hall_doc,'beds_for_fresh',[])
    6468            beds_for_pre = getattr(hall_doc,'beds_for_pre',[])
     69            beds_for_returning = getattr(hall_doc,'beds_for_returning',[])
    6570            beds_for_final = getattr(hall_doc,'beds_for_final',[])
    6671            if set(blocks_for_female).intersection(set(blocks_for_male)):
    … …  
    8590                            elif bed in beds_for_final:
    8691                                bt = 'fi'
     92                            elif bed in beds_for_returning:
     93                                bt = 're'                               
    8794                            if hall_doc.special_handling.startswith("no_"):
    8895                                bt += "_" + hall_doc.special_handling[3:]
    … …  
    109116            beds_generated.append(hall_gen)
    110117        current = DateTime.DateTime().strftime("%d-%m-%y_%H_%M_%S")
    111         open("%s/import/bedlist_%s.csv" % (i_home,current),"w+").write('\n'.join(generated))
    112         open("%s/import/bedlist_modyfied_%s.csv" % (i_home,current),"w+").write('\n'.join(modyfied))
     118        open("%s/export/bedlist_%s.csv" % (i_home,current),"w+").write('\n'.join(generated))
     119        open("%s/export/bedlist_modyfied_%s.csv" % (i_home,current),"w+").write('\n'.join(modyfied))
    113120        return self.accommodation.acco_folder_view(beds_generated=beds_generated)
    114121    ###)

  • WAeUP_SRP/trunk/profiles/aaua/layouts/acco_hall.xml

    r3689 r3870  
    4141  </property>
    4242  <property name="is_required">False</property>
    43   <property name="label">Beds for NCE-3 Students</property>
    44   <property name="label_edit">Beds for NCE-3 Students</property>
     43  <property name="label">Beds for Final Students</property>
     44  <property name="label_edit">Beds for Final Students</property>
    4545  <property name="help">Name the bedspaces for final year students.
    4646                        Attention: The bed letters must not exceed the number of beds per room.</property>
    … …  
    5050  <property name="vocabulary">waeup_bed_letters</property>
    5151 </widget>
     52 
     53 <widget name="beds_for_returning" meta_type="MultiSelect Widget">
     54  <property name="fields">
     55   <element value="beds_for_returning"/>
     56  </property>
     57  <property name="is_required">False</property>
     58  <property name="label">Beds for Returning Students</property>
     59  <property name="label_edit">Beds for Returning Students</property>
     60  <property name="help">Name the bedspaces for final returning students.
     61                        Attention: The bed letters must not exceed the number of beds per room.</property>
     62  <property name="readonly_layout_modes"/>
     63  <property name="hidden_layout_modes"/>
     64  <property name="hidden_readonly_layout_modes"/>
     65  <property name="vocabulary">waeup_bed_letters</property>
     66 </widget>   
     67 
    5268 <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
    5369  <property name="fields">
    … …  
    5571  </property>
    5672  <property name="is_required">False</property>
    57   <property name="label">Beds for NCE-1 Students</property>
    58   <property name="label_edit">Beds for NCE-1 Students</property>
     73  <property name="label">Beds for Fresh Students</property>
     74  <property name="label_edit">Beds for Fresh Students</property>
    5975  <property name="help">Name the beds for first year students.
    6076                        Attention: The bed letters must not exceed the number of beds per room.</property>
    … …  
    203219  <row>
    204220   <cell name="sort_id"/>
    205   </row>
     221  </row> 
    206222  <row>
    207223   <cell name="maintenance_code"/>
    208224  </row>
    209225  <row>
     226   <cell name="special_handling"/>
     227  </row>
     228  <row>
    210229   <cell name="text"/>
    211230  </row>
    … …  
    229248  </row>
    230249  <row>
    231    <cell name="beds_for_pre"/>
    232   </row> 
    233   <row>
    234250   <cell name="beds_for_fresh"/>
    235251  </row>
     252  <row>
     253   <cell name="beds_for_returning"/>
     254  </row>     
    236255  <row>
    237256   <cell name="beds_for_final"/>

  • WAeUP_SRP/trunk/profiles/aaue/layouts/acco_hall.xml

    r3763 r3870  
    4141  </property>
    4242  <property name="is_required">False</property>
    43   <property name="label">Beds for NCE-3 Students</property>
    44   <property name="label_edit">Beds for NCE-3 Students</property>
     43  <property name="label">Beds for Final Students</property>
     44  <property name="label_edit">Beds for Final Students</property>
    4545  <property name="help">Name the bedspaces for final year students.
    4646                        Attention: The bed letters must not exceed the number of beds per room.</property>
    … …  
    5050  <property name="vocabulary">waeup_bed_letters</property>
    5151 </widget>
     52 
     53 <widget name="beds_for_returning" meta_type="MultiSelect Widget">
     54  <property name="fields">
     55   <element value="beds_for_returning"/>
     56  </property>
     57  <property name="is_required">False</property>
     58  <property name="label">Beds for Returning Students</property>
     59  <property name="label_edit">Beds for Returning Students</property>
     60  <property name="help">Name the bedspaces for final returning students.
     61                        Attention: The bed letters must not exceed the number of beds per room.</property>
     62  <property name="readonly_layout_modes"/>
     63  <property name="hidden_layout_modes"/>
     64  <property name="hidden_readonly_layout_modes"/>
     65  <property name="vocabulary">waeup_bed_letters</property>
     66 </widget>   
     67 
    5268 <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
    5369  <property name="fields">
    … …  
    5571  </property>
    5672  <property name="is_required">False</property>
    57   <property name="label">Beds for NCE-1 Students</property>
    58   <property name="label_edit">Beds for NCE-1 Students</property>
     73  <property name="label">Beds for Fresh Students</property>
     74  <property name="label_edit">Beds for Fresh Students</property>
    5975  <property name="help">Name the beds for first year students.
    6076                        Attention: The bed letters must not exceed the number of beds per room.</property>
    … …  
    203219  <row>
    204220   <cell name="sort_id"/>
    205   </row>
     221  </row> 
    206222  <row>
    207223   <cell name="maintenance_code"/>
    208224  </row>
    209225  <row>
     226   <cell name="special_handling"/>
     227  </row>
     228  <row>
    210229   <cell name="text"/>
    211230  </row>
    … …  
    229248  </row>
    230249  <row>
    231    <cell name="beds_for_pre"/>
    232   </row> 
    233   <row>
    234250   <cell name="beds_for_fresh"/>
    235251  </row>
     252  <row>
     253   <cell name="beds_for_returning"/>
     254  </row>     
    236255  <row>
    237256   <cell name="beds_for_final"/>

  • WAeUP_SRP/trunk/profiles/fceokene/layouts/acco_hall.xml

    r3868 r3870  
    5050  <property name="vocabulary">waeup_bed_letters</property>
    5151 </widget>
     52 
     53 <widget name="beds_for_returning" meta_type="MultiSelect Widget">
     54  <property name="fields">
     55   <element value="beds_for_returning"/>
     56  </property>
     57  <property name="is_required">False</property>
     58  <property name="label">Beds for NCE-2 Students</property>
     59  <property name="label_edit">Beds for NCE-2 Students</property>
     60  <property name="help">Name the bedspaces for final returning (NCE-2 students)) students.
     61                        Attention: The bed letters must not exceed the number of beds per room.</property>
     62  <property name="readonly_layout_modes"/>
     63  <property name="hidden_layout_modes"/>
     64  <property name="hidden_readonly_layout_modes"/>
     65  <property name="vocabulary">waeup_bed_letters</property>
     66 </widget>
     67 
    5268 <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
    5369  <property name="fields">
    … …  
    238254  </row>
    239255  <row>
     256   <cell name="beds_for_returning"/>
     257  </row> 
     258  <row>
    240259   <cell name="beds_for_final"/>
    241260  </row>

  • WAeUP_SRP/trunk/profiles/fceoyo/layouts/acco_hall.xml

    r3714 r3870  
    5050  <property name="vocabulary">waeup_bed_letters</property>
    5151 </widget>
     52 
     53 <widget name="beds_for_returning" meta_type="MultiSelect Widget">
     54  <property name="fields">
     55   <element value="beds_for_returning"/>
     56  </property>
     57  <property name="is_required">False</property>
     58  <property name="label">Beds for NCE-2 Students</property>
     59  <property name="label_edit">Beds for NCE-2 Students</property>
     60  <property name="help">Name the bedspaces for final returning (NCE-2 students)) students.
     61                        Attention: The bed letters must not exceed the number of beds per room.</property>
     62  <property name="readonly_layout_modes"/>
     63  <property name="hidden_layout_modes"/>
     64  <property name="hidden_readonly_layout_modes"/>
     65  <property name="vocabulary">waeup_bed_letters</property>
     66 </widget>
     67 
    5268 <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
    5369  <property name="fields">
    … …  
    208224  </row>
    209225  <row>
     226   <cell name="special_handling"/>
     227  </row> 
     228  <row>
    210229   <cell name="text"/>
    211230  </row>
    … …  
    235254  </row>
    236255  <row>
     256   <cell name="beds_for_returning"/>
     257  </row> 
     258  <row>
    237259   <cell name="beds_for_final"/>
    238260  </row>

  • WAeUP_SRP/trunk/profiles/nau/layouts/acco_hall.xml

    r3815 r3870  
    5050  <property name="vocabulary">waeup_bed_letters</property>
    5151 </widget>
     52 
     53 <widget name="beds_for_returning" meta_type="MultiSelect Widget">
     54  <property name="fields">
     55   <element value="beds_for_returning"/>
     56  </property>
     57  <property name="is_required">False</property>
     58  <property name="label">Beds for Returning Students</property>
     59  <property name="label_edit">Beds for Returning Students</property>
     60  <property name="help">Name the bedspaces for final returning students.
     61                        Attention: The bed letters must not exceed the number of beds per room.</property>
     62  <property name="readonly_layout_modes"/>
     63  <property name="hidden_layout_modes"/>
     64  <property name="hidden_readonly_layout_modes"/>
     65  <property name="vocabulary">waeup_bed_letters</property>
     66 </widget> 
     67 
    5268 <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
    5369  <property name="fields">
    … …  
    235251  </row>
    236252  <row>
     253   <cell name="beds_for_returning"/>
     254  </row>   
     255  <row>
    237256   <cell name="beds_for_final"/>
    238257  </row>

  • WAeUP_SRP/trunk/profiles/ois/layouts/acco_hall.xml

    r3689 r3870  
    5050  <property name="vocabulary">waeup_bed_letters</property>
    5151 </widget>
     52 
     53 <widget name="beds_for_returning" meta_type="MultiSelect Widget">
     54  <property name="fields">
     55   <element value="beds_for_returning"/>
     56  </property>
     57  <property name="is_required">False</property>
     58  <property name="label">Beds for NCE-2 Students</property>
     59  <property name="label_edit">Beds for NCE-2 Students</property>
     60  <property name="help">Name the bedspaces for final returning (NCE-2 students)) students.
     61                        Attention: The bed letters must not exceed the number of beds per room.</property>
     62  <property name="readonly_layout_modes"/>
     63  <property name="hidden_layout_modes"/>
     64  <property name="hidden_readonly_layout_modes"/>
     65  <property name="vocabulary">waeup_bed_letters</property>
     66 </widget>
     67 
    5268 <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
    5369  <property name="fields">
    … …  
    208224  </row>
    209225  <row>
     226   <cell name="special_handling"/>
     227  </row> 
     228  <row>
    210229   <cell name="text"/>
    211230  </row>
    … …  
    235254  </row>
    236255  <row>
     256   <cell name="beds_for_returning"/>
     257  </row> 
     258  <row>
    237259   <cell name="beds_for_final"/>
    238260  </row>

  • WAeUP_SRP/trunk/profiles/uniben/layouts/acco_hall.xml

    r3692 r3870  
    5050  <property name="vocabulary">waeup_bed_letters</property>
    5151 </widget>
     52 
     53 <widget name="beds_for_returning" meta_type="MultiSelect Widget">
     54  <property name="fields">
     55   <element value="beds_for_returning"/>
     56  </property>
     57  <property name="is_required">False</property>
     58  <property name="label">Beds for Returning Students</property>
     59  <property name="label_edit">Beds for Returning Students</property>
     60  <property name="help">Name the bedspaces for final returning students.
     61                        Attention: The bed letters must not exceed the number of beds per room.</property>
     62  <property name="readonly_layout_modes"/>
     63  <property name="hidden_layout_modes"/>
     64  <property name="hidden_readonly_layout_modes"/>
     65  <property name="vocabulary">waeup_bed_letters</property>
     66 </widget>   
     67 
    5268 <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
    5369  <property name="fields">
    … …  
    235251  </row>
    236252  <row>
     253   <cell name="beds_for_returning"/>
     254  </row>     
     255  <row>
    237256   <cell name="beds_for_final"/>
    238257  </row>

  • WAeUP_SRP/trunk/profiles/unilorin/layouts/acco_hall.xml

    r3689 r3870  
    4141  </property>
    4242  <property name="is_required">False</property>
    43   <property name="label">Beds for NCE-3 Students</property>
    44   <property name="label_edit">Beds for NCE-3 Students</property>
     43  <property name="label">Beds for Final Students</property>
     44  <property name="label_edit">Beds for Final Students</property>
    4545  <property name="help">Name the bedspaces for final year students.
    4646                        Attention: The bed letters must not exceed the number of beds per room.</property>
    … …  
    5050  <property name="vocabulary">waeup_bed_letters</property>
    5151 </widget>
     52 
     53 <widget name="beds_for_returning" meta_type="MultiSelect Widget">
     54  <property name="fields">
     55   <element value="beds_for_returning"/>
     56  </property>
     57  <property name="is_required">False</property>
     58  <property name="label">Beds for Returning Students</property>
     59  <property name="label_edit">Beds for Returning Students</property>
     60  <property name="help">Name the bedspaces for final returning students.
     61                        Attention: The bed letters must not exceed the number of beds per room.</property>
     62  <property name="readonly_layout_modes"/>
     63  <property name="hidden_layout_modes"/>
     64  <property name="hidden_readonly_layout_modes"/>
     65  <property name="vocabulary">waeup_bed_letters</property>
     66 </widget>   
     67 
    5268 <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
    5369  <property name="fields">
    … …  
    5571  </property>
    5672  <property name="is_required">False</property>
    57   <property name="label">Beds for NCE-1 Students</property>
    58   <property name="label_edit">Beds for NCE-1 Students</property>
     73  <property name="label">Beds for Fresh Students</property>
     74  <property name="label_edit">Beds for Fresh Students</property>
    5975  <property name="help">Name the beds for first year students.
    6076                        Attention: The bed letters must not exceed the number of beds per room.</property>
    … …  
    203219  <row>
    204220   <cell name="sort_id"/>
    205   </row>
     221  </row> 
    206222  <row>
    207223   <cell name="maintenance_code"/>
    208224  </row>
    209225  <row>
     226   <cell name="special_handling"/>
     227  </row>
     228  <row>
    210229   <cell name="text"/>
    211230  </row>
    … …  
    229248  </row>
    230249  <row>
    231    <cell name="beds_for_pre"/>
    232   </row> 
    233   <row>
    234250   <cell name="beds_for_fresh"/>
    235251  </row>
     252  <row>
     253   <cell name="beds_for_returning"/>
     254  </row>     
    236255  <row>
    237256   <cell name="beds_for_final"/>

  • WAeUP_SRP/trunk/skins/waeup_epayment/interswitch_cb.py

    r3816 r3870  
    138138
    139139else:
    140     logger.info('%s received unsuccessfull callback: %s' % (student_id,pd['resp_desc']))
     140    logger.info('%s received unsuccessful callback: %s' % (student_id,pd['resp_desc']))
    141141
    142142review_state = wftool.getInfoFor(context,'review_state',None)
Note: See TracChangeset for help on using the changeset viewer.