From c05bb0ba62d1120178f404a111ca6dd9f7d60c79 Mon Sep 17 00:00:00 2001 From: marvin78 Date: Fri, 20 Sep 2019 12:05:37 +0000 Subject: [PATCH] 98_todoist: API v8 - better fix for new API git-svn-id: https://svn.fhem.de/fhem/trunk@20207 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/98_todoist.pm | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index f73a50141..3245a143b 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - bugfix: 98_todoist: better API v8 fix - feature: 95_Dashboard: new attribute "noLinks" - no links to devices detail - feature: 49_SSCamSTRM: new attribute "noLink" - suppress link to detail view - bugfix: 49_SSCam: fix warnings, Forum: 45671#msg975610 diff --git a/fhem/FHEM/98_todoist.pm b/fhem/FHEM/98_todoist.pm index 2d813e563..24b0b2476 100644 --- a/fhem/FHEM/98_todoist.pm +++ b/fhem/FHEM/98_todoist.pm @@ -17,7 +17,7 @@ eval "use Date::Parse;1" or $missingModule .= "Date::Parse "; ####################### # Global variables -my $version = "1.2.2"; +my $version = "1.2.3"; my $srandUsed; @@ -364,11 +364,11 @@ sub todoist_UpdateTask($$$) { ## change title $args{'content'} = $h->{"title"} if($h->{'title'}); ## change dueDate - $args{'date_string'} = $h->{"dueDate"} if($h->{'dueDate'}); - $args{'date_string'} = "" if ($h->{'dueDate'} && $h->{'dueDate'} =~ /(null|none|nix|leer|del)/); + $args{'due'}{'string'} = $h->{"dueDate"} if($h->{'dueDate'}); + $args{'due'}{'string'} = "" if ($h->{'dueDate'} && $h->{'dueDate'} =~ /(null|none|nix|leer|del)/); ## change dueDate (if someone uses due_date in stead of dueDate) - $args{'date_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'} = $h->{"due_date"} if ($h->{'due_date'}); + $args{'due'}{'string'} = "" if ($h->{'due_date'} && $h->{'due_date'} =~ /(null|none|nix|leer|del)/); ## change priority $args{'priority'} = int($h->{"priority"}) if ($h->{"priority"}); ## Who is responsible for the task @@ -522,6 +522,7 @@ sub todoist_CreateTask($$) { token => $pwd, }; + ## check for dueDate as Parameter or part of title - push to hash if (!$tmp[1] && $h->{"dueDate"}) { ## parameter $data->{'date_string'} = $h->{"dueDate"}; @@ -943,10 +944,10 @@ sub todoist_GetTasksCallback($$$){ } ## 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 - readingsBulkUpdate($hash, "Task_".$t."_dueDate",FmtDateTime(str2time($task->{due_date_utc}))); - $hash->{helper}{"DUE_DATE"}{$taskID}=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})); } ## set responsible_uid if present @@ -1922,8 +1923,10 @@ sub todoist_Html(;$$$) { my $r=0; + my $width = 95; + my $count = @devs; - my $width = 95/$count; + $width = $width/$count if ($count>=1); # refresh request? don't return everything if (!$refreshGet) {