Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Applied MantisBT #8957: Date Selector for Custom Fields #65

Closed
wants to merge 2 commits into from
Closed

Applied MantisBT #8957: Date Selector for Custom Fields #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d05d87c
Applied MantisBT #8957: Date Selector for Custom Fields
mcs Oct 24, 2012
581877d
Renamed global variables to ensure backwards compatibility (some peop…
mcs Oct 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 23 additions & 1 deletion config_defaults_inc.php
View file
Open in desktop
Expand Up @@ -1016,6 +1016,16 @@
* MantisBT Date Settings *
**************************/

/**
* Enables JavaScript based calendar for
* custom date fields. If set to ON, instead of three
* select fields there will be a single text field
* and a calendar icon. Clicking the icon will show
* a datepicker which populates the text field.
* @global int $g_use_date_picker_javascript
*/
$g_use_date_picker_javascript = OFF;

/**
* date format strings defaults to ISO 8601 formatting
* go to http://www.php.net/manual/en/function.date.php
Expand All @@ -1041,13 +1051,25 @@
$g_complete_date_format = 'Y-m-d H:i T';

/**
* jscalendar date format string
* jscalendar date and time format string
* This is used for calendar selections where a date and
* a time may be chosen.
* go to http://www.php.net/manual/en/function.date.php
* for detailed instructions on date formatting
* @global string $g_calendar_js_date_format
*/
$g_calendar_js_date_format = '\%Y-\%m-\%d \%H:\%M';

/**
* jscalendar date format string
* This is used for calendar selections where just a date
* without a time may be chosen.
* go to http://www.php.net/manual/en/function.date.php
* for detailed instructions on date formatting
* @global string $g_calendar_js_date_no_time_format
*/
$g_calendar_js_date_no_time_format = '\%Y-\%m-\%d';
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now the old valiable name stays with its old behaviour. I renamed the new one and edited the comments.


/**
* jscalendar date format string
* go to http://www.php.net/manual/en/function.date.php
Expand Down
120 changes: 67 additions & 53 deletions core/date_api.php
View file
Open in desktop
Expand Up @@ -207,50 +207,61 @@ function print_year_range_option_list( $p_year = 0, $p_start = 0, $p_end = 0 ) {
* @access public
*/
function print_date_selection_set( $p_name, $p_format, $p_date = 0, $p_default_disable = false, $p_allow_blank = false, $p_year_start = 0, $p_year_end = 0 ) {
$t_chars = preg_split( '//', $p_format, -1, PREG_SPLIT_NO_EMPTY );
if( $p_date != 0 ) {
if (ON == config_get( 'use_date_picker_javascript' )
&& "/return_dynamic_filters.php" != $_SERVER["SCRIPT_NAME"]
) {
$p_date = is_numeric( $p_date ) ? $p_date : time();
$t_date = preg_split( '/-/', date( 'Y-m-d', $p_date ), -1, PREG_SPLIT_NO_EMPTY );
$t_date_to_display = $t_date ? $t_date[0] . "-". $t_date[1] . "-". $t_date[2] : '';
print "<input ".helper_get_tab_index()." type=\"text\" size=\"14\" id=\"$p_name\" name=\"$p_name\" size=\"20\" maxlength=\"12\" value=\"".$t_date_to_display."\" />";
date_print_calendar("trigger".$p_name);
date_finish_calendar( $p_name, "trigger".$p_name, false );
} else {
$t_date = array(
0,
0,
0,
);
}

$t_disable = '';
if( $p_default_disable == true ) {
$t_disable = ' disabled="disabled"';
}
$t_blank_line = '';
if( $p_allow_blank == true ) {
$t_blank_line = "<option value=\"0\"></option>";
}

foreach( $t_chars as $t_char ) {
if( strcmp( $t_char, "M" ) == 0 ) {
echo "<select ", helper_get_tab_index(), " name=\"" . $p_name . "_month\"$t_disable>";
echo $t_blank_line;
print_month_option_list( $t_date[1] );
echo "</select>\n";
$t_chars = preg_split( '//', $p_format, -1, PREG_SPLIT_NO_EMPTY );
if( $p_date != 0 ) {
$t_date = preg_split( '/-/', date( 'Y-m-d', $p_date ), -1, PREG_SPLIT_NO_EMPTY );
} else {
$t_date = array(
0,
0,
0,
);
}
if( strcmp( $t_char, "m" ) == 0 ) {
echo "<select ", helper_get_tab_index(), " name=\"" . $p_name . "_month\"$t_disable>";
echo $t_blank_line;
print_numeric_month_option_list( $t_date[1] );
echo "</select>\n";

$t_disable = '';
if( $p_default_disable == true ) {
$t_disable = ' disabled="disabled"';
}
if( strcasecmp( $t_char, "D" ) == 0 ) {
echo "<select ", helper_get_tab_index(), " name=\"" . $p_name . "_day\"$t_disable>";
echo $t_blank_line;
print_day_option_list( $t_date[2] );
echo "</select>\n";
$t_blank_line = '';
if( $p_allow_blank == true ) {
$t_blank_line = "<option value=\"0\"></option>";
}
if( strcasecmp( $t_char, "Y" ) == 0 ) {
echo "<select ", helper_get_tab_index(), " name=\"" . $p_name . "_year\"$t_disable>";
echo $t_blank_line;
print_year_range_option_list( $t_date[0], $p_year_start, $p_year_end );
echo "</select>\n";

foreach( $t_chars as $t_char ) {
if( strcmp( $t_char, "M" ) == 0 ) {
echo "<select ", helper_get_tab_index(), " name=\"" . $p_name . "_month\"$t_disable>";
echo $t_blank_line;
print_month_option_list( $t_date[1] );
echo "</select>\n";
}
if( strcmp( $t_char, "m" ) == 0 ) {
echo "<select ", helper_get_tab_index(), " name=\"" . $p_name . "_month\"$t_disable>";
echo $t_blank_line;
print_numeric_month_option_list( $t_date[1] );
echo "</select>\n";
}
if( strcasecmp( $t_char, "D" ) == 0 ) {
echo "<select ", helper_get_tab_index(), " name=\"" . $p_name . "_day\"$t_disable>";
echo $t_blank_line;
print_day_option_list( $t_date[2] );
echo "</select>\n";
}
if( strcasecmp( $t_char, "Y" ) == 0 ) {
echo "<select ", helper_get_tab_index(), " name=\"" . $p_name . "_year\"$t_disable>";
echo $t_blank_line;
print_year_range_option_list( $t_date[0], $p_year_start, $p_year_end );
echo "</select>\n";
}
}
}
}
Expand All @@ -267,41 +278,44 @@ function print_date_selection_set( $p_name, $p_format, $p_date = 0, $p_default_d
*/
function date_print_calendar( $p_button_name = 'trigger' ) {
global $g_calendar_already_imported;
if(( ON == config_get( 'dhtml_filters' ) ) && ( ON == config_get( 'use_javascript' ) ) ) {
if ( ( ON == config_get( 'dhtml_filters' ) ) && ( ON == config_get( 'use_javascript' ) ) ) {
$t_icon_path = config_get( 'icon_path' );
$t_cal_icon = $t_icon_path . "calendar-img.gif";
echo "<input type=\"image\" class=\"button\" id=\"" . $p_button_name . "\" src=\"" . $t_cal_icon . "\" />";
if ( !$g_calendar_already_imported ) {
echo "<style type=\"text/css\">@import url(" . config_get( 'short_path' ) . "css/calendar-blue.css);</style>\n";
html_javascript_link( 'jscalendar/calendar.js' );
html_javascript_link( 'jscalendar/lang/calendar-en.js' );
html_javascript_link( 'jscalendar/calendar-setup.js' );
$g_calendar_already_imported = true;
}
$t_icon_path = config_get( 'icon_path' );
$t_cal_icon = $t_icon_path . "calendar-img.gif";
echo "<input type=\"image\" class=\"button\" id=\"" . $p_button_name . "\" src=\"" . $t_cal_icon . "\" />";
}
}

/**
* creates javascript calendar objects, point to input element ($p_field_name) that
* diaplays date, and connects it with calendar button ($p_button_name) created with
* displays date, and connects it with the calendar button ($p_button_name) created with
* date_print_calendar.
* @todo (thraxisp) this may want a browser check ( MS IE >= 5.0, Mozilla >= 1.0, Safari >=1.2, ...)
* @param string $p_field_name
* @param string $p_button_name
* @param string $p_field_name the input element
* @param string $p_button_name the calendar button name
* @param boolean $p_show_time should the calendar allow choosing a time (optional, default is true)
* @return null
* @access public
*/
function date_finish_calendar( $p_field_name, $p_button_name ) {
function date_finish_calendar( $p_field_name, $p_button_name, $p_show_time = true ) {
if(( ON == config_get( 'dhtml_filters' ) ) && ( ON == config_get( 'use_javascript' ) ) ) {
$t_format = config_get( 'calendar_js_date_format' );
$t_format = $p_show_time
? config_get( 'calendar_js_date_format' )
: config_get( 'calendar_js_date_no_time_format' );
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here I swapped the conditions because of the semantic switch in the default config file.

echo "<script type=\"text/javascript\">\n";
echo "Calendar.setup (\n";
echo "{\n";
echo "inputField : \"" . $p_field_name . "\",\n";
echo "timeFormat : \"24\",\n";
echo "showsTime : true,\n";
echo "ifFormat : \"" . $t_format . "\", \n";
echo "button : \"" . $p_button_name . "\"\n";
echo "inputField : \"" . $p_field_name . "\",\n";
echo "timeFormat : \"24\",\n";
echo "showsTime : " . ( $p_show_time ? "true" : "false" ) . ",\n";
echo "ifFormat : \"" . $t_format . "\", \n";
echo "button : \"" . $p_button_name . "\"\n";
echo "}\n";
echo ");\n";
echo "</script>\n";
Expand Down
52 changes: 30 additions & 22 deletions core/gpc_api.php
View file
Open in desktop
Expand Up @@ -173,14 +173,18 @@ function gpc_isset_custom_field( $p_var_name, $p_custom_field_type ) {

switch ($p_custom_field_type ) {
case CUSTOM_FIELD_TYPE_DATE:
// date field is three dropdowns that default to 0
// Dropdowns are always present, so check if they are set
return gpc_isset( $t_field_name . '_day' ) &&
gpc_get_int( $t_field_name . '_day', 0 ) != 0 &&
gpc_isset( $t_field_name . '_month' ) &&
gpc_get_int( $t_field_name . '_month', 0 ) != 0 &&
gpc_isset( $t_field_name . '_year' ) &&
gpc_get_int( $t_field_name . '_year', 0 ) != 0 ;
if (ON == config_get( 'use_date_picker_javascript' )) {
return gpc_isset( $t_field_name ) ;
} else {
// date field is three dropdowns that default to 0
// Dropdowns are always present, so check if they are set
return gpc_isset( $t_field_name . '_day' ) &&
gpc_get_int( $t_field_name . '_day', 0 ) != 0 &&
gpc_isset( $t_field_name . '_month' ) &&
gpc_get_int( $t_field_name . '_month', 0 ) != 0 &&
gpc_isset( $t_field_name . '_year' ) &&
gpc_get_int( $t_field_name . '_year', 0 ) != 0 ;
}
case CUSTOM_FIELD_TYPE_STRING:
case CUSTOM_FIELD_TYPE_NUMERIC:
case CUSTOM_FIELD_TYPE_FLOAT:
Expand All @@ -205,10 +209,10 @@ function gpc_get_custom_field( $p_var_name, $p_custom_field_type, $p_default = n
switch( $p_custom_field_type ) {
case CUSTOM_FIELD_TYPE_MULTILIST:
case CUSTOM_FIELD_TYPE_CHECKBOX:
// ensure that the default is an array, if set
if ( ($p_default !== null) && !is_array($p_default) ) {
$p_default = array( $p_default );
}
// ensure that the default is an array, if set
if ( ($p_default !== null) && !is_array($p_default) ) {
$p_default = array( $p_default );
}
$t_values = gpc_get_string_array( $p_var_name, $p_default );
if( is_array( $t_values ) ) {
return implode( '|', $t_values );
Expand All @@ -217,17 +221,21 @@ function gpc_get_custom_field( $p_var_name, $p_custom_field_type, $p_default = n
}
break;
case CUSTOM_FIELD_TYPE_DATE:
$t_day = gpc_get_int( $p_var_name . '_day', 0 );
$t_month = gpc_get_int( $p_var_name . '_month', 0 );
$t_year = gpc_get_int( $p_var_name . '_year', 0 );
if(( $t_year == 0 ) || ( $t_month == 0 ) || ( $t_day == 0 ) ) {
if( $p_default == null ) {
return '';
if (ON == config_get( 'use_date_picker_javascript' )) {
return strtotime( gpc_get_string( $p_var_name, time() ));
} else {
$t_day = gpc_get_int( $p_var_name . '_day', 0 );
$t_month = gpc_get_int( $p_var_name . '_month', 0 );
$t_year = gpc_get_int( $p_var_name . '_year', 0 );
if(( $t_year == 0 ) || ( $t_month == 0 ) || ( $t_day == 0 ) ) {
if( $p_default == null ) {
return '';
} else {
return $p_default;
}
} else {
return $p_default;
return strtotime( $t_year . '-' . $t_month . '-' . $t_day );
}
} else {
return strtotime( $t_year . '-' . $t_month . '-' . $t_day );
}
break;
default:
Expand Down Expand Up @@ -480,4 +488,4 @@ function gpc_strip_slashes( $p_var ) {
}
return $p_var;
}
}
}