Bladeren bron

AktuellerStand

hmetzner 7 jaren geleden
bovenliggende
commit
c8c4f2c130
2 gewijzigde bestanden met toevoegingen van 78 en 10 verwijderingen
  1. 51 3
      fhem/core/fhem.cfg
  2. 27 7
      fhem/core/www/tablet_dev/main1280x800.html

+ 51 - 3
fhem/core/fhem.cfg

@@ -123,13 +123,14 @@ attr HaMA dbplan_station Haßloch(Pfalz)
 attr HaMA room Verkehr
 #Traffic Module
 define trafficViaHockenheim TRAFFIC AIzaSyCoAbPI0IfuBl8P6EJhKM316nyyW93T4Dg 600
-attr trafficViaHockenheim userattr DbLogExclude GoogleMapsCenter GoogleMapsStroke GoogleMapsTrafficLayer GoogleMapsZoom end_address outputReadings start_address verbose waypoints
+attr trafficViaHockenheim userattr DbLogExclude GoogleMapsCenter GoogleMapsStroke GoogleMapsTrafficLayer GoogleMapsZoom end_address includeReturn outputReadings start_address verbose waypoints
 attr trafficViaHockenheim DbLogExclude .*
 attr trafficViaHockenheim GoogleMapsCenter 49.317545, 8.437319
 attr trafficViaHockenheim GoogleMapsStroke #0080FF,6,50
 attr trafficViaHockenheim GoogleMapsTrafficLayer 1
 attr trafficViaHockenheim GoogleMapsZoom 11
 attr trafficViaHockenheim end_address Heidelberger Str., 69226 Nußloch
+attr trafficViaHockenheim includeReturn 1
 attr trafficViaHockenheim outputReadings text
 attr trafficViaHockenheim room Verkehr
 attr trafficViaHockenheim start_address Nelkenweg, 67454 Haßloch
@@ -152,13 +153,14 @@ attr trafficViaTalhaus verbose 1
 attr trafficViaTalhaus waypoints 49.305870, 8.425785 | 49.3419634, 8.5320445
 #
 define trafficViaA61A6 TRAFFIC AIzaSyCoAbPI0IfuBl8P6EJhKM316nyyW93T4Dg 600
-attr trafficViaA61A6 userattr DbLogExclude GoogleMapsCenter GoogleMapsStroke GoogleMapsTrafficLayer GoogleMapsZoom end_address outputReadings start_address verbose waypoints
+attr trafficViaA61A6 userattr DbLogExclude GoogleMapsCenter GoogleMapsStroke GoogleMapsTrafficLayer GoogleMapsZoom end_address includeReturn outputReadings start_address verbose waypoints
 attr trafficViaA61A6 DbLogExclude .*
 attr trafficViaA61A6 GoogleMapsCenter 49.317545, 8.437319
 attr trafficViaA61A6 GoogleMapsStroke #0080FF,6,50
 attr trafficViaA61A6 GoogleMapsTrafficLayer 1
 attr trafficViaA61A6 GoogleMapsZoom 11
 attr trafficViaA61A6 end_address Heidelberger Str., 69226 Nußloch
+attr trafficViaA61A6 includeReturn 1
 attr trafficViaA61A6 outputReadings text
 attr trafficViaA61A6 room Verkehr
 attr trafficViaA61A6 start_address Nelkenweg, 67454 Haßloch
@@ -166,13 +168,14 @@ attr trafficViaA61A6 verbose 1
 attr trafficViaA61A6 waypoints 49.3892154, 8.3393097
 #
 define trafficViaA61Talhaus TRAFFIC AIzaSyCoAbPI0IfuBl8P6EJhKM316nyyW93T4Dg 600
-attr trafficViaA61Talhaus userattr DbLogExclude GoogleMapsCenter GoogleMapsStroke GoogleMapsTrafficLayer GoogleMapsZoom end_address outputReadings start_address verbose waypoints
+attr trafficViaA61Talhaus userattr DbLogExclude GoogleMapsCenter GoogleMapsStroke GoogleMapsTrafficLayer GoogleMapsZoom end_address includeReturn outputReadings start_address verbose waypoints
 attr trafficViaA61Talhaus DbLogExclude .*
 attr trafficViaA61Talhaus GoogleMapsCenter 49.317545, 8.437319
 attr trafficViaA61Talhaus GoogleMapsStroke #0080FF,6,50
 attr trafficViaA61Talhaus GoogleMapsTrafficLayer 1
 attr trafficViaA61Talhaus GoogleMapsZoom 11
 attr trafficViaA61Talhaus end_address Heidelberger Str., 69226 Nußloch
+attr trafficViaA61Talhaus includeReturn 1
 attr trafficViaA61Talhaus outputReadings text
 attr trafficViaA61Talhaus room Verkehr
 attr trafficViaA61Talhaus start_address Nelkenweg, 67454 Haßloch
@@ -182,3 +185,48 @@ attr trafficViaA61Talhaus waypoints 49.3892154, 8.3393097 | 49.3419634, 8.532044
 define n_DbLogExclude notify global:DEFINED.* attr $EVTPART1 DbLogExclude .*
 attr n_DbLogExclude DbLogExclude .*
 attr n_DbLogExclude room Notify,Log
+#Google Geburtstags Kalender einbinden
+define BirthdayCalendar Calendar ical url https://calendar.google.com/calendar/ical/j68hdkq24psm96dckf22tvmmtg%40group.calendar.google.com/private-5fb2e08e8f24f38c8aad843434fed88a/basic.ics
+attr BirthdayCalendar DbLogExclude .*
+attr BirthdayCalendar hideOlderThan 1
+attr BirthdayCalendar room Kalender
+attr BirthdayCalendar verbose 5
+
+#attr BirthdayCalendar SSLVerify 0
+#
+#Calview für den Geburtstagskalender
+#
+define BirthdayView CALVIEW BirthdayCalendar next
+attr BirthdayView DbLogExclude .*
+attr BirthdayView isbirthday 1
+attr BirthdayView maxreadings 10
+attr BirthdayView modes modeAlarm,modeStart,modeStarted,modeUpcoming
+attr BirthdayView room Kalender
+attr BirthdayView yobfield _summary
+define HolgerCal Calendar ical url https://calendar.google.com/calendar/ical/h.metzner%40gmx.de/private-011d5858b2dc126ee4322666f02c566c/basic.ics
+attr HolgerCal DbLogExclude .*
+attr HolgerCal hideOlderThan 1
+attr HolgerCal room Kalender
+define PitCal Calendar ical url https://calendar.google.com/calendar/ical/p.metzner2010%40gmail.com/private-16333283a0ee685b805f8413116436ae/basic.ics
+attr PitCal DbLogExclude .*
+attr PitCal hideOlderThan 1
+attr PitCal room Kalender
+define JuleCal Calendar ical url https://calendar.google.com/calendar/ical/jule.metzner.2011%40googlemail.com/private-1baed5bd6a50d6bf61cdc7bf925bb9eb/basic.ics
+attr JuleCal DbLogExclude .*
+attr JuleCal hideOlderThan 1
+attr JuleCal room Kalender
+define NeleCal Calendar ical url https://calendar.google.com/calendar/ical/n.metzner2012%40googlemail.com/private-c0f0a5712c56533b3c3c7b06d013d2d4/basic.ics
+attr NeleCal DbLogExclude .*
+attr NeleCal hideOlderThan 1
+attr NeleCal room Kalender
+define FamilyCal Calendar ical url https://calendar.google.com/calendar/ical/unhv7hnf2ujh85sl3m5e7rrj3g%40group.calendar.google.com/private-90140a5128b6b5b482d119b43ad79a39/basic.ics
+attr FamilyCal DbLogExclude .*
+attr FamilyCal hideOlderThan 1
+attr FamilyCal room Kalender
+define OurCalendars CALVIEW FamilyCal,PitCal,JuleCal,NeleCal,HolgerCal next 900
+attr OurCalendars DbLogExclude .*
+attr OurCalendars fulldaytext Ganztags
+attr OurCalendars modes next
+attr OurCalendars room Kalender
+attr OurCalendars sourcecolor FamilyCal:green,PitCal:darkblue,JuleCal:red,NeleCal:purple,HolgerCal:lightgreen
+attr OurCalendars timeshort 1

+ 27 - 7
fhem/core/www/tablet_dev/main1280x800.html

@@ -103,8 +103,23 @@
       </div>
     </li>
 <!--Kalender-->
-    <li data-col="5" data-row="1"  data-sizex="5" data-sizey="6">
-      <header>Was steht an</header>
+    <li data-col="5" data-row="1"  data-sizex="4" data-sizey="6" class="fulltransparent">
+      <header class="fulltransparent">Was steht an</header>
+      <div data-type="calview"
+           data-device="OurCalendars"
+           data-get="all"
+           data-max="10"
+           data-dateformat="short"
+           data-timeformat="short"
+           data-detail='["bdate","timeshort","summary","sourcecolor"]'
+           data-sourcecolor="yes"
+           data-detailwidth='["10","20","50"]'
+           data-class="left-align bold">
+      </div>
+    </li>
+<!--Sprit-->
+    <li data-col="9" data-row="1"  data-sizex="1" data-sizey="6">
+      <header>Sprit</header>
     </li>
 <!--Müll-->
     <li data-col="10" data-row="1"  data-sizex="1" data-sizey="6">
@@ -155,33 +170,38 @@
         </div>
       </div>
     </li>
-    <li data-col="5" data-row="7"  data-sizex="5" data-sizey="6" class="fulltransparent">
+<!--Geburtstage-->
+    <li data-col="5" data-row="7"  data-sizex="4" data-sizey="6" class="fulltransparent">
       <header class="fulltransparent">Geburtstage</header>
       <div data-type="calview"
            data-device="BirthdayView"
            data-get="today"
            data-color="red"
            data-detail='["bdate","summary","age"]'
-           data-detailwidth='["10","50","10"]'>
+           data-detailwidth='["10","50","10"]'
+           data-class="bold">
       </div>
       <div data-type="calview"
            data-device="BirthdayView"
            data-get="tomorrow"
            data-color="yellow"
            data-detail='["bdate","summary","age"]'
-           data-detailwidth='["10","50","10"]'>
+           data-detailwidth='["10","50","10"]'
+           data-class="bold">
       </div>
       <div class="left-align">demnächst</div>
       <div data-type="calview"
            data-device="BirthdayView"
            data-get="all"
            data-start="notomorrow"
+           data-max="9"
            data-dateformat="short"
            data-detail='["bdate","summary","age"]'
-           data-detailwidth='["10","50","10"]'>
+           data-detailwidth='["10","50","10"]'
+           data-class="bold">
       </div>
     </li>
-    <li data-col="10" data-row="7" data-sizex="3" data-sizey="3">
+    <li data-col="9" data-row="7" data-sizex="4" data-sizey="3">
       <header>Küchenorchester</header>
       <!-- place your widget here -->
     </li>