mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-25275-master' of git://github.com/abgreeve/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-10-16 10:11:04 +08:00
commit ee17d12db1
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/data/field/date/field.class.php
View File

@ -55,12 +55,13 @@ class data_field_date extends data_field_base {
//Enable the following three functions once core API issues have been addressed.
function display_search_field($value=0) {
$selectors = html_writer::select_time('days', 'f_'.$this->field->id.'_d', $value)
. html_writer::select_time('months', 'f_'.$this->field->id.'_m', $value)
. html_writer::select_time('years', 'f_'.$this->field->id.'_y', $value);
return $selectors;
$selectors = html_writer::select_time('days', 'f_'.$this->field->id.'_d', $value['timestamp'])
. html_writer::select_time('months', 'f_'.$this->field->id.'_m', $value['timestamp'])
. html_writer::select_time('years', 'f_'.$this->field->id.'_y', $value['timestamp']);
$datecheck = html_writer::checkbox('f_'.$this->field->id.'_z', 1, $value['usedate']);
$str = $selectors . ' ' . $datecheck . ' ' . get_string('usedate', 'data');
//return print_date_selector('f_'.$this->field->id.'_d', 'f_'.$this->field->id.'_m', 'f_'.$this->field->id.'_y', $value, true);
return $str;
}
function generate_sql($tablealias, $value) {
@ -70,21 +71,22 @@ class data_field_date extends data_field_base {
$i++;
$name = "df_date_$i";
$varcharcontent = $DB->sql_compare_text("{$tablealias}.content");
return array(" ({$tablealias}.fieldid = {$this->field->id} AND $varcharcontent = :$name) ", array($name=>$value));
return array(" ({$tablealias}.fieldid = {$this->field->id} AND $varcharcontent = :$name) ", array($name => $value['timestamp']));
}
function parse_search_field() {
$day = optional_param('f_'.$this->field->id.'_d', 0, PARAM_INT);
$month = optional_param('f_'.$this->field->id.'_m', 0, PARAM_INT);
$year = optional_param('f_'.$this->field->id.'_y', 0, PARAM_INT);
if (!empty($day) && !empty($month) && !empty($year)) {
return make_timestamp($year, $month, $day, 12, 0, 0, 0, false);
}
else {
$usedate = optional_param('f_'.$this->field->id.'_z', 0, PARAM_INT);
$data = array();
if (!empty($day) && !empty($month) && !empty($year) && $usedate == 1) {
$data['timestamp'] = make_timestamp($year, $month, $day, 12, 0, 0, 0, false);
$data['usedate'] = 1;
return $data;
} else {
return 0;
}
}
function update_content($recordid, $value, $name='') {

1
mod/data/lang/en/data.php
View File

@ -342,6 +342,7 @@ $string['uploadrecords_help'] = 'Entries may be uploaded via text file. The form
The field enclosure is a character that surrounds each field in each record. It can normally be left unset.';
$string['uploadrecords_link'] = 'mod/data/import';
$string['url'] = 'Url';
$string['usedate'] = 'Include in search.';
$string['usestandard'] = 'Use a preset';
$string['usestandard_help'] = 'To use a preset available to the whole site, select it from the list. (If you have added a preset to the list using the save as preset feature then you have the option of deleting it.)';
$string['viewfromdate'] = 'Read only from';