[Fmsystem-commits] [10254] controller: generalize

[Sigurd Nes]

Revision: 10254
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10254
Author:   sigurdne
Date:     2012-10-17 13:57:33 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
controller: generalize

Modified Paths:
--------------
    trunk/controller/js/controller/ajax_control_to_location.js
    
trunk/controller/templates/base/control_location/register_control_to_location.xsl

Modified: trunk/controller/js/controller/ajax_control_to_location.js
===================================================================
--- trunk/controller/js/controller/ajax_control_to_location.js  2012-10-17 
13:39:29 UTC (rev 10253)
+++ trunk/controller/js/controller/ajax_control_to_location.js  2012-10-17 
13:57:33 UTC (rev 10254)
@@ -85,6 +85,7 @@
 
        $("#location_type_category").change(function () {
                var level = $("#location_type").val();
+               update_location_table();
                update_loc(level);
     });
 
@@ -429,6 +430,7 @@
                return false;
        }
 
+       var cat_id = $("#location_type_category").val() != null ? 
$("#location_type_category").val():'';
 
        var control_registered = 0;
        if (typeof($($("#control_registered")).attr("checked")) != 'undefined' 
&& $($("#control_registered")).attr("checked") == 'checked')
@@ -457,6 +459,7 @@
                location_level:location_type,
                district_id:$("#district_id").val(),
                part_of_town_id:$("#part_of_town_id").val(),
+               cat_id:cat_id,
                location_code:location_code,
                control_id:$("#control_id_hidden").val() != null ? 
$("#control_id_hidden").val():'',
                control_registered:control_registered
@@ -483,6 +486,9 @@
                return false;
        }
 
+
+       var cat_id = $("#location_type_category").val() != null ? 
$("#location_type_category").val():'';
+
        if($("#control_id_hidden").val() != null)
        {
                var location_code = '';
@@ -507,6 +513,7 @@
                        part_of_town_id:$("#part_of_town_id").val(),
                        location_code:location_code,
                        control_id:$("#control_id_hidden").val() != null ? 
$("#control_id_hidden").val():'',
+                       cat_id:cat_id,
                        control_registered:control_registered
                };
 

Modified: 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
===================================================================
--- 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
   2012-10-17 13:39:29 UTC (rev 10253)
+++ 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
   2012-10-17 13:57:33 UTC (rev 10254)
@@ -82,6 +82,19 @@
                        <label><xsl:value-of select="php:function('lang', 
'registered')" /></label>
                <input id= "control_registered" type="checkbox" 
name="control_registered" value="1"/>
          </div>
+
+         <div class="select-box">
+                       <div class="filter">
+                               <label><xsl:value-of 
select="php:function('lang', 'location type')" /></label>
+                         <select id="location_type" name="location_type">
+                                       <xsl:apply-templates 
select="location_type_list/options"/>
+                         </select>
+                       </div>
+                 <div class="filter">
+                               <label><xsl:value-of 
select="php:function('lang', 'location category')" /></label>
+                         <select id="location_type_category" 
name="location_type_category"></select>
+                       </div>
+         </div>
          
                <div class="select-box">
                        <div class="filter">
@@ -97,7 +110,7 @@
                          </select>
                        </div>
          </div>
-               
+<!--           
                <div class="select-box">
                        <div class="filter">
                                <label><xsl:value-of 
select="php:function('lang', 'property')" /></label>
@@ -112,21 +125,9 @@
                          </select>
                        </div>
          </div>
+-->      
          
          <div class="select-box">
-                       <div class="filter">
-                               <label><xsl:value-of 
select="php:function('lang', 'location type')" /></label>
-                         <select id="location_type" name="location_type">
-                                       <xsl:apply-templates 
select="location_type_list/options"/>
-                         </select>
-                       </div>
-                 <div class="filter">
-                               <label><xsl:value-of 
select="php:function('lang', 'location category')" /></label>
-                         <select id="location_type_category" 
name="location_type_category"></select>
-                       </div>
-         </div>
-         
-         <div class="select-box">
                        <label>Søk etter eiendom/bygg/rom</label>
                        <input type="text" value="" id="search-location-name" />
                        <input id= "search-location_code" type="hidden" 
name="search-location_code"/>