Changeset 12038

Timestamp:

2006-07-06T16:01:40+12:00 (18 years ago)

Author:

mdewsnip

Message:

Improved the aqp fields (now static).

File:

• trunk/cic-hcap/macros/extra.dm (modified) (4 diffs)

trunk/cic-hcap/macros/extra.dm

@@ -890 +890 @@
 }
 
-_cicaqpdefault_ {<select id='aqp_1_field' name='aqp'><option value='0'>contains</option><option value='1'>is</option></select>}
-_cicaqptypeofplace_ {<select id='aqp_1_field' name='aqp' disabled='true'><option value='0'>contains</option><option value='1' selected='true'>is</option></select>}
-
 _cicaqvdefault_ {<input id='aqv_1_field' name='aqv' type='text' style='width: 450px'/>}
 _cicaqvtypeofplace_ {<select id='aqv_1_field' name='aqv' style='width: 450px'><option value='Individual building'>Individual building</option><option value='Landscape site'>Landscape site</option><option value='Campus arrangement'>Campus arrangement</option><option value='Building group'>Building group</option></select>}
@@ -909 +906 @@
     <input type="hidden" name="aqib" value="">
 
-    <span id="aqp_1_">
-      _cicaqpdefault_(_1_)
-    </span>
+    <select name='aqp'>
+      <option value='0'>contains</option>
+      <option value='1'>is</option>
+    </select>
 
     <span id="aqv_1_">
@@ -1221 +1219 @@
 function initializeadvancedsearch()
 \{
-   changedAQI();
+   for (var i = 0; i < document.QueryForm.aqi.length; i++) \{
+      if (document.QueryForm.aqi[i].value == "PL") \{
+     document.QueryForm.aqp[i].disabled = true;
+     document.QueryForm.aqp[i].options[1].selected = true;
+     document.getElementById("aqv" + i).innerHTML = "_cicaqvtypeofplace_(" + i + ")";
+      \}
+   \}
+
+   prepareadvancedsearch();
 \}
 
@@ -1229 +1235 @@
       if (document.QueryForm.aqi[i].value != document.QueryForm.aqib[i].value) \{
          if (document.QueryForm.aqi[i].value == "PL") \{
-            document.getElementById("aqp" + i).innerHTML = "_cicaqptypeofplace_(" + i + ")";
+        document.QueryForm.aqp[i].disabled = true;
+        document.QueryForm.aqp[i].options[1].selected = true;
         document.getElementById("aqv" + i).innerHTML = "_cicaqvtypeofplace_(" + i + ")";
      \}
      else \{
-            document.getElementById("aqp" + i).innerHTML = "_cicaqpdefault_(" + i + ")";
+        document.QueryForm.aqp[i].disabled = false;
         document.getElementById("aqv" + i).innerHTML = "_cicaqvdefault_(" + i + ")";
      \}