prehistoric-systems/mytinytodo
1
0
Fork 0
mirror of https://github.com/maxpozdeev/mytinytodo.git synced 2026-03-11 08:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* use full year in duedate field

Browse source
This commit is contained in:
Max Pozdeev 2020-08-23 22:46:00 +03:00
parent babe849346
commit d1f34cc6eb
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ajax.php
View file

@ -551,7 +551,7 @@ function prepareTaskRow($r)
'dueClass' => $dueA['class'],
'dueStr' => htmlarray($r['compl'] && $dueA['timestamp'] ? formatTime($formatCompletedInline, $dueA['timestamp']) : $dueA['str']),
'dueInt' => date2int($r['duedate']),
'dueTitle' => htmlarray(sprintf($lang->get('taskdate_inline_duedate'), $dueA['formatted'])),
'dueTitle' => htmlarray(sprintf($lang->get('taskdate_inline_duedate'), $dueA['formattedlong'])),
);
}
@ -737,7 +737,7 @@ function prepare_duedate($duedate)
{
$lang = Lang::instance();
$a = array( 'class'=>'', 'str'=>'', 'formatted'=>'', 'timestamp'=>0 );
$a = array( 'class'=>'', 'str'=>'', 'formatted'=>'', 'formattedlong'=>'', 'timestamp'=>0 );
if($duedate == '') {
return $a;
}
@ -747,7 +747,7 @@ function prepare_duedate($duedate)
$diff = mktime(0,0,0,$ad[1],$ad[2],$ad[0]) - mktime(0,0,0,$at[1],$at[2],$at[0]);
if($diff < -604800 && $ad[0] == $at[0]) { $a['class'] = 'past'; $a['str'] = formatDate3(Config::get('dateformatshort'), (int)$ad[0], (int)$ad[1], (int)$ad[2], $lang); }
elseif($diff < -604800) { $a['class'] = 'past'; $a['str'] = formatDate3(Config::get('dateformat2'), (int)$ad[0], (int)$ad[1], (int)$ad[2], $lang); }
elseif($diff < -604800) { $a['class'] = 'past'; $a['str'] = formatDate3(Config::get('dateformat2'), (int)$ad[0], (int)$ad[1], (int)$ad[2], $lang); }
elseif($diff < -86400) { $a['class'] = 'past'; $a['str'] = sprintf($lang->get('daysago'),ceil(abs($diff)/86400)); }
elseif($diff < 0) { $a['class'] = 'past'; $a['str'] = $lang->get('yesterday'); }
elseif($diff < 86400) { $a['class'] = 'today'; $a['str'] = $lang->get('today'); }
@ -756,7 +756,10 @@ function prepare_duedate($duedate)
elseif($ad[0] == $at[0]) { $a['class'] = 'future'; $a['str'] = formatDate3(Config::get('dateformatshort'), (int)$ad[0], (int)$ad[1], (int)$ad[2], $lang); }
else { $a['class'] = 'future'; $a['str'] = formatDate3(Config::get('dateformat2'), (int)$ad[0], (int)$ad[1], (int)$ad[2], $lang); }
$a['formatted'] = formatTime(Config::get('dateformat2'), $a['timestamp']);
#avoid short year
$fmt = str_replace('y', 'Y', Config::get('dateformat2'));
$a['formatted'] = formatTime($fmt, $a['timestamp']);
$a['formattedlong'] = formatTime(Config::get('dateformat'), $a['timestamp']);
return $a;
}

3
src/common.php
View file

@ -153,7 +153,8 @@ function formatDate3($format, $ay, $am, $ad, $lang)
$ml = $lang->get('months_long');
$ms = $lang->get('months_short');
$Y = $ay;
$y = $Y < 2010 ? '0'.($Y-2000) : $Y-2000;
$YC = 100 * floor($Y/100); //...1900,2000,2100...
$y = $Y < $YC+10 ? '0'.($Y-$YC) : $Y-$YC;
$n = $am;
$m = $n < 10 ? '0'.$n : $n;
$F = $ml[$am-1];

2
src/mytinytodo.js
View file

@ -624,7 +624,7 @@ var mytinytodo = window.mytinytodo = _mtt = {
var s = this.options.duedatepickerformat.replace(/(.)/g, function(t,s) {
switch(t) {
case 'Y': return 'yy';
case 'y': return 'y';
case 'y': return 'yy';
case 'd': return 'dd';
case 'j': return 'd';
case 'm': return 'mm';