In-Portal Issue Tracker

Welcome to the In-Portal Open Source CMS Issue Tracker! This is a central management / tracking tool for all types of tasks / issues / bugs for the In-Portal Project. Before reporting any issues, please make sure to read the Guide into Issue Tracker and How to Properly Test and Report Bugs!

Viewing Issue Simple Details [ Jump to Notes ] [ Wiki ]

[ View Advanced ] [ Issue History ] [ Print ]

Tags

No tags attached.

Reference

http://groups.google.com/group/in-portal-dev/browse_thread/thread/3f00ab8c635261b6

Change Log Message

Estimate Points

Attached Files

date_range_filter_improvement.patch [^] (4,625 bytes) 2010-09-02 06:01 [Show Content]

Index: admin_templates/incs/grid_blocks.tpl
===================================================================
--- admin_templates/incs/grid_blocks.tpl	(revision 13861)
+++ admin_templates/incs/grid_blocks.tpl	(working copy)
@@ -418,8 +418,22 @@
 		</table>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_date_range_filter" calendar_format="" filter_width="80%">
+<inp2:m_DefineElement name="date_preset_element">
+	<option value="<inp2:m_Param name='preset'/>" from_value="<inp2:m_Param name='from_value'/>" to_value="<inp2:m_Param name='to_value'/>"<inp2:m_if check="m_Param" name="selected"> selected="selected"</inp2:m_if>><inp2:m_Phrase name="$title"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_date_range_filter" calendar_format="d/m/Y" filter_width="80%">
 		<table class="range-filter">
+			<tr class="to-range-filter<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> hidden-filter</inp2:m_ifnot>">
+				<td style="width: 100%;<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> display: none;</inp2:m_ifnot>">
+					<select style="font-size: 11px; border:1px solid #AAAAAA;" id="<inp2:SearchInputName field='$filter_field' filter_type='date_range' grid='$grid'/>_date_preset">
+						<option value="" from_value="" to_value=""></option>
+						<inp2:DateRangeFilterPresets render_as="date_preset_element" field="$filter_field" filter_type="date_range" grid="$grid" calendar_format="$calendar_format" sort_field="$sort_field"/>
+					</select>
+				</td>
+				<td colspan="2"<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> style="display: none;"</inp2:m_ifnot>>
+				</td>
+			</tr>
 			<tr>
 				<td style="width: 100%">
 					<input type="text"
@@ -482,6 +496,19 @@
 		        weekNumbers : false,
 		        firstDay    : <inp2:m_GetConfig var="FirstDayOfWeek"/>
 			});
+
+			$(document).ready(
+				function () {
+					$('#' + jq('<inp2:SearchInputName field="$filter_field" filter_type="date_range" grid="$grid"/>_date_preset')).change(
+						function ($e) {
+							var $option = $('option:selected', this);
+
+							$('#' + jq('<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>')).val( $option.attr('from_value') );
+							$('#' + jq('<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>')).val( $option.attr('to_value') );
+						}
+					);
+				}
+			);
 		</script>
 </inp2:m_DefineElement>
 
Index: kernel/db/db_tag_processor.php
===================================================================
--- kernel/db/db_tag_processor.php	(revision 13861)
+++ kernel/db/db_tag_processor.php	(working copy)
@@ -2132,6 +2132,67 @@
 	}
 
 	/**
+	 * Prints date range filter presets
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function DateRangeFilterPresets($params)
+	{
+		// get date format, used in filter
+		if ($params['calendar_format']) {
+			$format = $params['calendar_format'];
+		}
+		else {
+			$format = $this->Format( Array ('field' => $params['sort_field'], 'input_format' => 1) );
+		}
+
+		$presets = Array (
+			'today' => Array (
+				'title' => 'la_opt_Today',
+				'from_value' => adodb_date($format),
+				'to_value' => adodb_date($format)
+			),
+
+			'yesterday' => Array (
+				'title' => 'la_opt_Yesterday',
+				'from_value' => adodb_date($format, strtotime('-1 day')),
+				'to_value' => adodb_date($format, strtotime('-1 day'))
+			),
+
+			'last_week' => Array (
+				'title' => 'la_opt_LastWeek',
+				'from_value' => adodb_date($format, strtotime('-6 days')),
+				'to_value' => adodb_date($format, adodb_mktime()),
+			),
+
+			'last_month' => Array (
+				'title' => 'la_opt_LastMonth',
+				'from_value' => adodb_date($format, strtotime('-29 days')),
+				'to_value' => adodb_date($format, adodb_mktime()),
+			),
+		);
+
+		$ret = '';
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['render_as'];
+
+		// get current filter values
+		$from_value = $this->SearchField( array_merge($params, Array ('type' => 'from')) );
+		$to_value = $this->SearchField( array_merge($params, Array ('type' => 'to')) );
+
+		foreach ($presets as $preset_name => $preset_data) {
+			$block_params['preset'] = $preset_name;
+			$block_params = array_merge($block_params, $preset_data);
+			$block_params['selected'] = $preset_data['from_value'] == $from_value && $preset_data['to_value'] == $to_value;
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	/**
 	 * Tells, that at least one of search filters is used by now
 	 *
 	 * @param Array $params

date_range_filter_improvement_v2.patch [^] (5,119 bytes) 2010-09-06 12:58 [Show Content]

Index: admin_templates/incs/grid_blocks.tpl
===================================================================
--- admin_templates/incs/grid_blocks.tpl	(revision 13909)
+++ admin_templates/incs/grid_blocks.tpl	(working copy)
@@ -416,8 +416,22 @@
 		</table>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="date_preset_element">
+	<option value="<inp2:m_Param name='preset'/>" from_value="<inp2:m_Param name='from_value'/>" to_value="<inp2:m_Param name='to_value'/>"<inp2:m_if check="m_Param" name="selected"> selected="selected"</inp2:m_if>><inp2:m_Phrase name="$title"/></option>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_date_range_filter" calendar_format="" filter_width="80%">
 		<table class="range-filter">
+			<tr class="to-range-filter<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> hidden-filter</inp2:m_ifnot>">
+				<td style="width: 100%;<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> display: none;</inp2:m_ifnot>">
+					<select style="font-size: 11px; border:1px solid #AAAAAA;" id="<inp2:SearchInputName field='$filter_field' filter_type='date_range' grid='$grid'/>_date_preset">
+						<option value="" from_value="" to_value=""></option>
+						<inp2:DateRangeFilterPresets render_as="date_preset_element" field="$filter_field" filter_type="date_range" grid="$grid" calendar_format="$calendar_format" sort_field="$sort_field"/>
+					</select>
+				</td>
+				<td colspan="2"<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> style="display: none;"</inp2:m_ifnot>>
+				</td>
+			</tr>
 			<tr>
 				<td style="width: 100%">
 					<input type="text"
@@ -480,6 +494,19 @@
 		        weekNumbers : false,
 		        firstDay    : <inp2:m_GetConfig var="FirstDayOfWeek"/>
 			});
+
+			$(document).ready(
+				function () {
+					$('#' + jq('<inp2:SearchInputName field="$filter_field" filter_type="date_range" grid="$grid"/>_date_preset')).change(
+						function ($e) {
+							var $option = $('option:selected', this);
+
+							$('#' + jq('<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>')).val( $option.attr('from_value') );
+							$('#' + jq('<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>')).val( $option.attr('to_value') );
+						}
+					);
+				}
+			);
 		</script>
 </inp2:m_DefineElement>
 
Index: kernel/db/db_tag_processor.php
===================================================================
--- kernel/db/db_tag_processor.php	(revision 13890)
+++ kernel/db/db_tag_processor.php	(working copy)
@@ -2134,6 +2134,67 @@
 	}
 
 	/**
+	 * Prints date range filter presets
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function DateRangeFilterPresets($params)
+	{
+		// get date format, used in filter
+		if ($params['calendar_format']) {
+			$format = $params['calendar_format'];
+		}
+		else {
+			$format = $this->Format( Array ('field' => $params['sort_field'] . '_date', 'input_format' => 1) );
+		}
+
+		$presets = Array (
+			'today' => Array (
+				'title' => 'la_opt_Today',
+				'from_value' => adodb_date($format),
+				'to_value' => adodb_date($format)
+			),
+
+			'yesterday' => Array (
+				'title' => 'la_opt_Yesterday',
+				'from_value' => adodb_date($format, strtotime('-1 day')),
+				'to_value' => adodb_date($format, strtotime('-1 day'))
+			),
+
+			'last_week' => Array (
+				'title' => 'la_opt_LastWeek',
+				'from_value' => adodb_date($format, strtotime('-6 days')),
+				'to_value' => adodb_date($format, adodb_mktime()),
+			),
+
+			'last_month' => Array (
+				'title' => 'la_opt_LastMonth',
+				'from_value' => adodb_date($format, strtotime('-29 days')),
+				'to_value' => adodb_date($format, adodb_mktime()),
+			),
+		);
+
+		$ret = '';
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['render_as'];
+
+		// get current filter values
+		$from_value = $this->SearchField( array_merge($params, Array ('type' => 'from')) );
+		$to_value = $this->SearchField( array_merge($params, Array ('type' => 'to')) );
+
+		foreach ($presets as $preset_name => $preset_data) {
+			$block_params['preset'] = $preset_name;
+			$block_params = array_merge($block_params, $preset_data);
+			$block_params['selected'] = $preset_data['from_value'] == $from_value && $preset_data['to_value'] == $to_value;
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	/**
 	 * Tells, that at least one of search filters is used by now
 	 *
 	 * @param Array $params
Index: units/admin/admin_events_handler.php
===================================================================
--- units/admin/admin_events_handler.php	(revision 13862)
+++ units/admin/admin_events_handler.php	(working copy)
@@ -315,7 +315,7 @@
 				// numeric null field
 				if (preg_match('/(On|Date)$/', $field_info['Field']) || $field_info['Field'] == 'Modified') {
 					$field_options['formatter'] = 'kDateFormatter';
-					$grid_col_options['filter_block'] = 'grid_date_rage_filter';
+					$grid_col_options['filter_block'] = 'grid_date_range_filter';
 				}
 			}

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
(0002764) Dmitry (manager) 2010-09-05 20:36	Thanks, but patch needs to be reassembled - there seems to be some code which is different from current latest repo version (in tpl file).

(0002765) Dmitry (manager) 2010-09-05 20:38	Also, I propose to test and include this in the current release so we don't have issues with this later. I know it's not entirely what we are looking for, but we can end up with lots of broken patches lately.

(0002775) alex (manager) 2010-09-06 05:45	Reminder sent to: Dmitry No need for that, since there only 1 new tag in kDBTagProcessor and template grid_blocks.tpl is modified.

(0002778) Dmitry (manager) 2010-09-06 12:39	Reviewed and tested - basic functionality works okay, but there an issue with Calendar format date hard-coded in the block (Europe date fo. We should be able to auto-apply "Input DATE format" from currently selected language. Please let me know your thoughts on this.

(0002779) alex (manager) 2010-09-06 12:41	Reminder sent to: Dmitry When task is in "Needs Testing" status, then please: 1. test it OR 2. ask question without status change Since when you change status back and forth to "Needs Testing", then your username is set as Developer, however it's not always true. Maybe we should review issue state transition diagram to fit whatever action you are performing on tasks. This is not the first time with messed Developer field by the way.

(0002780) alex (manager) 2010-09-06 12:43	Reminder sent to: Dmitry Date format fix is pretty easy: replace calendar_format="d/m/Y" to calendar_format="" in filter block DefineElement statement.

(0002781) Dmitry (manager) 2010-09-06 12:51	Reminder sent to: alex Actually, I have tried that already and then it adds the TIME to the drop-down which is not exactly what we need. In best case scenario we need to have just a DATE (no time) as we see now, but in proper format. What you think?

(0002782) alex (manager) 2010-09-06 12:59	Fixed. Also fix for "grid_date_range_filter" name was added, when used from unit config field array generator (was "grid_date_rage_filter" there).

(0002783) Dmitry (manager) 2010-09-06 14:37	Thanks, tested good!

(0003985) alex (manager) 2011-10-04 02:38	Maybe we shouldn't hurry with putting this to 5.2.0

Issue History
Date Modified	Username	Field	Change
2011-10-04 02:38	alex	Target Version	5.2.0 => Icebox
2011-10-04 02:38	alex	Note Added: 0003985
2011-09-24 22:35	Dmitry	Target Version	Icebox => 5.2.0
2010-09-06 14:37	Dmitry	Note Added: 0002783
2010-09-06 14:37	Dmitry	Assigned To	!COMMUNITY => alex
2010-09-06 14:37	Dmitry	Status	needs testing => reviewed and tested
2010-09-06 12:59	alex	Note Added: 0002782
2010-09-06 12:59	alex	Assigned To	alex => !COMMUNITY
2010-09-06 12:59	alex	Status	needs work => needs testing
2010-09-06 12:58	alex	File Added: date_range_filter_improvement_v2.patch
2010-09-06 12:51	Dmitry	Note Added: 0002781
2010-09-06 12:43	alex	Note Added: 0002780
2010-09-06 12:41	alex	Note Added: 0002779
2010-09-06 12:39	Dmitry	Note Added: 0002778
2010-09-06 12:39	Dmitry	Assigned To	!COMMUNITY => alex
2010-09-06 12:39	Dmitry	Status	needs testing => needs work
2010-09-06 12:38	alex	Developer	Dmitry => alex
2010-09-06 12:36	Dmitry	Assigned To	alex => !COMMUNITY
2010-09-06 12:36	Dmitry	Developer	alex => Dmitry
2010-09-06 12:36	Dmitry	Status	needs work => needs testing
2010-09-06 05:45	alex	Issue Monitored: Dmitry
2010-09-06 05:45	alex	Note Added: 0002775
2010-09-05 20:38	Dmitry	Note Added: 0002765
2010-09-05 20:36	Dmitry	Note Added: 0002764
2010-09-05 20:36	Dmitry	Assigned To	!COMMUNITY => alex
2010-09-05 20:36	Dmitry	Status	needs testing => needs work
2010-09-02 06:01	alex	Assigned To	=> !COMMUNITY
2010-09-02 06:01	alex	Developer	=> alex
2010-09-02 06:01	alex	Status	active => needs testing
2010-09-02 06:01	alex	New Issue
2010-09-02 06:01	alex	File Added: date_range_filter_improvement.patch
2010-09-02 06:01	alex	Reference	=> http://groups.google.com/group/in-portal-dev/browse_thread/thread/3f00ab8c635261b6

Web Development by Intechnic

In-Portal Open Source CMS