Changeset 596 for WAeUP_SRP/trunk/profiles/default

Timestamp:

29 Sep 2006, 14:14:40 (18 years ago)

Author:

joachim

Message:

student search should work now as follows:

if All States is selected a search string must be specified.
if another review state is specified, the searchstring can be empty.
if it is not empty, both are ANDed.

Location:

WAeUP_SRP/trunk/profiles/default

Files:

• layouts/student_search.xml (modified) (3 diffs)
• vocabularies.xml (modified) (1 diff)
• vocabularies/searchable_student_states.xml (moved) (moved from WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_review_states_voc.xml) (1 diff)
• vocabularies/student_search_mode.xml (moved) (moved from WAeUP_SRP/trunk/profiles/default/vocabularies/search_mode_voc.xml) (1 diff)

WAeUP_SRP/trunk/profiles/default/layouts/student_search.xml

@@ -17 +17 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">searchable_review_states_voc</property>
+  <property name="vocabulary">searchable_student_states</property>
  </widget>
  <widget name="search_mode" meta_type="Generic Select Widget">
@@ -24 +24 @@
    <element value="search_mode"/>
   </property>
+  <property name="is_required">True</property>
   <property name="label">Search for</property>
   <property name="label_edit">Search for</property>
@@ -29 +30 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">search_mode_voc</property>
+  <property name="vocabulary">student_search_mode</property>
   <property name="render_format">radio</property>
  </widget>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -16 +16 @@
  <object name="exam_types" meta_type="CPS Vocabulary"/>
  <object name="pin_prefixes" meta_type="CPS Vocabulary"/>
- <object name="search_mode_voc" meta_type="CPS Vocabulary"/>
- <object name="searchable_review_states_voc" meta_type="CPS Vocabulary"/>
+ <object name="student_search_mode" meta_type="CPS Vocabulary"/>
+ <object name="searchable_student_states" meta_type="CPS Vocabulary"/>
+ <object name="academics_search_mode" meta_type="CPS Vocabulary"/>
+ <object name="searchable_academics_states" meta_type="CPS Vocabulary"/>
  </object>

WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_student_states.xml

@@ -5 +5 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
+ <item key="all" msgid="">All States</item>
  <item key="admission_applied " msgid="">Applied for Admission</item>
  <item key="created" msgid="">Data Imported</item>

WAeUP_SRP/trunk/profiles/default/vocabularies/student_search_mode.xml

@@ -9 +9 @@
  <item key="matric_no" msgid="">Matriculation Number</item>
  <item key="jamb_id" msgid="">Jamb Id</item>
- <item key="review_state" msgid="">Review State</item>
 </object>