mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

98_todoist: API v8 - better fix for new API

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20207 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
marvin78
2019-09-20 12:05:37 +00:00
parent 1ddc650724
commit c05bb0ba62
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 98_todoist: better API v8 fix
- feature: 95_Dashboard: new attribute "noLinks" - no links to devices detail - feature: 95_Dashboard: new attribute "noLinks" - no links to devices detail
- feature: 49_SSCamSTRM: new attribute "noLink" - suppress link to detail view - feature: 49_SSCamSTRM: new attribute "noLink" - suppress link to detail view
- bugfix: 49_SSCam: fix warnings, Forum: 45671#msg975610 - bugfix: 49_SSCam: fix warnings, Forum: 45671#msg975610

21
fhem/FHEM/98_todoist.pm
View File

@@ -17,7 +17,7 @@ eval "use Date::Parse;1" or $missingModule .= "Date::Parse ";
####################### #######################
# Global variables # Global variables
my $version = "1.2.2"; my $version = "1.2.3";
my $srandUsed; my $srandUsed;
@@ -364,11 +364,11 @@ sub todoist_UpdateTask($$$) {
## change title ## change title
$args{'content'} = $h->{"title"} if($h->{'title'}); $args{'content'} = $h->{"title"} if($h->{'title'});
## change dueDate ## change dueDate
$args{'date_string'} = $h->{"dueDate"} if($h->{'dueDate'}); $args{'due'}{'string'} = $h->{"dueDate"} if($h->{'dueDate'});
$args{'date_string'} = "" if ($h->{'dueDate'} && $h->{'dueDate'} =~ /(null|none|nix|leer|del)/); $args{'due'}{'string'} = "" if ($h->{'dueDate'} && $h->{'dueDate'} =~ /(null|none|nix|leer|del)/);
## change dueDate (if someone uses due_date in stead of dueDate) ## change dueDate (if someone uses due_date in stead of dueDate)
$args{'date_string'} = $h->{"due_date"} if ($h->{'due_date'}); $args{'due'}{'string'} = $h->{"due_date"} if ($h->{'due_date'});
$args{'date_string'} = "" if ($h->{'dueDate'} && $h->{'due_date'} =~ /(null|none|nix|leer|del)/); $args{'due'}{'string'} = "" if ($h->{'due_date'} && $h->{'due_date'} =~ /(null|none|nix|leer|del)/);
## change priority ## change priority
$args{'priority'} = int($h->{"priority"}) if ($h->{"priority"}); $args{'priority'} = int($h->{"priority"}) if ($h->{"priority"});
## Who is responsible for the task ## Who is responsible for the task
@@ -522,6 +522,7 @@ sub todoist_CreateTask($$) {
token => $pwd, token => $pwd,
}; };
## check for dueDate as Parameter or part of title - push to hash ## check for dueDate as Parameter or part of title - push to hash
if (!$tmp[1] && $h->{"dueDate"}) { ## parameter if (!$tmp[1] && $h->{"dueDate"}) { ## parameter
$data->{'date_string'} = $h->{"dueDate"}; $data->{'date_string'} = $h->{"dueDate"};
@@ -943,10 +944,10 @@ sub todoist_GetTasksCallback($$$){
} }
## set due_date if present ## set due_date if present
if (defined($task->{due_date_utc}) && $task->{due_date_utc} ne 'null') { if (defined($task->{due}) && $task->{due_date_utc} ne 'null') {
## if there is a task with due date, we create a new reading ## if there is a task with due date, we create a new reading
readingsBulkUpdate($hash, "Task_".$t."_dueDate",FmtDateTime(str2time($task->{due_date_utc}))); readingsBulkUpdate($hash, "Task_".$t."_dueDate",FmtDateTime(str2time($task->{due}{date})));
$hash->{helper}{"DUE_DATE"}{$taskID}=FmtDateTime(str2time($task->{due_date_utc})); $hash->{helper}{"DUE_DATE"}{$taskID}=FmtDateTime(str2time($task->{due}{date}));
} }
## set responsible_uid if present ## set responsible_uid if present
@@ -1922,8 +1923,10 @@ sub todoist_Html(;$$$) {
my $r=0; my $r=0;
my $width = 95;
my $count = @devs; my $count = @devs;
my $width = 95/$count; $width = $width/$count if ($count>=1);
# refresh request? don't return everything # refresh request? don't return everything
if (!$refreshGet) { if (!$refreshGet) {