Changeset 57344

Timestamp:

03/07/08 16:38:52 (2 months ago)

Author:

ischommer

Message:

simplier supplier network selection

Location:

modules/marketdemandmap/trunk

Files:

• code/controller/DemandMap.php (modified) (1 diff)
• code/model/Supplier.php (modified) (1 diff)
• code/model/SupplierNetwork.php (modified) (2 diffs)
• code/model/SupplyShape.php (modified) (1 diff)
• javascript/demandmap.SupplierControl.js (modified) (2 diffs)
• templates/Includes/DemandSupplierControl_Suppliers.ss (modified) (1 diff)

modules/marketdemandmap/trunk/code/controller/DemandMap.php

@@ -284 +284 @@
                         ),
                         new LiteralField('SupplierControl', $this->customise(array(
-                                'PublicSuppliers' => Supplier::get_public()
+                                'PublicSupplierNetworks' => SupplierNetwork::get_public()
                         ))->renderWith('DemandSupplierControl_Suppliers'))
                 );

modules/marketdemandmap/trunk/code/model/Supplier.php

@@ -40 +40 @@
                 return $this->SupplierNetworks('HideFromPublic = 0');
         }
-        
+
         /**
          * @param string $SQL_filter

modules/marketdemandmap/trunk/code/model/SupplierNetwork.php

@@ -116 +116 @@
         function getCombinedTitle() {
                 $supplierTitle = $this->Supplier()->Title;
-                return "{$this->Title} ({$supplierTitle})";
+                return "{$supplierTitle}: {$this->Title}";
         }
         
@@ -135 +135 @@
         }
         
+        /**
+         * @param string $SQL_filter
+         */
+        public static function get_public($SQL_filter = null) {
+                $SQL_combinedFilter = 'Supplier.HideFromPublic = 0 AND SupplierNetwork.HideFromPublic = 0';
+                if($SQL_filter) $SQL_combinedFilter .= ' AND ' . Convert::raw2sql($SQL_filter);
+                return DataObject::get(
+                        'SupplierNetwork', 
+                        $SQL_combinedFilter,
+                        'Supplier.Title, SupplierNetwork.Title',
+                        'LEFT JOIN Supplier ON SupplierNetwork.SupplierID = Supplier.ID'
+                );
+        }
+        
 }
 ?>

modules/marketdemandmap/trunk/code/model/SupplyShape.php

@@ -57 +57 @@
         
         public function generatetile($request) {
+                // DEBUG
+                return false;
+                
                 $RAW_filename = $_GET['tile']; // escaped in TileRenderer
 

modules/marketdemandmap/trunk/javascript/demandmap.SupplierControl.js

@@ -29 +29 @@
                         $('.Actions .loadingIndicator', container).hide();
                         
-                        // hide all single subcategories
-                        $('.supplierList li.category', container).each(function() {
-                                var subcategoryNodes = $('li.subcategory', this);
-                                if(subcategoryNodes.length < 2) {
-                                        subcategoryNodes.hide();
-                                } else {
-                                        // hide colors on main category (displayed on subcategories now)
-                                        $(this).find('label .color').hide();
-                                        $(this).find('ul label .color').show();
-                                }
-                        });
-                        
                         // events
-                        $('.supplierList .category :checkbox', container).bind('click', function(e) {
-                                // @todo avoid multiple "too many selections" popup coming up
-                                var categoryChecked = (e.target.checked);
-                                $('.subcategory :checkbox', this.parentNode).each(function() {
-                                        this.checked = (categoryChecked) ? 'checked' : '';
-                                        $(this).click();
-                                });
-                        });
-                        $('.supplierList .subcategory :checkbox', container).bind('click', function(e) {
-                                if($('.supplierList .subcategory :checked', container).length > options.maxNetworkSelections) {
+                        $('.supplierList :checkbox', container).bind('click', function(e) {
+                                // count all already selected checkboxes
+                                if($('.supplierList :checked', container).length > options.maxNetworkSelections) {
                                         alert($.i18n._t('MAXSUPPLIERSELECTIONS'));
                                         e.target.checked = '';
                                         return false;
                                 }
+                                
+                                // make sure radiobutton "show netowkrs" is selected
+                                $(':radio[value=select networks]', container).click();
+                                
                                 var supplierID = e.target.value;
                                 if(e.target.checked) {
@@ -68 +53 @@
                                 return true;
                         });
+                        
                         // "show coverage" (toggling of all layers with fake ID '0')
                         // radiobutton selection: either "show coverage" or "select networks"

modules/marketdemandmap/trunk/templates/Includes/DemandSupplierControl_Suppliers.ss

@@ -13 +13 @@
         <div class="supplierList">
                 <ul>
-                <% control PublicSuppliers %>
-                                <li id="Supplier$ID" class="category">
-                                        <input type="checkbox" name="Suppliers[]" id="SupplierID_$ID" value="$ID" class="checkbox category" />
-                                        <label for="SupplierID_$ID">
-                                                <% control PublicSupplierNetworks %>
-                                                        <span class="color" style="background-color: $LayerColor;">&nbsp;</span>
-                                                <% end_control %>
-                                                $Title
-                                        </label>
-                                        <% if SupplierNetworks %>
-                                        <ul>
-                                                <% control PublicSupplierNetworks %>
-                                                        <li id="SupplierNetwork$ID" class="subcategory $JSONData">
-                                                                <input type="checkbox" name="SupplierNetworks[]" id="SupplierNetworkID_$ID" value="$ID" class="checkbox subcategory" />
-                                                                <label for="SupplierNetworkID_$ID">
-                                                                        <span class="color" style="background-color: $LayerColor;">&nbsp;</span>$Title
-                                                                </label>
-                                                        </li>
-                                                <% end_control %>
-                                        </ul>
-                                        <% end_if %>
-                                </li>
-                        <% end_control %>
+                <% control PublicSupplierNetworks %>
+                        <li id="Supplier$ID" class="category">
+                                <input type="checkbox" name="Suppliers[]" id="SupplierID_$ID" value="$ID" class="checkbox category" />
+                                <label for="SupplierID_$ID">
+                                        <span class="color" style="background-color: $LayerColor;">&nbsp;</span>
+                                        $CombinedTitle
+                                </label>
+                        </li>
+                <% end_control %>
                 </ul>
                 <p class="message"><small>Max. 3 suppliers</small></p>