FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-15 22:26:04 +00:00
Code Issues Releases Wiki Activity

57_Calendar: feature get ... uid ...

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10885 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2016-02-20 10:39:44 +00:00
parent 90b801ddc7
commit 77dc48d5bf
2 changed files with 5 additions and 1 deletions
Show Stats 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.
- feature: 57_Calendar: get ... uid ...
- feature 49_SSCAM: function "runPatrol" added that starts predefined - feature 49_SSCAM: function "runPatrol" added that starts predefined
patrols of PTZ-cameras, patrols of PTZ-cameras,
Reading "CamDetMotSc" added Reading "CamDetMotSc" added

5
fhem/FHEM/57_Calendar.pm
View File

@ -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) { if($cmd ~~ @cmds2) {
return "argument is missing" if($#a < 2); return "argument is missing" if($#a < 2);
@ -1692,6 +1692,7 @@ sub Calendar_Get($@) {
if(@events) { if(@events) {
foreach my $event (sort { $a->start() <=> $b->start() } @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->asText() if $cmd eq "text";
push @texts, $event->asFull() if $cmd eq "full"; push @texts, $event->asFull() if $cmd eq "full";
push @texts, $event->asDebug() if $cmd eq "debug"; push @texts, $event->asDebug() if $cmd eq "debug";
@ -2553,6 +2554,7 @@ sub CalendarAsHtml($;$) {
<table> <table>
<tr><th>&lt;format&gt;</th><th>content</th></tr> <tr><th>&lt;format&gt;</th><th>content</th></tr>
<tr><td>uid</td><td>the UID of the event</td></tr>
<tr><td>text</td><td>a user-friendly textual representation, best suited for display</td></tr> <tr><td>text</td><td>a user-friendly textual representation, best suited for display</td></tr>
<tr><td>summary</td><td>the content of the summary field (subject, title)</td></tr> <tr><td>summary</td><td>the content of the summary field (subject, title)</td></tr>
<tr><td>location</td><td>the content of the location field</td></tr> <tr><td>location</td><td>the content of the location field</td></tr>
@ -2930,6 +2932,7 @@ sub CalendarAsHtml($;$) {
<table> <table>
<tr><th>&lt;format&gt;</th><th>Inhalt</th></tr> <tr><th>&lt;format&gt;</th><th>Inhalt</th></tr>
<tr><td>uid</td><td>UID des Termins</td></tr>
<tr><td>text</td><td>Benutzer-/Monitorfreundliche Textausgabe.</td></tr> <tr><td>text</td><td>Benutzer-/Monitorfreundliche Textausgabe.</td></tr>
<tr><td>summary</td><td>&Uuml;bersicht (Betreff, Titel)</td></tr> <tr><td>summary</td><td>&Uuml;bersicht (Betreff, Titel)</td></tr>
<tr><td>location</td><td>Ort</td></tr> <tr><td>location</td><td>Ort</td></tr>