[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15734] controller: add filter on location
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15734] controller: add filter on location |
|
Date: |
Mon, 26 Sep 2016 13:35:36 +0000 (UTC) |
Revision: 15734
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15734
Author: sigurdne
Date: 2016-09-26 13:35:36 +0000 (Mon, 26 Sep 2016)
Log Message:
-----------
controller: add filter on location
Modified Paths:
--------------
trunk/controller/inc/class.uicomponent.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/component.xsl
trunk/property/inc/class.bolocation.inc.php
trunk/property/inc/class.solocation.inc.php
Added Paths:
-----------
trunk/controller/js/controller/component.index.js
Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php 2016-09-25 20:14:08 UTC
(rev 15733)
+++ trunk/controller/inc/class.uicomponent.inc.php 2016-09-26 13:35:36 UTC
(rev 15734)
@@ -184,6 +184,7 @@
return $this->query();
}
phpgwapi_jquery::load_widget('core');
+ phpgwapi_jquery::load_widget('autocomplete');
$users =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_EDIT, '.checklist');
$user_list = array();
@@ -361,6 +362,9 @@
'field' =>
$this->get_fields($filter_component),
),
);
+
+ self::add_javascript('controller', 'controller',
'component.index.js');
+
self::render_template_xsl(array('component',
'calendar/icon_color_map'), $data);
}
@@ -554,6 +558,7 @@
{
$entity_group_id = phpgw::get_var('entity_group_id',
'int');
$location_id = phpgw::get_var('location_id', 'int');
+ $location_code = phpgw::get_var('location_code',
'string');
$control_area = phpgw::get_var('control_area', 'int');
$user_id = phpgw::get_var('user_id', 'int');
$district_id = phpgw::get_var('district_id', 'int');
@@ -626,6 +631,7 @@
'filter_entity_group' =>
$entity_group_id,
'location_id' => $_location_id,
'district_id' => $district_id,
+ 'location_code' =>
$location_code,
'allrows' => true,
'filter_item' => $component_list
)
@@ -664,6 +670,7 @@
'filter_entity_group' =>
$entity_group_id,
'location_id' => $_location_id,
'district_id' => $district_id,
+ 'location_code' =>
$location_code,
'org_units' => $this->org_units,
'allrows' => true,
'control_registered' =>
!$all_items,
@@ -683,6 +690,7 @@
'exclude_locations' =>
$exclude_locations,
'location_id' => $_location_id,
'district_id' => $district_id,
+ 'location_code' =>
$location_code,
'org_units' => $this->org_units,
'allrows' => true,
'control_registered' =>
!$all_items,
Added: trunk/controller/js/controller/component.index.js
===================================================================
--- trunk/controller/js/controller/component.index.js
(rev 0)
+++ trunk/controller/js/controller/component.index.js 2016-09-26 13:35:36 UTC
(rev 15734)
@@ -0,0 +1,341 @@
+/**
+ * Detect if browsertab is active - and update when revisit
+ */
+var vis = (function ()
+{
+ var stateKey, eventKey, keys = {
+ hidden: "visibilitychange",
+ webkitHidden: "webkitvisibilitychange",
+ mozHidden: "mozvisibilitychange",
+ msHidden: "msvisibilitychange"
+ };
+ for (stateKey in keys)
+ {
+ if (stateKey in document)
+ {
+ eventKey = keys[stateKey];
+ break;
+ }
+ }
+ return function (c)
+ {
+ if (c)
+
+ document.addEventListener(eventKey, c);
+ return !document[stateKey];
+ }
+})();
+
+vis(function ()
+{
+ if (vis())
+ {
+ update_table();
+ }
+});
+
+
+
+$(document).ready(function ()
+{
+ update_table();
+
+ $("#location_name").on("autocompleteselect", function (event, ui)
+ {
+ var location_code = ui.item.value;
+// alert($("#location_code").val());
+// $("#location_code").val(location_code);
+ update_table(location_code);
+// if (location_code != location_code_selection)
+// {
+// building_id_selection = building_id;
+// }
+ });
+});
+
+deselect_component = function ()
+{
+ $("[name='filter_component']").val('');
+ update_table();
+};
+update_table = function (location_code)
+{
+ if(typeof(location_code) == 'undefined')
+ {
+ location_code = $("#location_code").val();
+ }
+
+ $("#receipt").html('');
+
+ var report_type = $("#report_type").val();
+ var user_id = $("#user_id").val();
+ var custom_frontend = $("[name='custom_frontend']").val();
+ var hide_all_users = false;
+
+ if (custom_frontend == 1)
+ {
+ $("#user_id").hide();
+ $("[for='user_id']").hide();
+ }
+//console.log(user_id);
+ if (user_id < 0 || custom_frontend == 1)
+ {
+ $("#entity_group_id").hide();
+ $("[for='entity_group_id']").hide();
+ $("#location_id").hide();
+ $("[for='location_id']").hide();
+ $("[name='all_items']").hide();
+ $("[for='all_items']").hide();
+ $("#org_unit_id").hide();
+ $("[for='org_unit_id']").hide();
+ $("[name='all_users']").hide();
+ $("[for='all_users']").hide();
+ hide_all_users = true;
+ }
+ else
+ {
+ $("#entity_group_id").show();
+ $("[for='entity_group_id']").show();
+ $("#location_id").show();
+ $("[for='location_id']").show();
+ $("[name='all_items']").show();
+ $("[for='all_items']").show();
+ $("#org_unit_id").show();
+ $("[for='org_unit_id']").show();
+ $("[name='all_users']").show();
+ $("[for='all_users']").show();
+ }
+
+ if (report_type != 'summary' && hide_all_users == false)
+ {
+ $("[name='all_users']").show();
+ $("[for='all_users']").show();
+ }
+
+ if (user_id == '')
+ {
+ $("[name='all_users']").hide();
+ $("[for='all_users']").hide();
+ }
+
+ if (report_type == 'summary')
+ {
+ $("[name='all_items']").hide();
+ $("[for='all_items']").hide();
+ $("[name='status']").hide();
+ $("[for='status']").hide();
+ }
+
+ var requestUrl = $("#queryForm").attr("action");
+ requestUrl += '&phpgw_return_as=json' + "&" +
$("#queryForm").serialize() + "&location_code=" + location_code ;
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ if (data != null)
+ {
+ var components_data = data.components;
+ var summary_data = data.summary;
+ if (data.location_filter)
+ {
+ var obj = data.location_filter;
+ var htmlString = "<option value=''>" +
obj.length + " register funnet</option>";
+ var entity_group_id =
$("#entity_group_id").val();
+ var location_id =
$("#location_id").val();
+
+ if (entity_group_id)
+ {
+ var selected = '';
+ if (location_id == -1)
+ {
+ selected = ' selected';
+ }
+ htmlString += "<option
value='-1'" + selected + ">Velg alle</option>";
+ }
+
+ $.each(obj, function (i)
+ {
+ var selected = '';
+ if (obj[i].selected == 1)
+ {
+ selected = ' selected';
+ }
+
+ htmlString += "<option value='"
+ obj[i].id + "'" + selected + ">" + obj[i].name + "</option>";
+
+ });
+
+ $("#location_id").html(htmlString);
+
+ }
+
+
+ var filter_options =
data.location_filter_options;
+ var return_location_id =
data.return_location_id;
+ var filtered_location_id =
$("#filtered_location_id").val();
+ var location_id = $("#location_id").val();
+ if (filter_options == null)
+ {
+ $("#extra_row").hide();
+
+ }
+ if (filter_options !== null &&
filtered_location_id != return_location_id)
+ {
+
$("#filtered_location_id").val(location_id);
+ $("#extra_row").show();
+ $("#extra_filter").html('');
+ var $extra_filter = $("#extra_filter");
+ $.each(filter_options, function (key,
filter)
+ {
+ var list = filter.list;
+
$extra_filter.append($("<select></select>").attr("id", location_id + '_' +
filter.name).text(location_id + '_' + filter.name));
+
+ var custom_select = $("#" +
location_id + '_' + filter.name);
+
+ $.each(list, function (key,
value)
+ {
+
custom_select.append($("<option></option>").attr("value",
value.id).text(value.name));
+ });
+
+ $(document).on("change", "#" +
location_id + '_' + filter.name, function ()
+ {
+
+ var custom_input =
document.getElementById("custom_" + location_id + '_' + filter.name);
+
+ if (custom_input !=
null)
+ {
+ $("#custom_" +
location_id + '_' + filter.name).val($(this).val());
+ }
+ else
+ {
+ $('<input
/>').attr('type', 'hidden')
+
.attr('id', 'custom_' + location_id + '_' + filter.name)
+
.attr('name', 'custom_' + location_id + '_' + filter.name)
+
.attr('value', $(this).val())
+
.appendTo('#queryForm');
+ }
+ update_table();
+
+ });
+
+ });
+ }
+
+ if (components_data !== null)
+ {
+ $("#tbody").html(components_data.tbody);
+ var time_sum = components_data.time_sum;
+ var time_sum_actual =
components_data.time_sum_actual;
+
+
$("#checkall").html(components_data.checkall);
+
$("#total_records").html(components_data.total_records);
+ $("#sum_text").html('Sum');
+ $("#month0").html(time_sum[0] + '/' +
time_sum_actual[0]);
+ $("#month1").html(time_sum[1] + '/' +
time_sum_actual[1]);
+ $("#month2").html(time_sum[2] + '/' +
time_sum_actual[2]);
+ $("#month3").html(time_sum[3] + '/' +
time_sum_actual[3]);
+ $("#month4").html(time_sum[4] + '/' +
time_sum_actual[4]);
+ $("#month5").html(time_sum[5] + '/' +
time_sum_actual[5]);
+ $("#month6").html(time_sum[6] + '/' +
time_sum_actual[6]);
+ $("#month7").html(time_sum[7] + '/' +
time_sum_actual[7]);
+ $("#month8").html(time_sum[8] + '/' +
time_sum_actual[8]);
+ $("#month9").html(time_sum[9] + '/' +
time_sum_actual[9]);
+ $("#month10").html(time_sum[10] + '/' +
time_sum_actual[10]);
+ $("#month11").html(time_sum[11] + '/' +
time_sum_actual[11]);
+ $("#month12").html(time_sum[12] + '/' +
time_sum_actual[12]);
+ }
+
+ if (summary_data !== null)
+ {
+ $("#status_summary").show();
+ $("#components").hide();
+ $("#status_summary").html(summary_data);
+ }
+ else
+ {
+ $("#status_summary").hide();
+ $("#components").show();
+
+ }
+ }
+
+ }
+ });
+
+};
+
+add_from_master = function (myclass)
+{
+ var myRadio = $('input[name=master_component]');
+ var master_component = myRadio.filter(':checked').val();
+
+ if (!master_component)
+ {
+ alert('velg master');
+ return;
+ }
+
+ var selected = new Array();
+
+ $("." + myclass).each(function ()
+ {
+ if ($(this).prop("checked"))
+ {
+ selected.push($(this).val());
+ }
+ });
+
+ oArgs = {menuaction: 'controller.uicomponent.add_controll_from_master'};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ $.ajax({
+ type: 'POST',
+ data: {master_component: master_component, target: selected},
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ if (data != null)
+ {
+//console.log(data);
+ var message = data.message;
+
+ htmlString = "";
+ var msg_class = "msg_good";
+ if (data.status == 'error')
+ {
+ msg_class = "error";
+ }
+ htmlString += "<div class=\"" + msg_class +
"\">";
+ htmlString += message;
+ htmlString += '</div>';
+ update_table();
+ $("#receipt").html(htmlString);
+
+ }
+ }
+ });
+
+};
+
+checkAll = function (myclass)
+{
+ $("." + myclass).each(function ()
+ {
+ if ($(this).prop("checked"))
+ {
+ $(this).prop("checked", false);
+ }
+ else
+ {
+ $(this).prop("checked", true);
+ }
+ });
+};
+
+var oArgs = {menuaction: 'property.bolocation.get_locations'};
+var strURL = phpGWLink('index.php', oArgs, true);
+JqueryPortico.autocompleteHelper(strURL, 'location_name', 'location_code',
'location_container');
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2016-09-25 20:14:08 UTC (rev
15733)
+++ trunk/controller/setup/phpgw_no.lang 2016-09-26 13:35:36 UTC (rev
15734)
@@ -391,4 +391,5 @@
components controller no Komponenter
report type controller no RapportType
lang_control_mandatory_location controller no Påkrevd
lokasjonsvalg
-Control types controller no Kontrolltyper
\ No newline at end of file
+Control types controller no Kontrolltyper
+location controller no Lokasjon
\ No newline at end of file
Modified: trunk/controller/templates/base/component.xsl
===================================================================
--- trunk/controller/templates/base/component.xsl 2016-09-25 20:14:08 UTC
(rev 15733)
+++ trunk/controller/templates/base/component.xsl 2016-09-26 13:35:36 UTC
(rev 15734)
@@ -199,6 +199,18 @@
</td>
</tr>
</xsl:for-each>
+ <tr id = 'location_code'>
+ <td>
+ <label for='location_code'>
+ <xsl:value-of
select="php:function('lang', 'location')"/>
+ </label>
+ </td>
+ <td>
+ <input type="hidden"
id="location_code" name="location_code" />
+ <input type="text"
id="location_name" name="location_name" />
+ <div id="location_container"/>
+ </td>
+ </tr>
<tr id = 'extra_row'>
<td>
<label for='extra_filter'>
@@ -275,319 +287,6 @@
<xsl:template name="datasource-definition">
- <script type="text/javascript">
-<![CDATA[
-
- /**
- * Detect if browsertab is active - and update when revisit
- */
- var vis = (function(){
- var stateKey, eventKey, keys = {
- hidden: "visibilitychange",
- webkitHidden: "webkitvisibilitychange",
- mozHidden: "mozvisibilitychange",
- msHidden: "msvisibilitychange"
- };
- for (stateKey in keys) {
- if (stateKey in document) {
- eventKey = keys[stateKey];
- break;
- }
- }
- return function(c) {
- if (c) document.addEventListener(eventKey, c);
- return !document[stateKey];
- }
- })();
-
- vis(function(){
- if(vis())
- {
- update_table();
- }
- });
-
-
-
- $(document).ready(function(){
- update_table();
- });
-
- deselect_component = function()
- {
- $("[name='filter_component']").val('');
- update_table();
- };
- update_table = function()
- {
- $("#receipt").html('');
-
- var report_type = $("#report_type").val();
- var user_id = $("#user_id").val();
- var custom_frontend =
$("[name='custom_frontend']").val();
- var hide_all_users = false;
-
- if(custom_frontend ==1)
- {
- $( "#user_id" ).hide();
- $("[for='user_id']").hide();
- }
-//console.log(user_id);
- if(user_id < 0 || custom_frontend ==1)
- {
- $( "#entity_group_id" ).hide();
- $("[for='entity_group_id']").hide();
- $( "#location_id" ).hide();
- $("[for='location_id']").hide();
- $("[name='all_items']").hide();
- $("[for='all_items']").hide();
- $( "#org_unit_id" ).hide();
- $("[for='org_unit_id']").hide();
- $("[name='all_users']").hide();
- $("[for='all_users']").hide();
- hide_all_users = true;
- }
- else
- {
- $( "#entity_group_id" ).show();
- $("[for='entity_group_id']").show();
- $( "#location_id" ).show();
- $("[for='location_id']").show();
- $("[name='all_items']").show();
- $("[for='all_items']").show();
- $( "#org_unit_id" ).show();
- $("[for='org_unit_id']").show();
- $("[name='all_users']").show();
- $("[for='all_users']").show();
- }
-
- if(report_type != 'summary' && hide_all_users == false)
- {
- $("[name='all_users']").show();
- $("[for='all_users']").show();
- }
-
- if(user_id == '')
- {
- $("[name='all_users']").hide();
- $("[for='all_users']").hide();
- }
-
- if(report_type == 'summary')
- {
- $("[name='all_items']").hide();
- $("[for='all_items']").hide();
- $("[name='status']").hide();
- $("[for='status']").hide();
- }
-
- var requestUrl = $("#queryForm").attr("action");
- requestUrl += '&phpgw_return_as=json' + "&" +
$("#queryForm").serialize();
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl,
- success: function(data) {
- if( data != null)
- {
- var components_data =
data.components;
- var summary_data = data.summary;
- if(data.location_filter)
- {
- var obj =
data.location_filter;
- var htmlString =
"<option value=''>" + obj.length + " register funnet</option>";
- var entity_group_id =
$("#entity_group_id").val();
- var location_id =
$("#location_id").val();
-
- if(entity_group_id)
- {
- var selected =
'';
- if(location_id
== -1)
- {
-
selected = ' selected';
- }
- htmlString +=
"<option value='-1'" + selected + ">Velg alle</option>";
- }
-
- $.each(obj, function(i)
- {
- var selected =
'';
-
if(obj[i].selected == 1)
- {
-
selected = ' selected';
- }
-
- htmlString +=
"<option value='" + obj[i].id + "'" + selected + ">" + obj[i].name +
"</option>";
-
- });
-
- $("#location_id").html(
htmlString );
-
- }
-
-
- var filter_options =
data.location_filter_options;
- var return_location_id =
data.return_location_id;
- var filtered_location_id =
$("#filtered_location_id").val();
- var location_id =
$("#location_id").val();
- if(filter_options == null)
- {
- $("#extra_row").hide();
-
- }
- if(filter_options !==null &&
filtered_location_id != return_location_id)
- {
-
$("#filtered_location_id").val(location_id);
- $("#extra_row").show();
-
$("#extra_filter").html('');
- var $extra_filter =
$("#extra_filter");
- $.each(filter_options,
function(key, filter) {
- var list =
filter.list;
-
$extra_filter.append($("<select></select>").attr("id", location_id + '_' +
filter.name).text(location_id + '_' + filter.name));
-
- var
custom_select = $("#" + location_id + '_' + filter.name);
-
- $.each(list,
function(key, value) {
-
custom_select.append($("<option></option>").attr("value",
value.id).text(value.name));
- });
-
-
$(document).on("change", "#" + location_id + '_' + filter.name , function() {
-
- var
custom_input = document.getElementById("custom_" + location_id + '_' +
filter.name);
-
-
if(custom_input != null)
- {
-
$("#custom_" + location_id + '_' + filter.name).val($(this).val());
- }
- else
- {
-
$('<input />').attr('type', 'hidden')
-
.attr('id', 'custom_' + location_id + '_' + filter.name)
-
.attr('name', 'custom_' + location_id + '_' + filter.name)
-
.attr('value', $(this).val())
-
.appendTo('#queryForm');
- }
-
update_table();
-
- });
-
- });
- }
-
- if(components_data !==null)
- {
-
$("#tbody").html(components_data.tbody);
- var time_sum =
components_data.time_sum;
- var time_sum_actual =
components_data.time_sum_actual;
-
-
$("#checkall").html(components_data.checkall);
-
$("#total_records").html(components_data.total_records);
-
$("#sum_text").html('Sum');
-
$("#month0").html(time_sum[0] + '/' + time_sum_actual[0]);
-
$("#month1").html(time_sum[1] + '/' + time_sum_actual[1]);
-
$("#month2").html(time_sum[2] + '/' + time_sum_actual[2]);
-
$("#month3").html(time_sum[3] + '/' + time_sum_actual[3]);
-
$("#month4").html(time_sum[4] + '/' + time_sum_actual[4]);
-
$("#month5").html(time_sum[5] + '/' + time_sum_actual[5]);
-
$("#month6").html(time_sum[6] + '/' + time_sum_actual[6]);
-
$("#month7").html(time_sum[7] + '/' + time_sum_actual[7]);
-
$("#month8").html(time_sum[8] + '/' + time_sum_actual[8]);
-
$("#month9").html(time_sum[9] + '/' + time_sum_actual[9]);
-
$("#month10").html(time_sum[10] + '/' + time_sum_actual[10]);
-
$("#month11").html(time_sum[11] + '/' + time_sum_actual[11]);
-
$("#month12").html(time_sum[12] + '/' + time_sum_actual[12]);
- }
-
- if(summary_data !== null)
- {
- $( "#status_summary"
).show();
- $( "#components"
).hide();
- $(
"#status_summary").html(summary_data);
- }
- else
- {
- $( "#status_summary"
).hide();
- $( "#components"
).show();
-
- }
- }
-
- }
- });
-
- };
-
- add_from_master = function(myclass)
- {
- var myRadio = $('input[name=master_component]');
- var master_component = myRadio.filter(':checked').val();
-
- if(!master_component)
- {
- alert('velg master');
- return;
- }
-
- var selected = new Array();
-
- $("." + myclass).each(function()
- {
- if($(this).prop("checked"))
- {
- selected.push( $(this).val() );
- }
- });
-
- oArgs = {menuaction:
'controller.uicomponent.add_controll_from_master'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- $.ajax({
- type: 'POST',
- data: {master_component:master_component,
target:selected},
- dataType: 'json',
- url: requestUrl,
- success: function(data) {
- if( data != null)
- {
-//console.log(data);
- var message = data.message;
-
- htmlString = "";
- var msg_class = "msg_good";
- if(data.status =='error')
- {
- msg_class = "error";
- }
- htmlString += "<div class=\"" +
msg_class + "\">";
- htmlString += message;
- htmlString += '</div>';
- update_table();
- $("#receipt").html(htmlString);
-
- }
- }
- });
-
- };
-
- checkAll = function(myclass)
- {
- $("." + myclass).each(function()
- {
- if($(this).prop("checked"))
- {
- $(this).prop("checked", false);
- }
- else
- {
- $(this).prop("checked", true);
- }
- });
- };
-
-]]>
- </script>
<table id="components">
<thead>
<tr>
Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2016-09-25 20:14:08 UTC (rev
15733)
+++ trunk/property/inc/class.bolocation.inc.php 2016-09-26 13:35:36 UTC (rev
15734)
@@ -56,7 +56,8 @@
'read_single' => true,
'save' => true,
'delete' => true,
- 'get_locations_by_name' => true
+ 'get_locations_by_name' => true,
+ 'get_locations' => true
);
function __construct( $session = false )
@@ -1092,8 +1093,7 @@
*/
public function get_locations_by_name()
{
- $data = array
- (
+ $data = array(
'level' => phpgw::get_var('level', 'int'),
'location_name' =>
phpgw::get_var('location_name')
);
@@ -1135,4 +1135,29 @@
{
return $this->so->get_item_id($location_code);
}
+
+ public function get_locations( )
+ {
+ $location_code = phpgw::get_var('query');
+ $_level = count(explode('-', $location_code)) + 1;
+
+ $values = $this->so->get_locations($location_code);
+ if($values)
+ {
+ $part = explode('-', $values[0]['id']);
+ $parent_level = count($part);
+ $_loc_arr = array();
+ for ($i = 0; $i < ($parent_level -1); $i++)
+ {
+ $_loc_arr[] = $part[$i];
+ }
+ $parent_location_code = implode('-', $_loc_arr);
+ if($parent_location_code)
+ {
+ array_unshift($values, array('id' =>
$parent_location_code, 'name' => $parent_location_code . '::' .
$this->get_location_name($parent_location_code)));
+ }
+ }
+ return array('ResultSet' => array('Result' => $values));
+
+ }
}
\ No newline at end of file
Modified: trunk/property/inc/class.solocation.inc.php
===================================================================
--- trunk/property/inc/class.solocation.inc.php 2016-09-25 20:14:08 UTC (rev
15733)
+++ trunk/property/inc/class.solocation.inc.php 2016-09-26 13:35:36 UTC (rev
15734)
@@ -2118,4 +2118,48 @@
return $values;
}
+
+ /**
+ * Get location by location_code
+ *
+ * @param string location_code
+ *
+ * @return array array of hits
+ */
+ public function get_locations( $location_code )
+ {
+ $location_arr = explode('-', $location_code);
+ $level = count($location_arr) +1;
+
+ $filtermethod = '';
+
+ if(ctype_digit($location_arr[0]))
+ {
+ $filtermethod = "WHERE location_code
{$this->like} '{$location_code}%'";
+ }
+ else
+ {
+ $query =
$this->db->db_addslashes($location_arr[0]);
+ $filtermethod = "WHERE loc{$level}_name
{$this->like} '%{$query}%'";
+ }
+
+ $values = array();
+ if ($location_code)
+ {
+ $sql = "SELECT loc{$level}_name as name,
location_code FROM fm_location{$level} {$filtermethod}"
+ . " ORDER BY location_code";
+ $this->db->limit_query($sql, 0, __LINE__,
__FILE__);
+ while ($this->db->next_record())
+ {
+ $_location_code =
$this->db->f('location_code');
+
+ $values[] = array(
+ 'id' => $_location_code,
+ 'name' => $_location_code .
'::' . $this->db->f('name', true)
+ );
+ }
+ }
+ return $values;
+ }
+
}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15734] controller: add filter on location,
sigurdne <=