add basic read support for COLOR prop

agendav · ghsioux · Feb 19, 2025 · Feb 19, 2025 · Feb 19, 2025 · Feb 19, 2025
commit f99fd6e096f6d525d1e5f3a35303d105816a9fa5
diff --git a/assets/js/app/app.js b/assets/js/app/app.js
@@ -1519,6 +1519,12 @@ var event_render_callback = function event_render_callback(event, element) {
   // Icons
   var icons = [];
 
+  // Set the background and text colors of the event
+  if (event.color) {
+      element.css('background-color', event.color);
+      element.css('color', fg_for_bg(event.color));
+  }
+
   if (event.rrule !== undefined) {
     icons.push('fa-repeat');
   }

diff --git a/assets/templates/templates.js b/assets/templates/templates.js
diff --git a/tests/AgenDAV/Event/VObjectEventInstanceTest.php b/tests/AgenDAV/Event/VObjectEventInstanceTest.php
@@ -28,6 +28,7 @@ class VObjectEventInstanceTest extends TestCase
         'TRANSP' => 'OPAQUE',
         'RRULE' => 'FREQ=MONTHLY',
         'RECURRENCE-ID' => '20150109T123456Z',
+        'COLOR' => 'peachpuff',
         'SEQUENCE' => '2',
     ];
 
@@ -184,10 +185,12 @@ public function testOneSet()
         $vevent = $this->vcalendar->add('VEVENT', [
             'SUMMARY' => 'Test summary',
             'LOCATION' => 'Test location',
+            'COLOR' => 'peachpuff',
         ]);
         $instance = new VObjectEventInstance($vevent);
         $instance->setSummary('New summary');
         $instance->setLocation('');
+        $instance->setColor('navajowhite');
         $this->assertEquals(
             'New summary',
             $instance->getSummary()
@@ -196,6 +199,10 @@ public function testOneSet()
             '',
             $instance->getLocation()
         );
+        $this->assertEquals(
+            'navajowhite',
+            $instance->getColor()
+        );
     }
 
     public function testSetStart()
@@ -512,6 +519,7 @@ protected function checkSomeProperties(VObjectEventInstance $instance, $recurren
         } else {
             $this->assertEquals('FREQ=MONTHLY', $instance->getRepeatRule());
         }
+        $this->assertEquals('peachpuff', $instance->getColor());
     }
 
     protected function setSomeVAlarms(VEvent $vevent)

diff --git a/tests/AgenDAV/Event/VObjectEventTest.php b/tests/AgenDAV/Event/VObjectEventTest.php
@@ -25,6 +25,7 @@ public function setUp()
         $this->vevent = $this->vcalendar->add('VEVENT', [
             'UID' => '123456',
             'SUMMARY' => 'Initial event instance',
+            'COLOR' => 'peachpuff',
             'MYPROPERTY' => 'Check',
         ]);
     }
@@ -272,6 +273,7 @@ public function testSetBaseInstanceWithBase()
         $instance->setStart($now, true);
         $instance->setSummary('New test summary');
         $instance->setRecurrenceId(RecurrenceId::buildFromString('20150110T100500Z'));
+        $instance->setColor('navajowhite');
 
         $event->storeInstance($instance);
 
@@ -280,6 +282,7 @@ public function testSetBaseInstanceWithBase()
         $this->assertEmpty($vevent->{'RECURRENCE-ID'});
         $this->assertEquals('Check', $vevent->MYPROPERTY);
         $this->assertEquals('New test summary', $vevent->SUMMARY);
+        $this->assertEquals('navajowhite', $vevent->COLOR);
     }
 
 

diff --git a/web/src/Data/Transformer/FullCalendarEventTransformer.php b/web/src/Data/Transformer/FullCalendarEventTransformer.php
@@ -65,6 +65,7 @@ public function transform(FullCalendarEvent $fc_event)
             'etag' => $fc_event->getEtag(),
             'uid' => $event->getUid(),
             'title' => $event->getSummary(),
+            'color' => $event->getColor(),
             'start' => $start->format('c'),
             'end' => $end->format('c'),
             'allDay' => $event->isAllDay(),

diff --git a/web/src/Event/VObjectEventInstance.php b/web/src/Event/VObjectEventInstance.php
@@ -82,6 +82,11 @@ public function getSummary()
         return (string) $this->vevent->SUMMARY;
     }
 
+    public function getColor()
+    {
+        return (string) $this->vevent->COLOR;
+    }
+
     /**
      * Get the LOCATION property of this event
      *
@@ -265,6 +270,10 @@ public function setSummary($summary)
     {
         $this->setProperty('SUMMARY', $summary);
     }
+    public function setColor($color)
+    {
+        $this->setProperty('COLOR', $color);
+    }
 
     /**
      * Set the LOCATION property for this event
@@ -443,6 +452,7 @@ public function touch()
     public function copyPropertiesFrom(EventInstance $source)
     {
         $this->setSummary($source->getSummary());
+        $this->setColor($source->getColor());
         $this->setLocation($source->getLocation());
         $this->setDescription($source->getDescription());
         $this->setClass($source->getClass());

diff --git a/web/src/EventInstance.php b/web/src/EventInstance.php
@@ -112,6 +112,13 @@ public function getRepeatRule();
      */
     public function getRecurrenceId();
 
+    /**
+     * Get the COLOR property of this event
+     *
+     * @return string
+     */
+    public function getColor();
+
     /**
      * Returns all recognized reminders for this instance
      *
@@ -198,6 +205,13 @@ public function setRepeatRule($rrule);
      */
     public function setRecurrenceId(RecurrenceId $recurrence_id = null);
 
+    /**
+     * Set the COLOR property for this event
+     *
+     * @param string $color
+     */
+    public function setColor($color);
+
     /**
      * Sets the exception status for this instance. This is useful on
      * recurrent events which have exceptions (with their own RECURRENCE-ID)
@@ -243,4 +257,3 @@ public function touch();
      */
     public function copyPropertiesFrom(EventInstance $source);
 }
-