From 77dc48d5bf82ba112b52732ec0d16c85255b0aa0 Mon Sep 17 00:00:00 2001 From: borisneubert <> Date: Sat, 20 Feb 2016 10:39:44 +0000 Subject: [PATCH] 57_Calendar: feature get ... uid ... git-svn-id: https://svn.fhem.de/fhem/trunk@10885 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/57_Calendar.pm | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 93b027824..e81f1716b 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. + - feature: 57_Calendar: get ... uid ... - feature 49_SSCAM: function "runPatrol" added that starts predefined patrols of PTZ-cameras, Reading "CamDetMotSc" added diff --git a/fhem/FHEM/57_Calendar.pm b/fhem/FHEM/57_Calendar.pm index 65dbdc602..3a9018bf9 100644 --- a/fhem/FHEM/57_Calendar.pm +++ b/fhem/FHEM/57_Calendar.pm @@ -1630,7 +1630,7 @@ sub Calendar_Get($@) { } - my @cmds2= qw/text full summary location description alarm start end debug/; + my @cmds2= qw/text full summary location description alarm start end uid debug/; if($cmd ~~ @cmds2) { return "argument is missing" if($#a < 2); @@ -1692,6 +1692,7 @@ sub Calendar_Get($@) { if(@events) { foreach my $event (sort { $a->start() <=> $b->start() } @events) { + push @texts, $event->uid() if $cmd eq "uid"; push @texts, $event->asText() if $cmd eq "text"; push @texts, $event->asFull() if $cmd eq "full"; push @texts, $event->asDebug() if $cmd eq "debug"; @@ -2553,6 +2554,7 @@ sub CalendarAsHtml($;$) { + @@ -2930,6 +2932,7 @@ sub CalendarAsHtml($;$) {
<format>content
uidthe UID of the event
texta user-friendly textual representation, best suited for display
summarythe content of the summary field (subject, title)
locationthe content of the location field
+
<format>Inhalt
uidUID des Termins
textBenutzer-/Monitorfreundliche Textausgabe.
summaryÜbersicht (Betreff, Titel)
locationOrt