L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-52355 mod_data: Added Gregorian hour and minute values

Browse Source
This commit is contained in:
Jun Pataleta
2015-12-23 09:56:46 +08:00
parent 68927e83e5
commit 2217e2fea9
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/field/date/field.class.php
+27 -5
View File
@@ -47,7 +47,15 @@ class data_field_date extends data_field_base {
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$gregoriandate = $calendartype->convert_to_gregorian($year, $month, $day);
$content = make_timestamp($gregoriandate['year'], $gregoriandate['month'], $gregoriandate['day'], 12, 0, 0, 0, false);
$content = make_timestamp(
$gregoriandate['year'],
$gregoriandate['month'],
$gregoriandate['day'],
$gregoriandate['hour'],
$gregoriandate['minute'],
0,
0,
false);
} else if ($recordid) {
$content = (int)$DB->get_field('data_content', 'content', array('fieldid'=>$this->field->id, 'recordid'=>$recordid));
} else {
@@ -95,8 +103,15 @@ class data_field_date extends data_field_base {
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$gregoriandate = $calendartype->convert_to_gregorian($year, $month, $day);
$data['timestamp'] = make_timestamp($gregoriandate['year'], $gregoriandate['month'], $gregoriandate['day'],
12, 0, 0, 0, false);
$data['timestamp'] = make_timestamp(
$gregoriandate['year'],
$gregoriandate['month'],
$gregoriandate['day'],
$gregoriandate['hour'],
$gregoriandate['minute'],
0,
0,
false);
$data['usedate'] = 1;
return $data;
} else {
@@ -120,8 +135,15 @@ class data_field_date extends data_field_base {
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$gregoriandate = $calendartype->convert_to_gregorian($this->year, $this->month, $this->day);
$content->content = make_timestamp($gregoriandate['year'], $gregoriandate['month'], $gregoriandate['day'],
12, 0, 0, 0, false);
$content->content = make_timestamp(
$gregoriandate['year'],
$gregoriandate['month'],
$gregoriandate['day'],
$gregoriandate['hour'],
$gregoriandate['minute'],
0,
0,
false);
if ($oldcontent = $DB->get_record('data_content', array('fieldid'=>$this->field->id, 'recordid'=>$recordid))) {
$content->id = $oldcontent->id;